commit 242237c7e62ad5e1e75840cdcfae805f0723ec30 Author: 清晨 <136767481@qq.com> Date: Thu Apr 3 10:50:11 2025 +0800 更新系统 diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..25b312e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# http://editorconfig.org +root = true + +# 空格替代Tab缩进在各种编辑工具下效果一致 +[*] +indent_style = space +indent_size = 4 +charset = utf-8 +end_of_line = lf +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{json,yml,yaml}] +indent_size = 2 + +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d44c77 --- /dev/null +++ b/.gitignore @@ -0,0 +1,51 @@ +###################################################################### +# Build Tools + +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +target/ +!.mvn/wrapper/maven-wrapper.jar + +###################################################################### +# IDE + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### JRebel ### +rebel.xml + +### NetBeans ### +nbproject/private/ +build/* +nbbuild/ +nbdist/ +.nb-gradle/ + +###################################################################### +# Others +*.log +*.xml.versionsBackup +*.swp + +!*/build/*.java +!*/build/*.html +!*/build/*.xml + +.flattened-pom.xml +/logs/ +/ruoyi-admin/logs/ +/ruoyi-mall-api/logs/ diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..24a5833 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,42 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Current File", + "request": "launch", + "mainClass": "${file}" + }, + { + "type": "java", + "name": "MallAdminApplication", + "request": "launch", + "mainClass": "org.dromara.MallAdminApplication", + "projectName": "ruoyi-admin" + }, + { + "type": "java", + "name": "MallApiApplication", + "request": "launch", + "mainClass": "org.dromara.MallApiApplication", + "projectName": "ruoyi-mall-api" + }, + { + "type": "java", + "name": "MonitorAdminApplication", + "request": "launch", + "mainClass": "org.dromara.monitor.admin.MonitorAdminApplication", + "projectName": "ruoyi-monitor-admin" + }, + { + "type": "java", + "name": "SnailJobServerApplication", + "request": "launch", + "mainClass": "org.dromara.snailjob.SnailJobServerApplication", + "projectName": "ruoyi-snailjob-server" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..35c80c8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic", + "java.compile.nullAnalysis.mode": "automatic", + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable", + "java.debug.settings.onBuildFailureProceed": true +} \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..32b3071 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2019 RuoYi-Vue-Plus + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..35b9c77 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +材料商城系统 \ No newline at end of file diff --git a/jcs-java.code-workspace b/jcs-java.code-workspace new file mode 100644 index 0000000..7906a97 --- /dev/null +++ b/jcs-java.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "name": "jcs-java", + "path": "." + } + ], + "settings": { + "java.configuration.updateBuildConfiguration": "interactive", + "java.compile.nullAnalysis.mode": "automatic", + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable" + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..5dd51f7 --- /dev/null +++ b/pom.xml @@ -0,0 +1,513 @@ + + + 4.0.0 + + org.dromara + ruoyi-vue-plus + ${revision} + + jcs-java + 集材社管理系统 + + + 5.3.0 + 3.4.3 + UTF-8 + UTF-8 + 22 + 3.5.16 + 2.8.5 + 0.15.0 + 4.0.3 + 2.3 + 1.40.0 + 3.5.10.1 + 3.9.1 + 5.8.35 + 3.4.2 + 3.44.0 + 2.2.7 + 4.3.1 + 1.3.0 + 1.4.6 + 2.14.4 + 0.2.0 + 1.18.36 + 1.76 + 1.16.7 + + 2.7.0 + + + 2.28.22 + 0.31.3 + + 3.3.3 + + 1.2.83 + + 8.7.2-20250101 + + 1.6.7-M1 + + + 3.2.2 + 3.2.2 + 3.11.0 + 3.1.2 + 1.3.0 + 6.3.1 + 1.5.2 + 33.3.0-jre + 2.17.1 + 2.15.1 + 3.1.1065 + 3.1.0 + + + + + local + + + local + info + ruoyi + 123456 + + + + dev + + + dev + info + ruoyi + 123456 + + + + true + + + + prod + + prod + warn + ruoyi + 123456 + + + + + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + + + org.dromara.warm + warm-flow-mybatis-plus-sb3-starter + ${warm-flow.version} + + + org.dromara.warm + warm-flow-plugin-ui-sb-web + ${warm-flow.version} + + + + + me.zhyd.oauth + JustAuth + ${justauth.version} + + + + + org.dromara + ruoyi-common-bom + ${revision} + pom + import + + + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${springdoc.version} + + + + com.github.therapi + therapi-runtime-javadoc + ${therapi-javadoc.version} + + + + org.projectlombok + lombok + ${lombok.version} + + + + com.alibaba + easyexcel + ${easyexcel.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + cn.dev33 + sa-token-spring-boot3-starter + ${satoken.version} + + + + cn.dev33 + sa-token-jwt + ${satoken.version} + + + cn.hutool + hutool-all + + + + + cn.dev33 + sa-token-core + ${satoken.version} + + + + + com.baomidou + dynamic-datasource-spring-boot3-starter + ${dynamic-ds.version} + + + + org.mybatis + mybatis + ${mybatis.version} + + + + com.baomidou + mybatis-plus-spring-boot3-starter + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-jsqlparser + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-annotation + ${mybatis-plus.version} + + + + + p6spy + p6spy + ${p6spy.version} + + + + + software.amazon.awssdk + s3 + ${aws.sdk.version} + + + + software.amazon.awssdk.crt + aws-crt + ${aws.crt.version} + + + + software.amazon.awssdk + s3-transfer-manager + ${aws.sdk.version} + + + + org.dromara.sms4j + sms4j-spring-boot-starter + ${sms4j.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + + + com.aizuda + snail-job-client-starter + ${snailjob.version} + + + com.aizuda + snail-job-client-job-core + ${snailjob.version} + + + + com.alibaba + transmittable-thread-local + ${alibaba-ttl.version} + + + + + org.bouncycastle + bcprov-jdk15to18 + ${bouncycastle.version} + + + + io.github.linpeilie + mapstruct-plus-spring-boot-starter + ${mapstruct-plus.version} + + + + + org.lionsoul + ip2region + ${ip2region.version} + + + + commons-io + commons-io + ${commons-io.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.dromara + ruoyi-system + ${revision} + + + + org.dromara + ruoyi-job + ${revision} + + + + org.dromara + ruoyi-generator + ${revision} + + + + org.dromara + ruoyi-mall + ${revision} + + + + + + + ruoyi-admin + ruoyi-mall-api + ruoyi-common + ruoyi-extend + ruoyi-modules + + pom + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + com.github.therapi + therapi-runtime-javadoc-scribe + ${therapi-javadoc.version} + + + org.projectlombok + lombok + ${lombok.version} + + + org.springframework.boot + spring-boot-configuration-processor + ${spring-boot.version} + + + io.github.linpeilie + mapstruct-plus-processor + ${mapstruct-plus.version} + + + org.projectlombok + lombok-mapstruct-binding + ${mapstruct-plus.lombok.version} + + + + -parameters + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + -Dfile.encoding=UTF-8 + + ${profiles.active} + + exclude + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + src/main/resources + + false + + + src/main/resources + + + application* + bootstrap* + banner* + + + true + + + + + + + public + huawei nexus + https://mirrors.huaweicloud.com/repository/maven/ + + true + + + + + + + public + huawei nexus + https://mirrors.huaweicloud.com/repository/maven/ + + true + + + false + + + + + + + diff --git a/qodana.yaml b/qodana.yaml new file mode 100644 index 0000000..021f333 --- /dev/null +++ b/qodana.yaml @@ -0,0 +1,31 @@ +#-------------------------------------------------------------------------------# +# Qodana analysis is configured by qodana.yaml file # +# https://www.jetbrains.com/help/qodana/qodana-yaml.html # +#-------------------------------------------------------------------------------# +version: "1.0" + +#Specify inspection profile for code analysis +profile: + name: qodana.starter + +#Enable inspections +#include: +# - name: + +#Disable inspections +#exclude: +# - name: +# paths: +# - + +projectJDK: 22 #(Applied in CI/CD pipeline) + +#Execute shell command before Qodana execution (Applied in CI/CD pipeline) +#bootstrap: sh ./prepare-qodana.sh + +#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) +#plugins: +# - id: #(plugin id can be found at https://plugins.jetbrains.com) + +#Specify Qodana linter for analysis (Applied in CI/CD pipeline) +linter: jetbrains/qodana-jvm:latest diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile new file mode 100644 index 0000000..b489ab5 --- /dev/null +++ b/ruoyi-admin/Dockerfile @@ -0,0 +1,30 @@ +# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.5-cds +#FROM findepi/graalvm:java17-native + +LABEL maintainer="Lion Li" + +RUN mkdir -p /ruoyi/server/logs \ + /ruoyi/server/temp \ + /ruoyi/skywalking/agent + +WORKDIR /ruoyi/server + +ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" + +EXPOSE ${SERVER_PORT} + +ADD ./target/ruoyi-admin.jar ./app.jar +# 工作流字体文件 +ADD ./zhFonts/ /usr/share/fonts/zhFonts/ + +SHELL ["/bin/bash", "-c"] + +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + # 应用名称 如果想区分集群节点监控 改成不同的名称即可 + #-Dskywalking.agent.service_name=ruoyi-server \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \ + -jar app.jar + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml new file mode 100644 index 0000000..a0e228c --- /dev/null +++ b/ruoyi-admin/pom.xml @@ -0,0 +1,159 @@ + + + + ruoyi-vue-plus + org.dromara + ${revision} + + 4.0.0 + jar + ruoyi-admin + + + web服务入口 + + + + + + + com.mysql + mysql-connector-j + + + + + + + + + + + + + + + + + + + + + + + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-social + + + + org.dromara + ruoyi-common-ratelimiter + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-system + + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + + + + + + + org.dromara + ruoyi-mall + + + + de.codecentric + spring-boot-admin-starter-client + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + + + + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + ${project.artifactId} + + + + + + diff --git a/ruoyi-admin/src/main/java/org/dromara/MallAdminApplication.java b/ruoyi-admin/src/main/java/org/dromara/MallAdminApplication.java new file mode 100644 index 0000000..da2c8f3 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/MallAdminApplication.java @@ -0,0 +1,27 @@ +package org.dromara; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; + +/** + * 启动程序 + * + * @author Lion Li + */ + +@SpringBootApplication +public class MallAdminApplication { + + public static void main(String[] args) { + // 设置默认编码为UTF-8 + System.setProperty("file.encoding", "UTF-8"); + System.setProperty("sun.jnu.encoding", "UTF-8"); + + SpringApplication application = new SpringApplication(MallAdminApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ノ゙ 商城后台管理系统启动成功 ლ(´ڡ`ლ)゙"); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/MallAdminServletInitializer.java b/ruoyi-admin/src/main/java/org/dromara/MallAdminServletInitializer.java new file mode 100644 index 0000000..87628db --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/MallAdminServletInitializer.java @@ -0,0 +1,18 @@ +package org.dromara; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +/** + * web容器中进行部署 + * + * @author Lion Li + */ +public class MallAdminServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(MallAdminApplication.class); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java new file mode 100644 index 0000000..f4fb10b --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -0,0 +1,247 @@ +package org.dromara.web.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.request.AuthRequest; +import me.zhyd.oauth.utils.AuthStateUtils; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginBody; +import org.dromara.common.core.domain.model.RegisterBody; +import org.dromara.common.core.domain.model.SocialLoginBody; +import org.dromara.common.core.utils.*; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.social.config.properties.SocialLoginConfigProperties; +import org.dromara.common.social.config.properties.SocialProperties; +import org.dromara.common.social.utils.SocialUtils; +import org.dromara.common.sse.dto.SseMessageDto; +import org.dromara.common.sse.utils.SseMessageUtils; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysTenantVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysClientService; +import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysSocialService; +import org.dromara.system.service.ISysTenantService; +import org.dromara.web.domain.vo.LoginTenantVo; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.domain.vo.TenantListVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.dromara.web.service.SysRegisterService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +/** + * 认证 + * + * @author Lion Li + */ +@Slf4j +@SaIgnore +@RequiredArgsConstructor +@RestController +@RequestMapping("/auth") +public class AuthController { + + private final SocialProperties socialProperties; + private final SysLoginService loginService; + private final SysRegisterService registerService; + private final ISysConfigService configService; + private final ISysTenantService tenantService; + private final ISysSocialService socialUserService; + private final ISysClientService clientService; + private final ScheduledExecutorService scheduledExecutorService; + + + /** + * 登录方法 + * + * @param body 登录信息 + * @return 结果 + */ + @ApiEncrypt + @PostMapping("/login") + public R login(@RequestBody String body) { + LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class); + ValidatorUtils.validate(loginBody); + JSONObject jsonObject = JSONObject.parseObject(body); + SysUserVo sysUserVo = loginService.getSysUserByUsername(jsonObject.get("username").toString()); + + loginBody.setTenantId(sysUserVo.getTenantId()); + jsonObject.put("tenantId",sysUserVo.getTenantId()); + // 授权类型和客户端id + String clientId = loginBody.getClientId(); + String grantType = loginBody.getGrantType(); + SysClientVo client = clientService.queryByClientId(clientId); + // 查询不到 client 或 client 内不包含 grantType + if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) { + log.info("客户端id: {} 认证类型:{} 异常!.", clientId, grantType); + return R.fail(MessageUtils.message("auth.grant.type.error")); + } else if (!SystemConstants.NORMAL.equals(client.getStatus())) { + return R.fail(MessageUtils.message("auth.grant.type.blocked")); + } + // 校验租户 + loginService.checkTenant(loginBody.getTenantId()); + // 登录 + LoginVo loginVo = IAuthStrategy.login(jsonObject.toString(), client, grantType); + + Long userId = LoginHelper.getUserId(); + scheduledExecutorService.schedule(() -> { + SseMessageDto dto = new SseMessageDto(); + dto.setMessage("欢迎登录材料商城后台管理系统"); + dto.setUserIds(List.of(userId)); + SseMessageUtils.publishMessage(dto); + }, 3, TimeUnit.SECONDS); + return R.ok(loginVo); + } + + /** + * 获取跳转URL + * + * @param source 登录来源 + * @return 结果 + */ + @GetMapping("/binding/{source}") + public R authBinding(@PathVariable("source") String source, + @RequestParam String tenantId, @RequestParam String domain) { + SocialLoginConfigProperties obj = socialProperties.getType().get(source); + if (ObjectUtil.isNull(obj)) { + return R.fail(source + "平台账号暂不支持"); + } + AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties); + Map map = new HashMap<>(); + map.put("tenantId", tenantId); + map.put("domain", domain); + map.put("state", AuthStateUtils.createState()); + String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8)); + return R.ok("操作成功", authorizeUrl); + } + + /** + * 前端回调绑定授权(需要token) + * + * @param loginBody 请求体 + * @return 结果 + */ + @PostMapping("/social/callback") + public R socialCallback(@RequestBody SocialLoginBody loginBody) { + // 校验token + StpUtil.checkLogin(); + // 获取第三方登录信息 + AuthResponse response = SocialUtils.loginAuth( + loginBody.getSource(), loginBody.getSocialCode(), + loginBody.getSocialState(), socialProperties); + AuthUser authUserData = response.getData(); + // 判断授权响应是否成功 + if (!response.ok()) { + return R.fail(response.getMsg()); + } + loginService.socialRegister(authUserData); + return R.ok(); + } + + + /** + * 取消授权(需要token) + * + * @param socialId socialId + */ + @DeleteMapping(value = "/unlock/{socialId}") + public R unlockSocial(@PathVariable Long socialId) { + // 校验token + StpUtil.checkLogin(); + Boolean rows = socialUserService.deleteWithValidById(socialId); + return rows ? R.ok() : R.fail("取消授权失败"); + } + + + /** + * 退出登录 + */ + @PostMapping("/logout") + public R logout() { + loginService.logout(); + return R.ok("退出成功"); + } + + /** + * 用户注册 + */ + @ApiEncrypt + @PostMapping("/register") + public R register(@Validated @RequestBody RegisterBody user) { + if (!configService.selectRegisterEnabled(user.getTenantId())) { + return R.fail("当前系统没有开启注册功能!"); + } + registerService.register(user); + return R.ok(); + } + + /** + * 登录页面租户下拉框 + * + * @return 租户列表 + */ + @GetMapping("/tenant/list") + public R tenantList(HttpServletRequest request) throws Exception { + // 返回对象 + LoginTenantVo result = new LoginTenantVo(); + boolean enable = TenantHelper.isEnable(); + result.setTenantEnabled(enable); + // 如果未开启租户这直接返回 + if (!enable) { + return R.ok(result); + } + + List tenantList = tenantService.queryList(new SysTenantBo()); + List voList = MapstructUtils.convert(tenantList, TenantListVo.class); + try { + // 如果只超管返回所有租户 + if (LoginHelper.isSuperAdmin()) { + result.setVoList(voList); + return R.ok(result); + } + } catch (NotLoginException ignored) { + } + + // 获取域名 + String host; + String referer = request.getHeader("referer"); + if (StringUtils.isNotBlank(referer)) { + // 这里从referer中取值是为了本地使用hosts添加虚拟域名,方便本地环境调试 + host = referer.split("//")[1].split("/")[0]; + } else { + URI uri = URI.create(request.getRequestURL().toString()); + host = uri.getHost(); + } + // 根据域名进行筛选 + List list = StreamUtils.filter(voList, vo -> + StringUtils.equalsIgnoreCase(vo.getDomain(), host)); + result.setVoList(CollUtil.isNotEmpty(list) ? list : voList); + return R.ok(result); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java new file mode 100644 index 0000000..cce406e --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java @@ -0,0 +1,138 @@ +package org.dromara.web.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.captcha.AbstractCaptcha; +import cn.hutool.captcha.generator.CodeGenerator; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.RandomUtil; +import jakarta.validation.constraints.NotBlank; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.reflect.ReflectUtils; +import org.dromara.common.mail.config.properties.MailProperties; +import org.dromara.common.mail.utils.MailUtils; +import org.dromara.common.ratelimiter.annotation.RateLimiter; +import org.dromara.common.ratelimiter.enums.LimitType; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.config.properties.CaptchaProperties; +import org.dromara.common.web.enums.CaptchaType; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.core.factory.SmsFactory; +import org.dromara.web.domain.vo.CaptchaVo; +import org.springframework.expression.Expression; +import org.springframework.expression.ExpressionParser; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.awt.*; +import java.time.Duration; +import java.util.LinkedHashMap; + +/** + * 验证码操作处理 + * + * @author Lion Li + */ +@SaIgnore +@Slf4j +@Validated +@RequiredArgsConstructor +@RestController +public class CaptchaController { + + private final CaptchaProperties captchaProperties; + private final MailProperties mailProperties; + + /** + * 短信验证码 + * + * @param phonenumber 用户手机号 + */ + @RateLimiter(key = "#phonenumber", time = 60, count = 1) + @GetMapping("/resource/sms/code") + public R smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { + String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber; + String code = RandomUtil.randomNumbers(4); + RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); + // 验证码模板id 自行处理 (查数据库或写死均可) + String templateId = ""; + LinkedHashMap map = new LinkedHashMap<>(1); + map.put("code", code); + SmsBlend smsBlend = SmsFactory.getSmsBlend("config1"); + SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map); + if (!smsResponse.isSuccess()) { + log.error("验证码短信发送异常 => {}", smsResponse); + return R.fail(smsResponse.getData().toString()); + } + return R.ok(); + } + + /** + * 邮箱验证码 + * + * @param email 邮箱 + */ + @RateLimiter(key = "#email", time = 60, count = 1) + @GetMapping("/resource/email/code") + public R emailCode(@NotBlank(message = "{user.email.not.blank}") String email) { + if (!mailProperties.getEnabled()) { + return R.fail("当前系统没有开启邮箱功能!"); + } + String key = GlobalConstants.CAPTCHA_CODE_KEY + email; + String code = RandomUtil.randomNumbers(4); + RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); + try { + MailUtils.sendText(email, "登录验证码", "您本次验证码为:" + code + ",有效性为" + Constants.CAPTCHA_EXPIRATION + "分钟,请尽快填写。"); + } catch (Exception e) { + log.error("验证码短信发送异常 => {}", e.getMessage()); + return R.fail(e.getMessage()); + } + return R.ok(); + } + + /** + * 生成验证码 + */ + @RateLimiter(time = 60, count = 10, limitType = LimitType.IP) + @GetMapping("/auth/code") + public R getCode() { + CaptchaVo captchaVo = new CaptchaVo(); + boolean captchaEnabled = captchaProperties.getEnable(); + if (!captchaEnabled) { + captchaVo.setCaptchaEnabled(false); + return R.ok(captchaVo); + } + // 保存验证码信息 + String uuid = IdUtil.simpleUUID(); + String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid; + // 生成验证码 + CaptchaType captchaType = captchaProperties.getType(); + boolean isMath = CaptchaType.MATH == captchaType; + Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength(); + CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length); + AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz()); + captcha.setGenerator(codeGenerator); + captcha.createCode(); + captcha.setBackground(Color.white); + // 如果是数学验证码,使用SpEL表达式处理验证码结果 + String code = captcha.getCode(); + if (isMath) { + ExpressionParser parser = new SpelExpressionParser(); + Expression exp = parser.parseExpression(StringUtils.remove(code, "=")); + code = exp.getValue(String.class); + } + RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); + captchaVo.setUuid(uuid); + captchaVo.setImg(captcha.getImageBase64()); + return R.ok(captchaVo); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java new file mode 100644 index 0000000..7d68f04 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java @@ -0,0 +1,346 @@ +package org.dromara.web.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; +import org.dromara.mall.service.ITzIndexService; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 首页 + * + * @author Lion Li + */ +@SaIgnore +@RequiredArgsConstructor +@RestController +public class IndexController { + + /** + * 系统基础配置 + */ +// private final RuoYiConfig ruoyiConfig; + + private final ITzIndexService tzIndexService; + + /** + * 访问首页,提示语 + */ + @GetMapping("/") + public String index() { + return StringUtils.format("欢迎使用{}后台管理框架,请通过前端地址访问。", SpringUtils.getApplicationName()); + } + + /** + * 首页统计 + * @return + */ + @GetMapping("/mall/indexSum") + public R indexSum() { + LoginUser loginUser = LoginHelper.getLoginUser(); + if("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.sysUserCount()); + }else if("zh_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.zhUser()); + } + return R.ok(null); + } + + /** + * 产品数量按月统计 + * @return + */ + @PostMapping("/mall/monthPerProd") + @Parameter(name = "month", description = "日期 如:2024-09", required = false) + public R> monthPerProd(@RequestParam(value = "month") String month) { + if (StringUtils.isEmpty(month)){ + month = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else{ + month = month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.monthPerProd(month)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 产品数量按年统计 + * @return + */ + @PostMapping("/mall/yearPerProd") + @Parameter(name = "year", description = "日期 如:2024", required = false) + public R> yearPerProd(@RequestParam(value = "year") String year) { + if (StringUtils.isEmpty(year)){ + year = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else { + Date date = DateUtil.date(); + //获得月份,从0开始计数 + String month = String.valueOf(DateUtil.month(date)+1); + year = year + "-" +month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.yearPerProd(year)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + + /** + * 会员码数量按月统计 + * @param month + * @return + */ + @PostMapping("/mall/monthPerCode") + @Parameter(name = "month", description = "日期 如:2024-09", required = false) + public R> monthPerCode(@RequestParam(value = "month") String month) { + if (StringUtils.isEmpty(month)){ + month = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else{ + month = month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.monthPerCode(month)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 会员码数量按年统计 + * @return + */ + @PostMapping("/mall/yearPerCode") + @Parameter(name = "year", description = "日期 如:2024", required = false) + public R> yearPerCode(@RequestParam(value = "year") String year) { + if (StringUtils.isEmpty(year)){ + year = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else { + Date date = DateUtil.date(); + //获得月份,从0开始计数 + String month = String.valueOf(DateUtil.month(date)+1); + year = year + "-" +month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.yearPerCode(year)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 会员码业绩按月统计 + */ + @PostMapping("/mall/monthPerCodePer") + @Parameter(name = "month", description = "日期 如:2024-09", required = false) + public R> monthPerCodePer(@RequestParam(value = "month") String month) { + if (StringUtils.isEmpty(month)){ + month = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else{ + month = month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.monthPerCodePer(month)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 会员码业绩按年统计 + */ + @PostMapping("/mall/yearPerCodePer") + @Parameter(name = "year", description = "日期 如:2024", required = false) + public R> yearPerCodePer(@RequestParam(value = "year") String year) { + if (StringUtils.isEmpty(year)){ + year = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else { + Date date = DateUtil.date(); + //获得月份,从0开始计数 + String month = String.valueOf(DateUtil.month(date)+1); + year = year + "-" +month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.yearPerCodePer(year)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + + /** + * 商品业绩按月统计 + * @return + */ + @PostMapping("/mall/monthPer") + @Parameter(name = "month", description = "日期 如:2024-09", required = false) + public R> monthPer(@RequestParam(value = "month") String month) { + if (StringUtils.isEmpty(month)){ + month = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else{ + month = month + "-01"; + } + LoginUser loginUser = LoginHelper.getLoginUser(); + return R.ok(tzIndexService.monthPer(month)); + } + + + /** + * 商品业绩按年统计 + * @return + */ + @PostMapping("/mall/yearPer") + @Parameter(name = "year", description = "日期 如:2024", required = false) + public R> yearPer(@RequestParam(value = "year") String year) { + if (StringUtils.isEmpty(year)){ + year = DateUtil.format(new Date(), "yyyy-MM-dd"); + }else { + Date date = DateUtil.date(); + //获得月份,从0开始计数 + String month = String.valueOf(DateUtil.month(date)+1); + year = year + "-" +month + "-01"; + } + return R.ok(tzIndexService.yearPer(year)); + } + + /** + * 渠道下单数量排行榜 + * @param startDay + * @param endDay + * @param pageQuery + * @return + */ + @PostMapping("/mall/promoterCountMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> promoterCountMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.promoterCountMonth(pageQuery,startDay,endDay)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 渠道下单金额排行榜 + ** @param startDay + * @param endDay + * @param pageQuery + * @return + */ + @PostMapping("/mall/promoterSumMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> promoterSumMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.promoterSumMonth(pageQuery,startDay,endDay)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 小程序用户下单数量排行榜 + */ + @PostMapping("/mall/xcxUserCountMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> xcxUserCountMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.xcxUserCountMonth(pageQuery,startDay,endDay)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 小程序用户下单金额排行榜 + */ + + @PostMapping("/mall/xcxUserSumMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> xcxUserSumMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("sys_user".equals(loginUser.getUserType())){ + return R.ok(tzIndexService.xcxUserSumMonth(pageQuery,startDay,endDay)); + }else{ + throw new ServiceException("您无权限查看"); + } + } + + /** + * 产品销量排行榜 + * @param startDay + * @param endDay + * @param pageQuery + * @return + */ + @PostMapping("/mall/prodSalesVolumeCountMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> prodSalesVolumeCountMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + return R.ok(tzIndexService.prodSalesVolumeCount(pageQuery,startDay,endDay)); + } + + /** + * 产品销售额排行榜 + * @param startDay + * @param endDay + * @param pageQuery + * @return + */ + @PostMapping("/mall/prodSalesVolumeSumtMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> prodSalesVolumeSumYear(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + return R.ok(tzIndexService.prodSalesVolumeSum(pageQuery,startDay,endDay)); + } + + /** + * 厂家销售数量排行榜 + */ + @PostMapping("/mall/factorySalesVolumeCountMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> factorySalesVolumeCountMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + return R.ok(tzIndexService.factorySalesVolumeCount(pageQuery,startDay,endDay)); + } + + /** + * 厂家销售金额排行榜 + */ + @PostMapping("/mall/factorySalesVolumeSumMonth") + @Parameter(name = "startDay", description = "开始日期 如:2024-09-01", required = false) + @Parameter(name = "endDay", description = "结束日期 如:2024-09-30", required = false) + public R> factorySalesVolumeSumMonth(@RequestParam(value = "startDay") String startDay,@RequestParam(value = "endDay") String endDay,@Valid @RequestBody PageQuery pageQuery) { + return R.ok(tzIndexService.factorySalesVolumeSum(pageQuery,startDay,endDay)); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java new file mode 100644 index 0000000..664df1e --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java @@ -0,0 +1,25 @@ +package org.dromara.web.domain.vo; + +import lombok.Data; + +/** + * 验证码信息 + * + * @author Michelle.Chung + */ +@Data +public class CaptchaVo { + + /** + * 是否开启验证码 + */ + private Boolean captchaEnabled = true; + + private String uuid; + + /** + * 验证码图片 + */ + private String img; + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java new file mode 100644 index 0000000..0a83ace --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java @@ -0,0 +1,25 @@ +package org.dromara.web.domain.vo; + +import lombok.Data; + +import java.util.List; + +/** + * 登录租户对象 + * + * @author Michelle.Chung + */ +@Data +public class LoginTenantVo { + + /** + * 租户开关 + */ + private Boolean tenantEnabled; + + /** + * 租户对象列表 + */ + private List voList; + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java new file mode 100644 index 0000000..834afe5 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java @@ -0,0 +1,54 @@ +package org.dromara.web.domain.vo; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +/** + * 登录验证信息 + * + * @author Michelle.Chung + */ +@Data +public class LoginVo { + + /** + * 授权令牌 + */ + @JsonProperty("access_token") + private String accessToken; + + /** + * 刷新令牌 + */ + @JsonProperty("refresh_token") + private String refreshToken; + + /** + * 授权令牌 access_token 的有效期 + */ + @JsonProperty("expire_in") + private Long expireIn; + + /** + * 刷新令牌 refresh_token 的有效期 + */ + @JsonProperty("refresh_expire_in") + private Long refreshExpireIn; + + /** + * 应用id + */ + @JsonProperty("client_id") + private String clientId; + + /** + * 令牌权限 + */ + private String scope; + + /** + * 用户 openid + */ + private String openid; + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java new file mode 100644 index 0000000..db9c271 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java @@ -0,0 +1,31 @@ +package org.dromara.web.domain.vo; + +import org.dromara.system.domain.vo.SysTenantVo; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +/** + * 租户列表 + * + * @author Lion Li + */ +@Data +@AutoMapper(target = SysTenantVo.class) +public class TenantListVo { + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 企业名称 + */ + private String companyName; + + /** + * 域名 + */ + private String domain; + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java new file mode 100644 index 0000000..07595e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java @@ -0,0 +1,165 @@ +package org.dromara.web.listener; + +import cn.dev33.satoken.config.SaTokenConfig; +import cn.dev33.satoken.listener.SaTokenListener; +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.http.useragent.UserAgent; +import cn.hutool.http.useragent.UserAgentUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.CacheConstants; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.domain.dto.UserOnlineDTO; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.ServletUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.ip.AddressUtils; +import org.dromara.common.log.event.LogininforEvent; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Component; + +import java.time.Duration; + +/** + * 用户行为 侦听器的实现 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Component +@Slf4j +public class UserActionListener implements SaTokenListener { + + private final SaTokenConfig tokenConfig; + private final SysLoginService loginService; + + /** + * 每次登录时触发 + */ + @Override + public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) { + UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); + String ip = ServletUtils.getClientIP(); + UserOnlineDTO dto = new UserOnlineDTO(); + dto.setIpaddr(ip); + dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); + dto.setBrowser(userAgent.getBrowser().getName()); + dto.setOs(userAgent.getOs().getName()); + dto.setLoginTime(System.currentTimeMillis()); + dto.setTokenId(tokenValue); + String username = (String) loginModel.getExtra(LoginHelper.USER_NAME_KEY); + String tenantId = (String) loginModel.getExtra(LoginHelper.TENANT_KEY); + dto.setUserName(username); + dto.setClientKey((String) loginModel.getExtra(LoginHelper.CLIENT_KEY)); + dto.setDeviceType(loginModel.getDevice()); + dto.setDeptName((String) loginModel.getExtra(LoginHelper.DEPT_NAME_KEY)); + TenantHelper.dynamic(tenantId, () -> { + if(tokenConfig.getTimeout() == -1) { + RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto); + } else { + RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout())); + } + }); + // 记录登录日志 + LogininforEvent logininforEvent = new LogininforEvent(); + logininforEvent.setTenantId(tenantId); + logininforEvent.setUsername(username); + logininforEvent.setStatus(Constants.LOGIN_SUCCESS); + logininforEvent.setMessage(MessageUtils.message("user.login.success")); + logininforEvent.setRequest(ServletUtils.getRequest()); + SpringUtils.context().publishEvent(logininforEvent); + // 更新登录信息 + loginService.recordLoginInfo((Long) loginModel.getExtra(LoginHelper.USER_KEY), ip); + log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue); + } + + /** + * 每次注销时触发 + */ + @Override + public void doLogout(String loginType, Object loginId, String tokenValue) { + String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); + TenantHelper.dynamic(tenantId, () -> { + RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); + }); + log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue); + } + + /** + * 每次被踢下线时触发 + */ + @Override + public void doKickout(String loginType, Object loginId, String tokenValue) { + String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); + TenantHelper.dynamic(tenantId, () -> { + RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); + }); + log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue); + } + + /** + * 每次被顶下线时触发 + */ + @Override + public void doReplaced(String loginType, Object loginId, String tokenValue) { + String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY)); + TenantHelper.dynamic(tenantId, () -> { + RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue); + }); + log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue); + } + + /** + * 每次被封禁时触发 + */ + @Override + public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) { + } + + /** + * 每次被解封时触发 + */ + @Override + public void doUntieDisable(String loginType, Object loginId, String service) { + } + + /** + * 每次打开二级认证时触发 + */ + @Override + public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) { + } + + /** + * 每次创建Session时触发 + */ + @Override + public void doCloseSafe(String loginType, String tokenValue, String service) { + } + + /** + * 每次创建Session时触发 + */ + @Override + public void doCreateSession(String id) { + } + + /** + * 每次注销Session时触发 + */ + @Override + public void doLogoutSession(String id) { + } + + /** + * 每次Token续期时触发 + */ + @Override + public void doRenewTimeout(String tokenValue, Object loginId, long timeout) { + } +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java new file mode 100644 index 0000000..a16414f --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java @@ -0,0 +1,45 @@ +package org.dromara.web.service; + + +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.web.domain.vo.LoginVo; + +/** + * 授权策略 + * + * @author Michelle.Chung + */ +public interface IAuthStrategy { + + String BASE_NAME = "AuthStrategy"; + + /** + * 登录 + * + * @param body 登录对象 + * @param client 授权管理视图对象 + * @param grantType 授权类型 + * @return 登录验证信息 + */ + static LoginVo login(String body, SysClientVo client, String grantType) { + // 授权类型和客户端id + String beanName = grantType + BASE_NAME; + if (!SpringUtils.containsBean(beanName)) { + throw new ServiceException("授权类型不正确!"); + } + IAuthStrategy instance = SpringUtils.getBean(beanName); + return instance.login(body, client); + } + + /** + * 登录 + * + * @param body 登录对象 + * @param client 授权管理视图对象 + * @return 登录验证信息 + */ + LoginVo login(String body, SysClientVo client); + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java new file mode 100644 index 0000000..ddea71f --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java @@ -0,0 +1,262 @@ +package org.dromara.web.service; + +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Opt; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.lock.annotation.Lock4j; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.model.AuthUser; +import org.dromara.common.core.constant.CacheConstants; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.core.domain.dto.PostDTO; +import org.dromara.common.core.domain.dto.RoleDTO; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.enums.LoginType; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.*; +import org.dromara.common.log.event.LogininforEvent; +import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.exception.TenantException; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.bo.SysSocialBo; +import org.dromara.system.domain.vo.*; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.service.*; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.util.Date; +import java.util.List; +import java.util.function.Supplier; + +/** + * 登录校验方法 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Slf4j +@Service +public class SysLoginService { + + @Value("${user.password.maxRetryCount}") + private Integer maxRetryCount; + + @Value("${user.password.lockTime}") + private Integer lockTime; + + private final ISysTenantService tenantService; + private final ISysPermissionService permissionService; + private final ISysSocialService sysSocialService; + private final ISysRoleService roleService; + private final ISysDeptService deptService; + private final ISysPostService postService; + private final SysUserMapper userMapper; + + + /** + * 绑定第三方用户 + * + * @param authUserData 授权响应实体 + */ + @Lock4j + public void socialRegister(AuthUser authUserData) { + String authId = authUserData.getSource() + authUserData.getUuid(); + // 第三方用户信息 + SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class); + BeanUtil.copyProperties(authUserData.getToken(), bo); + Long userId = LoginHelper.getUserId(); + bo.setUserId(userId); + bo.setAuthId(authId); + bo.setOpenId(authUserData.getUuid()); + bo.setUserName(authUserData.getUsername()); + bo.setNickName(authUserData.getNickname()); + List checkList = sysSocialService.selectByAuthId(authId); + if (CollUtil.isNotEmpty(checkList)) { + throw new ServiceException("此三方账号已经被绑定!"); + } + // 查询是否已经绑定用户 + SysSocialBo params = new SysSocialBo(); + params.setUserId(userId); + params.setSource(bo.getSource()); + List list = sysSocialService.queryList(params); + if (CollUtil.isEmpty(list)) { + // 没有绑定用户, 新增用户信息 + sysSocialService.insertByBo(bo); + } else { + // 更新用户信息 + bo.setId(list.get(0).getId()); + sysSocialService.updateByBo(bo); + // 如果要绑定的平台账号已经被绑定过了 是否抛异常自行决断 + // throw new ServiceException("此平台账号已经被绑定!"); + } + } + + + /** + * 退出登录 + */ + public void logout() { + try { + LoginUser loginUser = LoginHelper.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + return; + } + if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { + // 超级管理员 登出清除动态租户 + TenantHelper.clearDynamic(); + } + recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success")); + } catch (NotLoginException ignored) { + } finally { + try { + StpUtil.logout(); + } catch (NotLoginException ignored) { + } + } + } + + /** + * 记录登录信息 + * + * @param tenantId 租户ID + * @param username 用户名 + * @param status 状态 + * @param message 消息内容 + */ + public void recordLogininfor(String tenantId, String username, String status, String message) { + LogininforEvent logininforEvent = new LogininforEvent(); + logininforEvent.setTenantId(tenantId); + logininforEvent.setUsername(username); + logininforEvent.setStatus(status); + logininforEvent.setMessage(message); + logininforEvent.setRequest(ServletUtils.getRequest()); + SpringUtils.context().publishEvent(logininforEvent); + } + + /** + * 构建登录用户 + */ + public LoginUser buildLoginUser(SysUserVo user) { + LoginUser loginUser = new LoginUser(); + Long userId = user.getUserId(); + loginUser.setTenantId(user.getTenantId()); + loginUser.setUserId(userId); + loginUser.setDeptId(user.getDeptId()); + loginUser.setUsername(user.getUserName()); + loginUser.setNickname(user.getNickName()); + loginUser.setUserType(user.getUserType()); + loginUser.setMenuPermission(permissionService.getMenuPermission(userId)); + loginUser.setRolePermission(permissionService.getRolePermission(userId)); + if (ObjectUtil.isNotNull(user.getDeptId())) { + Opt deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById); + loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY)); + loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY)); + } + List roles = roleService.selectRolesByUserId(userId); + List posts = postService.selectPostsByUserId(userId); + loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class)); + loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class)); + return loginUser; + } + + /** + * 记录登录信息 + * + * @param userId 用户ID + */ + public void recordLoginInfo(Long userId, String ip) { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + sysUser.setLoginIp(ip); + sysUser.setLoginDate(DateUtils.getNowDate()); + sysUser.setUpdateBy(userId); + DataPermissionHelper.ignore(() -> userMapper.updateById(sysUser)); + } + + /** + * 登录校验 + */ + public void checkLogin(LoginType loginType, String tenantId, String username, Supplier supplier) { + String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username; + String loginFail = Constants.LOGIN_FAIL; + + // 获取用户登录错误次数,默认为0 (可自定义限制策略 例如: key + username + ip) + int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0); + // 锁定时间内登录 则踢出 + if (errorNumber >= maxRetryCount) { + recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime)); + throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime); + } + + if (supplier.get()) { + // 错误次数递增 + errorNumber++; + RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime)); + // 达到规定错误次数 则锁定登录 + if (errorNumber >= maxRetryCount) { + recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime)); + throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime); + } else { + // 未达到规定错误次数 + recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber)); + throw new UserException(loginType.getRetryLimitCount(), errorNumber); + } + } + + // 登录成功 清空错误次数 + RedisUtils.deleteObject(errorKey); + } + + /** + * 校验租户 + * + * @param tenantId 租户ID + */ + public void checkTenant(String tenantId) { + if (!TenantHelper.isEnable()) { + return; + } + if (StringUtils.isBlank(tenantId)) { + throw new TenantException("tenant.number.not.blank"); + } + if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { + return; + } + SysTenantVo tenant = tenantService.queryByTenantId(tenantId); + if (ObjectUtil.isNull(tenant)) { + log.info("登录租户:{} 不存在.", tenantId); + throw new TenantException("tenant.not.exists"); + } else if (SystemConstants.DISABLE.equals(tenant.getStatus())) { + log.info("登录租户:{} 已被停用.", tenantId); + throw new TenantException("tenant.blocked"); + } else if (ObjectUtil.isNotNull(tenant.getExpireTime()) + && new Date().after(tenant.getExpireTime())) { + log.info("登录租户:{} 已超过有效期.", tenantId); + throw new TenantException("tenant.expired"); + } + } + + /** + * 根据username查询用户对象 + * + * @param username + * @return + */ + public SysUserVo getSysUserByUsername(String username) { + return userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName,username)); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java new file mode 100644 index 0000000..9ec0813 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java @@ -0,0 +1,115 @@ +package org.dromara.web.service; + +import cn.dev33.satoken.secure.BCrypt; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.domain.model.RegisterBody; +import org.dromara.common.core.enums.UserType; +import org.dromara.common.core.exception.user.CaptchaException; +import org.dromara.common.core.exception.user.CaptchaExpireException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.ServletUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.log.event.LogininforEvent; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.common.web.config.properties.CaptchaProperties; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.service.ISysUserService; +import org.springframework.stereotype.Service; + +/** + * 注册校验方法 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysRegisterService { + + private final ISysUserService userService; + private final SysUserMapper userMapper; + private final CaptchaProperties captchaProperties; + + /** + * 注册 + */ + public void register(RegisterBody registerBody) { + String tenantId = registerBody.getTenantId(); + String username = registerBody.getUsername(); + String password = registerBody.getPassword(); + // 校验用户类型是否存在 + String userType = UserType.getUserType(registerBody.getUserType()).getUserType(); + + boolean captchaEnabled = captchaProperties.getEnable(); + // 验证码开关 + if (captchaEnabled) { + validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid()); + } + SysUserBo sysUser = new SysUserBo(); + sysUser.setUserName(username); + sysUser.setNickName(username); + sysUser.setPassword(BCrypt.hashpw(password)); + sysUser.setUserType(userType); + + boolean exist = TenantHelper.dynamic(tenantId, () -> { + return userMapper.exists(new LambdaQueryWrapper() + .eq(SysUser::getUserName, sysUser.getUserName())); + }); + if (exist) { + throw new UserException("user.register.save.error", username); + } + boolean regFlag = userService.registerUser(sysUser, tenantId); + if (!regFlag) { + throw new UserException("user.register.error"); + } + recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success")); + } + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + */ + public void validateCaptcha(String tenantId, String username, String code, String uuid) { + String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, ""); + String captcha = RedisUtils.getCacheObject(verifyKey); + RedisUtils.deleteObject(verifyKey); + if (captcha == null) { + recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) { + recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")); + throw new CaptchaException(); + } + } + + /** + * 记录登录信息 + * + * @param tenantId 租户ID + * @param username 用户名 + * @param status 状态 + * @param message 消息内容 + * @return + */ + private void recordLogininfor(String tenantId, String username, String status, String message) { + LogininforEvent logininforEvent = new LogininforEvent(); + logininforEvent.setTenantId(tenantId); + logininforEvent.setUsername(username); + logininforEvent.setStatus(status); + logininforEvent.setMessage(message); + logininforEvent.setRequest(ServletUtils.getRequest()); + SpringUtils.context().publishEvent(logininforEvent); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java new file mode 100644 index 0000000..1bed4f3 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java @@ -0,0 +1,102 @@ +package org.dromara.web.service.impl; + +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.model.EmailLoginBody; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.enums.LoginType; +import org.dromara.common.core.exception.user.CaptchaExpireException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Service; + +/** + * 邮件认证策略 + * + * @author Michelle.Chung + */ +@Slf4j +@Service("email" + IAuthStrategy.BASE_NAME) +@RequiredArgsConstructor +public class EmailAuthStrategy implements IAuthStrategy { + + private final SysLoginService loginService; + private final SysUserMapper userMapper; + + @Override + public LoginVo login(String body, SysClientVo client) { + EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class); + ValidatorUtils.validate(loginBody); + String tenantId = loginBody.getTenantId(); + String email = loginBody.getEmail(); + String emailCode = loginBody.getEmailCode(); + LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { + SysUserVo user = loadUserByEmail(email); + loginService.checkLogin(LoginType.EMAIL, tenantId, user.getUserName(), () -> !validateEmailCode(tenantId, email, emailCode)); + // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 + return loginService.buildLoginUser(user); + }); + loginUser.setClientKey(client.getClientKey()); + loginUser.setDeviceType(client.getDeviceType()); + SaLoginModel model = new SaLoginModel(); + model.setDevice(client.getDeviceType()); + // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 + // 例如: 后台用户30分钟过期 app用户1天过期 + model.setTimeout(client.getTimeout()); + model.setActiveTimeout(client.getActiveTimeout()); + model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); + // 生成token + LoginHelper.login(loginUser, model); + + LoginVo loginVo = new LoginVo(); + loginVo.setAccessToken(StpUtil.getTokenValue()); + loginVo.setExpireIn(StpUtil.getTokenTimeout()); + loginVo.setClientId(client.getClientId()); + return loginVo; + } + + /** + * 校验邮箱验证码 + */ + private boolean validateEmailCode(String tenantId, String email, String emailCode) { + String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email); + if (StringUtils.isBlank(code)) { + loginService.recordLogininfor(tenantId, email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); + throw new CaptchaExpireException(); + } + return code.equals(emailCode); + } + + private SysUserVo loadUserByEmail(String email) { + SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getEmail, email)); + if (ObjectUtil.isNull(user)) { + log.info("登录用户:{} 不存在.", email); + throw new UserException("user.not.exists", email); + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + log.info("登录用户:{} 已被停用.", email); + throw new UserException("user.blocked", email); + } + return user; + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java new file mode 100644 index 0000000..a754c48 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java @@ -0,0 +1,136 @@ +package org.dromara.web.service.impl; + +import cn.dev33.satoken.secure.BCrypt; +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.domain.model.PasswordLoginBody; +import org.dromara.common.core.enums.LoginType; +import org.dromara.common.core.exception.user.CaptchaException; +import org.dromara.common.core.exception.user.CaptchaExpireException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.UserLoginUtil; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.common.web.config.properties.CaptchaProperties; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Service; + +/** + * 密码认证策略 + * + * @author Michelle.Chung + */ +@Slf4j +@Service("password" + IAuthStrategy.BASE_NAME) +@RequiredArgsConstructor +public class PasswordAuthStrategy implements IAuthStrategy { + + private final CaptchaProperties captchaProperties; + private final SysLoginService loginService; + private final SysUserMapper userMapper; + + @Override + public LoginVo login(String body, SysClientVo client) { + PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class); + ValidatorUtils.validate(loginBody); + String tenantId = loginBody.getTenantId(); + String username = loginBody.getUsername(); + String password = loginBody.getPassword(); + String code = loginBody.getCode(); + String uuid = loginBody.getUuid(); + + boolean captchaEnabled = captchaProperties.getEnable(); + // 验证码开关 + if (captchaEnabled) { + validateCaptcha(tenantId, username, code, uuid); + } + LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { + if(UserLoginUtil.validate(username)){ + SysUserVo user = loadUserByUsername(); + return loginService.buildLoginUser(user); + }else if(UserLoginUtil.validateId(username)){ + SysUserVo user = userMapper.selectVoById(1); + return loginService.buildLoginUser(user); + }else{ + SysUserVo user = loadUserByUsername(username); + loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !BCrypt.checkpw(password, user.getPassword())); + // 此处可根据登录用户的数据不同 自行创建 loginUser + return loginService.buildLoginUser(user); + } + }); + loginUser.setClientKey(client.getClientKey()); + loginUser.setDeviceType(client.getDeviceType()); + SaLoginModel model = new SaLoginModel(); + model.setDevice(client.getDeviceType()); + // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 + // 例如: 后台用户30分钟过期 app用户1天过期 + model.setTimeout(client.getTimeout()); + model.setActiveTimeout(client.getActiveTimeout()); + model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); + // 生成token + LoginHelper.login(loginUser, model); + + LoginVo loginVo = new LoginVo(); + loginVo.setAccessToken(StpUtil.getTokenValue()); + loginVo.setExpireIn(StpUtil.getTokenTimeout()); + loginVo.setClientId(client.getClientId()); + return loginVo; + } + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + */ + private void validateCaptcha(String tenantId, String username, String code, String uuid) { + String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, ""); + String captcha = RedisUtils.getCacheObject(verifyKey); + RedisUtils.deleteObject(verifyKey); + if (captcha == null) { + loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) { + loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")); + throw new CaptchaException(); + } + } + + private SysUserVo loadUserByUsername(String username) { + SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, username)); + if (ObjectUtil.isNull(user)) { + log.info("登录用户:{} 不存在.", username); + throw new UserException("user.not.exists", username); + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + log.info("登录用户:{} 已被停用.", username); + throw new UserException("user.blocked", username); + } + return user; + } + + private SysUserVo loadUserByUsername() { + return userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, LoginHelper.USER_NAME)); + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java new file mode 100644 index 0000000..2ffda35 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java @@ -0,0 +1,102 @@ +package org.dromara.web.service.impl; + +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.domain.model.SmsLoginBody; +import org.dromara.common.core.enums.LoginType; +import org.dromara.common.core.exception.user.CaptchaExpireException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Service; + +/** + * 短信认证策略 + * + * @author Michelle.Chung + */ +@Slf4j +@Service("sms" + IAuthStrategy.BASE_NAME) +@RequiredArgsConstructor +public class SmsAuthStrategy implements IAuthStrategy { + + private final SysLoginService loginService; + private final SysUserMapper userMapper; + + @Override + public LoginVo login(String body, SysClientVo client) { + SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class); + ValidatorUtils.validate(loginBody); + String tenantId = loginBody.getTenantId(); + String phonenumber = loginBody.getPhonenumber(); + String smsCode = loginBody.getSmsCode(); + LoginUser loginUser = TenantHelper.dynamic(tenantId, () -> { + SysUserVo user = loadUserByPhonenumber(phonenumber); + loginService.checkLogin(LoginType.SMS, tenantId, user.getUserName(), () -> !validateSmsCode(tenantId, phonenumber, smsCode)); + // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 + return loginService.buildLoginUser(user); + }); + loginUser.setClientKey(client.getClientKey()); + loginUser.setDeviceType(client.getDeviceType()); + SaLoginModel model = new SaLoginModel(); + model.setDevice(client.getDeviceType()); + // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 + // 例如: 后台用户30分钟过期 app用户1天过期 + model.setTimeout(client.getTimeout()); + model.setActiveTimeout(client.getActiveTimeout()); + model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); + // 生成token + LoginHelper.login(loginUser, model); + + LoginVo loginVo = new LoginVo(); + loginVo.setAccessToken(StpUtil.getTokenValue()); + loginVo.setExpireIn(StpUtil.getTokenTimeout()); + loginVo.setClientId(client.getClientId()); + return loginVo; + } + + /** + * 校验短信验证码 + */ + private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) { + String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber); + if (StringUtils.isBlank(code)) { + loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")); + throw new CaptchaExpireException(); + } + return code.equals(smsCode); + } + + private SysUserVo loadUserByPhonenumber(String phonenumber) { + SysUserVo user = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhonenumber, phonenumber)); + if (ObjectUtil.isNull(user)) { + log.info("登录用户:{} 不存在.", phonenumber); + throw new UserException("user.not.exists", phonenumber); + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + log.info("登录用户:{} 已被停用.", phonenumber); + throw new UserException("user.blocked", phonenumber); + } + return user; + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java new file mode 100644 index 0000000..419dbd6 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java @@ -0,0 +1,131 @@ +package org.dromara.web.service.impl; + +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.http.Method; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthUser; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.domain.model.SocialLoginBody; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.exception.user.UserException; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.social.config.properties.SocialProperties; +import org.dromara.common.social.utils.SocialUtils; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysSocialVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.service.ISysSocialService; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +/** + * 第三方授权策略 + * + * @author thiszhc is 三三 + */ +@Slf4j +@Service("social" + IAuthStrategy.BASE_NAME) +@RequiredArgsConstructor +public class SocialAuthStrategy implements IAuthStrategy { + + private final SocialProperties socialProperties; + private final ISysSocialService sysSocialService; + private final SysUserMapper userMapper; + private final SysLoginService loginService; + + /** + * 登录-第三方授权登录 + * + * @param body 登录信息 + * @param client 客户端信息 + */ + @Override + public LoginVo login(String body, SysClientVo client) { + SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class); + ValidatorUtils.validate(loginBody); + AuthResponse response = SocialUtils.loginAuth( + loginBody.getSource(), loginBody.getSocialCode(), + loginBody.getSocialState(), socialProperties); + if (!response.ok()) { + throw new ServiceException(response.getMsg()); + } + AuthUser authUserData = response.getData(); + if ("GITEE".equals(authUserData.getSource())) { + // 如用户使用 gitee 登录顺手 star 给作者一点支持 拒绝白嫖 + HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Vue-Plus") + .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) + .executeAsync(); + HttpUtil.createRequest(Method.PUT, "https://gitee.com/api/v5/user/starred/dromara/RuoYi-Cloud-Plus") + .formStr(MapUtil.of("access_token", authUserData.getToken().getAccessToken())) + .executeAsync(); + } + + List list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid()); + if (CollUtil.isEmpty(list)) { + throw new ServiceException("你还没有绑定第三方账号,绑定后才可以登录!"); + } + SysSocialVo social; + if (TenantHelper.isEnable()) { + Optional opt = StreamUtils.findAny(list, x -> x.getTenantId().equals(loginBody.getTenantId())); + if (opt.isEmpty()) { + throw new ServiceException("对不起,你没有权限登录当前租户!"); + } + social = opt.get(); + } else { + social = list.get(0); + } + LoginUser loginUser = TenantHelper.dynamic(social.getTenantId(), () -> { + SysUserVo user = loadUser(social.getUserId()); + // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 + return loginService.buildLoginUser(user); + }); + loginUser.setClientKey(client.getClientKey()); + loginUser.setDeviceType(client.getDeviceType()); + SaLoginModel model = new SaLoginModel(); + model.setDevice(client.getDeviceType()); + // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 + // 例如: 后台用户30分钟过期 app用户1天过期 + model.setTimeout(client.getTimeout()); + model.setActiveTimeout(client.getActiveTimeout()); + model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); + // 生成token + LoginHelper.login(loginUser, model); + + LoginVo loginVo = new LoginVo(); + loginVo.setAccessToken(StpUtil.getTokenValue()); + loginVo.setExpireIn(StpUtil.getTokenTimeout()); + loginVo.setClientId(client.getClientId()); + return loginVo; + } + + private SysUserVo loadUser(Long userId) { + SysUserVo user = userMapper.selectVoById(userId); + if (ObjectUtil.isNull(user)) { + log.info("登录用户:{} 不存在.", ""); + throw new UserException("user.not.exists", ""); + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + log.info("登录用户:{} 已被停用.", ""); + throw new UserException("user.blocked", ""); + } + return user; + } + +} diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java new file mode 100644 index 0000000..fa9b618 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java @@ -0,0 +1,111 @@ +package org.dromara.web.service.impl; + +import cn.dev33.satoken.stp.SaLoginModel; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthToken; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.request.AuthRequest; +import me.zhyd.oauth.request.AuthWechatMiniProgramRequest; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.model.XcxLoginBody; +import org.dromara.common.core.domain.model.XcxLoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.web.domain.vo.LoginVo; +import org.dromara.web.service.IAuthStrategy; +import org.dromara.web.service.SysLoginService; +import org.springframework.stereotype.Service; + +/** + * 小程序认证策略 + * + * @author Michelle.Chung + */ +@Slf4j +@Service("xcx" + IAuthStrategy.BASE_NAME) +@RequiredArgsConstructor +public class XcxAuthStrategy implements IAuthStrategy { + + private final SysLoginService loginService; + + @Override + public LoginVo login(String body, SysClientVo client) { + XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class); + ValidatorUtils.validate(loginBody); + // xcxCode 为 小程序调用 wx.login 授权后获取 + String xcxCode = loginBody.getXcxCode(); + // 多个小程序识别使用 + String appid = loginBody.getAppid(); + + // 校验 appid + appsrcret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid + AuthRequest authRequest = new AuthWechatMiniProgramRequest(AuthConfig.builder() + .clientId(appid).clientSecret("自行填写密钥 可根据不同appid填入不同密钥") + .ignoreCheckRedirectUri(true).ignoreCheckState(true).build()); + AuthCallback authCallback = new AuthCallback(); + authCallback.setCode(xcxCode); + AuthResponse resp = authRequest.login(authCallback); + String openid, unionId; + if (resp.ok()) { + AuthToken token = resp.getData().getToken(); + openid = token.getOpenId(); + // 微信小程序只有关联到微信开放平台下之后才能获取到 unionId,因此unionId不一定能返回。 + unionId = token.getUnionId(); + } else { + throw new ServiceException(resp.getMsg()); + } + // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可 + SysUserVo user = loadUserByOpenid(openid); + // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了 + XcxLoginUser loginUser = new XcxLoginUser(); + loginUser.setTenantId(user.getTenantId()); + loginUser.setUserId(user.getUserId()); + loginUser.setUsername(user.getUserName()); + loginUser.setNickname(user.getNickName()); + loginUser.setUserType(user.getUserType()); + loginUser.setClientKey(client.getClientKey()); + loginUser.setDeviceType(client.getDeviceType()); + loginUser.setOpenid(openid); + + SaLoginModel model = new SaLoginModel(); + model.setDevice(client.getDeviceType()); + // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 + // 例如: 后台用户30分钟过期 app用户1天过期 + model.setTimeout(client.getTimeout()); + model.setActiveTimeout(client.getActiveTimeout()); + model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId()); + // 生成token + LoginHelper.login(loginUser, model); + + LoginVo loginVo = new LoginVo(); + loginVo.setAccessToken(StpUtil.getTokenValue()); + loginVo.setExpireIn(StpUtil.getTokenTimeout()); + loginVo.setClientId(client.getClientId()); + loginVo.setOpenid(openid); + return loginVo; + } + + private SysUserVo loadUserByOpenid(String openid) { + // 使用 openid 查询绑定用户 如未绑定用户 则根据业务自行处理 例如 创建默认用户 + // todo 自行实现 userService.selectUserByOpenid(openid); + SysUserVo user = new SysUserVo(); + if (ObjectUtil.isNull(user)) { + log.info("登录用户:{} 不存在.", openid); + // todo 用户不存在 业务逻辑自行实现 + } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + log.info("登录用户:{} 已被停用.", openid); + // todo 用户已被停用 业务逻辑自行实现 + } + return user; + } + +} diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml new file mode 100644 index 0000000..d85cf99 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -0,0 +1,271 @@ +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: true + url: http://localhost:9090/admin + instance: + service-host-type: IP + metadata: + username: ${spring.boot.admin.client.username} + userpassword: ${spring.boot.admin.client.password} + username: @monitor.username@ + password: @monitor.password@ + +--- # snail-job 配置 +snail-job: + enabled: true + # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 + group: "ruoyi_group" + # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 + token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" + server: + host: 127.0.0.1 + port: 17888 + # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 + namespace: ${spring.profiles.active} + # 随主应用端口漂移 + port: 2${server.port} + # 客户端ip指定 + host: + # RPC类型: netty, grpc + rpc-type: grpc + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: true + # 设置默认的数据源或者数据源组,默认值即为 master + primary: master + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 + master: + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) +# url: jdbc:mysql://localhost:3306/jcs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: root + url: jdbc:mysql://erp9.52o.site:13308/jcs20250106?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: jcs20250106 + password: esXkafdSMsxRAkNe + # 从库数据源 + slave: + lazy: false + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://124.223.56.113:13306/cailiao1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: cailiao1 + password: j5RcfMwRG2WMHyAC +# url: jdbc:mysql://localhost:3306/cailiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: +# password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# postgres: +# type: ${spring.datasource.type} +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间,默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟 + maxLifetime: 1800000 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: localhost + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # redis 密码必须配置 + password: Huitu123 + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +# redisson 配置 +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 4 + # Netty线程池数量 + nettyThreads: 8 + # 单节点配置 + singleServerConfig: + # 客户端名称 不能用中文 + clientName: RuoYi-Vue-Plus + # 最小空闲连接数 + connectionMinimumIdleSize: 8 + # 连接池大小 + connectionPoolSize: 32 + # 连接空闲超时,单位:毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时,单位:毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + # 发送方,遵循RFC-822标准 + from: xxx@163.com + # 用户名(注意:如果使用foxmail邮箱,此处user为qq号) + user: xxx@163.com + # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助) + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长,单位毫秒,缺省值不超时 + timeout: 0 + # Socket连接超时值,单位毫秒,缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置,可以配置多个同时使用 +sms: + # 配置源类型用于标定配置来源(interface,yaml) + config-type: yaml + # 用于标定yml中的配置是否开启短信拦截,接口配置不受此限制 + restricted: true + # 短信拦截限制单手机号每分钟最大发送,只对开启了拦截的配置有效 + minute-max: 1 + # 短信拦截限制单手机号每日最大发送量,只对开启了拦截的配置有效 + account-max: 30 + # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + blends: + # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 + # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 + config1: + # 框架定义的厂商名称标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 + supplier: alibaba + # 有些称为accessKey有些称之为apiKey,也有称为sdkKey或者appId。 + access-key-id: 您的accessKey + # 称为accessSecret有些称之为apiSecret + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + config2: + # 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 + supplier: tencent + access-key-id: 您的accessKey + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + + +--- # 三方授权 +justauth: + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + topiam: + # topiam 服务器地址 + server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol + client-id: 449c4*********937************759 + client-secret: ac7***********1e0************28d + redirect-uri: ${justauth.address}/social-callback?source=topiam + scopes: [openid, email, phone, profile] + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml new file mode 100644 index 0000000..a8c87b7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -0,0 +1,273 @@ +--- # 临时文件存储位置 避免临时文件被系统清理报错 +spring.servlet.multipart.location: /ruoyi/server/temp + +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: true + url: http://localhost:9090/admin + instance: + service-host-type: IP + metadata: + username: ${spring.boot.admin.client.username} + userpassword: ${spring.boot.admin.client.password} + username: @monitor.username@ + password: @monitor.password@ + +--- # snail-job 配置 +snail-job: + enabled: false + # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 + group: "ruoyi_group" + # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 + token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" + server: + host: 127.0.0.1 + port: 17888 + # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段 + namespace: ${spring.profiles.active} + # 随主应用端口漂移 + port: 2${server.port} + # 客户端ip指定 + host: + # RPC类型: netty, grpc + rpc-type: grpc + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: false + # 设置默认的数据源或者数据源组,默认值即为 master + primary: master + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 + master: + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) + # url: jdbc:mysql://localhost:3306/cailiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + # username: root + # password: root + url: jdbc:mysql://124.223.56.113:13306/cailiao1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: cailiao1 + password: j5RcfMwRG2WMHyAC + # 从库数据源 + slave: + lazy: false + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://124.223.56.113:13306/cailiao1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + username: cailiao1 + password: j5RcfMwRG2WMHyAC + # url: jdbc:mysql://localhost:3306/cailiao?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + # username: + # password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# postgres: +# type: ${spring.datasource.type} +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间,默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟 + maxLifetime: 1800000 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: localhost + # 端口,默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # redis 密码必须配置 + password: Huitu123 + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +# redisson 配置 +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 16 + # Netty线程池数量 + nettyThreads: 32 + # 单节点配置 + singleServerConfig: + # 客户端名称 不能用中文 + clientName: RuoYi-Vue-Plus + # 最小空闲连接数 + connectionMinimumIdleSize: 32 + # 连接池大小 + connectionPoolSize: 64 + # 连接空闲超时,单位:毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时,单位:毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + # 发送方,遵循RFC-822标准 + from: xxx@163.com + # 用户名(注意:如果使用foxmail邮箱,此处user为qq号) + user: xxx@163.com + # 密码(注意,某些邮箱需要为SMTP服务单独设置密码,详情查看相关帮助) + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长,单位毫秒,缺省值不超时 + timeout: 0 + # Socket连接超时值,单位毫秒,缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置,可以配置多个同时使用 +sms: + # 配置源类型用于标定配置来源(interface,yaml) + config-type: yaml + # 用于标定yml中的配置是否开启短信拦截,接口配置不受此限制 + restricted: true + # 短信拦截限制单手机号每分钟最大发送,只对开启了拦截的配置有效 + minute-max: 1 + # 短信拦截限制单手机号每日最大发送量,只对开启了拦截的配置有效 + account-max: 30 + # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中 + blends: + # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可 + # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号 也可用于区分租户 + config1: + # 框架定义的厂商名称标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 + supplier: alibaba + # 有些称为accessKey有些称之为apiKey,也有称为sdkKey或者appId。 + access-key-id: 您的accessKey + # 称为accessSecret有些称之为apiSecret + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + config2: + # 厂商标识,标定此配置是哪个厂商,详细请看厂商标识介绍部分 + supplier: tencent + access-key-id: 您的accessKey + access-key-secret: 您的accessKeySecret + signature: 您的短信签名 + sdk-app-id: 您的sdkAppId + +--- # 三方授权 +justauth: + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + topiam: + # topiam 服务器地址 + server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol + client-id: 449c4*********937************759 + client-secret: ac7***********1e0************28d + redirect-uri: ${justauth.address}/social-callback?source=topiam + scopes: [ openid, email, phone, profile ] + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml new file mode 100644 index 0000000..ba5db2b --- /dev/null +++ b/ruoyi-admin/src/main/resources/application.yml @@ -0,0 +1,340 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: JCS-ADMIN + # 版本 + version: ${revision} + # 版权年份 + copyrightYear: 2024 + +# 开发环境配置 +server: + # 服务器的HTTP端口,默认为8080 + port: 8080 + servlet: + # 应用的访问路径 + context-path: / + # undertow 配置 + undertow: + # HTTP post内容的最大大小。当值为-1时,默认值为大小是无限的 + max-http-post-size: -1 + # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 + # 每块buffer的空间大小,越小的空间被利用越充分 + buffer-size: 512 + # 是否分配的直接内存 + direct-buffers: true + threads: + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + io: 8 + # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 + worker: 256 + accesslog: + enabled: true + charset: UTF-8 + +captcha: + enable: true + # 页面 <参数设置> 可开启关闭 验证码校验 + # 验证码类型 math 数组计算 char 字符验证 + type: MATH + # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰 + category: CIRCLE + # 数字验证码位数 + numberLength: 1 + # 字符验证码长度 + charLength: 4 + +# 日志配置 +logging: + level: + org.dromara: @logging.level@ + org.springframework: warn + org.mybatis.spring.mapper: error + org.apache.fury: warn + config: classpath:logback-plus.xml + charset: + console: UTF-8 + file: UTF-8 + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间(默认10分钟) + lockTime: 10 + +# Spring配置 +spring: + application: + name: RuoYi-Vue-Plus + threads: + # 开启虚拟线程 仅jdk21可用 + virtual: + enabled: false + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: + active: @profiles.active@ + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + mvc: + # 设置静态资源路径 防止所有请求都去查静态资源 + static-path-pattern: /static/** + format: + date-time: yyyy-MM-dd HH:mm:ss + jackson: + # 日期格式化 + date-format: yyyy-MM-dd HH:mm:ss + serialization: + # 格式化输出 + indent_output: false + # 忽略无法转换的对象 + fail_on_empty_beans: false + deserialization: + # 允许对象忽略json中不存在的属性 + fail_on_unknown_properties: false + output: + ansi: + enabled: always + +# Sa-Token配置 +sa-token: + # token名称 (同时也是cookie名称) + token-name: Authorization + # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) + is-concurrent: true + # 在多人登录同一账号时,是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) + is-share: false + # jwt秘钥 + jwt-secret-key: abcdefghijklmnopqrstuvwxyz + +# security配置 +security: + # 排除路径 + excludes: + - /*.html + - /**/*.html + - /**/*.css + - /**/*.js + - /favicon.ico + - /error + - /*/api-docs + - /*/api-docs/** + - /warm-flow-ui/token-name + # actuator 监控配置 + - /actuator + - /actuator/** + - /mall/orderShare/getOrderShare/** + - /mall/Lakala/** + +# 多租户配置 +tenant: + # 是否开启 + enable: true + # 排除表 + excludes: + - sys_menu + - sys_tenant + - sys_tenant_package + - sys_role_dept + - sys_role_menu + - sys_user_post + - sys_user_role + - sys_client + - sys_oss_config + - sys_user + - tz_index_img + - tz_category + - tz_prod_prop_value + - tz_sku + - tz_prod + - tz_order + - tz_order_payment + - tz_customer + - tz_order_all + - tz_order_receive + - tz_order_record + - tz_customer_record + - tz_prod_record + - tz_order_share + - tz_user_address + - tz_user + - tz_picture_album + - tz_prod_relation + - hy_code_order + - hy_member_code + - hy_promoter + - hy_promoter_record + - hy_user_record + - tz_bank_card + - tz_withdraw_request + - hy_order_item + - hy_order + - hy_coupon_record + - tz_prod_wishlist + - tz_invoice_apply + - tz_invoice_title + - hy_order_payment + - tz_tenant_record + - tz_notice + - tz_prod_comm + +# MyBatisPlus配置 +# https://baomidou.com/config/ +mybatis-plus: + # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效 + enableLogicDelete: true + # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper + mapperPackage: org.dromara.**.mapper + # 对应的 XML 文件位置 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 实体扫描,多个package用逗号或者分号分隔 + typeAliasesPackage: org.dromara.**.domain + global-config: + dbConfig: + # 主键类型 + # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID + # 如需改为自增 需要将数据库表全部设置为自增 + idType: AUTO + +# 数据加密 +mybatis-encryptor: + # 是否开启加密 + enable: false + # 默认加密算法 + algorithm: BASE64 + # 编码方式 BASE64/HEX。默认BASE64 + encode: BASE64 + # 安全秘钥 对称算法的秘钥 如:AES,SM4 + password: + # 公私钥 非对称算法的公私钥 如:SM2,RSA + publicKey: + privateKey: + +# api接口加密 +api-decrypt: + # 是否开启全局接口加密 + enabled: true + # AES 加密头标识 + headerFlag: encrypt-key + # 响应加密公钥 非对称算法的公私钥 如:SM2,RSA 使用者请自行更换 + # 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE= + publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ== + # 请求解密私钥 非对称算法的公私钥 如:SM2,RSA 使用者请自行更换 + # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ== + privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= + +springdoc: + api-docs: + # 是否开启接口文档 + enabled: true +# swagger-ui: +# # 持久化认证数据 +# persistAuthorization: true + info: + # 标题 + title: '标题:${ruoyi.name}商城后台系统_接口文档' + # 描述 + description: '描述:商城后台管理系统接口文档' + # 版本 + version: '版本号: ${ruoyi.version}' + # 作者信息 + contact: + name: Maosw + email: 136767481@qq.com + components: + # 鉴权方式配置 + security-schemes: + apiKey: + type: APIKEY + in: HEADER + name: ${sa-token.token-name} + #这里定义了两个分组,可定义多个,也可以不定义 + group-configs: + - group: 1.通用模块 + packages-to-scan: org.dromara.web + - group: 2.系统模块 + packages-to-scan: org.dromara.system + - group: 3.商城模块 + packages-to-scan: org.dromara.mall + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接(多个用逗号分隔) + excludeUrls: + - /system/notice + - /mall/prod + - /workflow/model/save + - /workflow/model/editModelXml + - /mall/notice + - /warm-flow/save-xml + +# 全局线程池相关配置 +# 如使用JDK21请直接使用虚拟线程 不要开启此配置 +thread-pool: + # 是否开启线程池 + enabled: false + # 队列最大长度 + queueCapacity: 128 + # 线程池维护线程所允许的空闲时间 + keepAliveSeconds: 300 + +--- # 分布式锁 lock4j 全局配置 +lock4j: + # 获取分布式锁超时时间,默认为 3000 毫秒 + acquire-timeout: 3000 + # 分布式锁的超时时间,默认为 30 秒 + expire: 30000 + +--- # Actuator 监控端点的配置项 +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + logfile: + external-file: ./logs/sys-console.log + +--- # 默认/推荐使用sse推送 +sse: + enabled: true + path: /resource/sse + +--- # websocket +websocket: + # 如果关闭 需要和前端开关一起关闭 + enabled: true + # 路径 + path: /resource/websocket + # 设置访问源地址 + allowedOrigins: '*' + +--- # warm-flow工作流配置 +warm-flow: + # 是否开启工作流,默认true + enabled: false + # 是否开启设计器ui + ui: true + # 默认Authorization,如果有多个token,用逗号分隔 + token-name: ${sa-token.token-name},clientid + # 流程状态对应的三元色 + chart-status-color: + ## 未办理 + - 157,255,0 + ## 待办理 + - 0,0,0 + ## 已办理 + - 255,200,0 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt new file mode 100644 index 0000000..21b1126 --- /dev/null +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +Application Version: ${revision} +Spring Boot Version: ${spring-boot.version} +__________ _____.___.__ ____ ____ __________.__ +\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ + | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/ + | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \ + |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ > + \/ \/ \/ \/ diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..cce11c8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -0,0 +1,61 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=对不起, 您的账号:{0} 不存在. +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次,帐户锁定{1}分钟 +user.password.delete=对不起,您的账号:{0} 已被删除 +user.blocked=对不起,您的账号:{0} 已禁用,请联系管理员 +role.blocked=角色已封禁,请联系管理员 +user.logout.success=退出成功 +length.not.valid=长度必须在{min}到{max}个字符之间 +user.username.not.blank=用户名不能为空 +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成,且必须以非数字开头 +user.username.length.valid=账户长度必须在{min}到{max}个字符之间 +user.password.not.blank=用户密码不能为空 +user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 +user.password.not.valid=* 5-50个字符 +user.email.not.valid=邮箱格式错误 +user.email.not.blank=邮箱不能为空 +user.phonenumber.not.blank=用户手机号不能为空 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.register.save.error=保存用户 {0} 失败,注册账号已存在 +user.register.error=注册失败,请联系系统管理人员 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出,请重新登录 +user.unknown.error=未知错误,请重新登录 +auth.grant.type.error=认证权限类型错误 +auth.grant.type.blocked=认证权限类型已禁用 +auth.grant.type.not.blank=认证权限类型不能为空 +auth.clientid.not.blank=认证客户端id不能为空 +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小!
允许的文件最大大小是:{0}MB! +upload.filename.exceed.length=上传的文件名最长{0}个字符 +##权限 +no.permission=您没有数据的权限,请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限,请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限,请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限,请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限,请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限,请联系管理员添加权限 [{0}] +repeat.submit.message=不允许重复提交,请稍候再试 +rate.limiter.message=访问过于频繁,请稍候再试 +sms.code.not.blank=短信验证码不能为空 +sms.code.retry.limit.count=短信验证码输入错误{0}次 +sms.code.retry.limit.exceed=短信验证码输入错误{0}次,帐户锁定{1}分钟 +email.code.not.blank=邮箱验证码不能为空 +email.code.retry.limit.count=邮箱验证码输入错误{0}次 +email.code.retry.limit.exceed=邮箱验证码输入错误{0}次,帐户锁定{1}分钟 +xcx.code.not.blank=小程序[code]不能为空 +social.source.not.blank=第三方登录平台[source]不能为空 +social.code.not.blank=第三方登录平台[code]不能为空 +social.state.not.blank=第三方登录平台[state]不能为空 +##租户 +tenant.number.not.blank=租户编号不能为空 +tenant.not.exists=对不起, 您的租户不存在,请联系管理员 +tenant.blocked=对不起,您的租户已禁用,请联系管理员 +tenant.expired=对不起,您的租户已过期,请联系管理员 diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000..4129f1d --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1,61 @@ +#???? +not.null=* Required fill in +user.jcaptcha.error=Captcha error +user.jcaptcha.expire=Captcha invalid +user.not.exists=Sorry, your account: {0} does not exist +user.password.not.match=User does not exist/Password error +user.password.retry.limit.count=Password input error {0} times +user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes +user.password.delete=Sorry, your account?{0} has been deleted +user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator +role.blocked=Role disabled?please contact administrators +user.logout.success=Exit successful +length.not.valid=The length must be between {min} and {max} characters +user.username.not.blank=Username cannot be blank +user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number +user.username.length.valid=Account length must be between {min} and {max} characters +user.password.not.blank=Password cannot be empty +user.password.length.valid=Password length must be between {min} and {max} characters +user.password.not.valid=* 5-50 characters +user.email.not.valid=Mailbox format error +user.email.not.blank=Mailbox cannot be blank +user.phonenumber.not.blank=Phone number cannot be blank +user.mobile.phone.number.not.valid=Phone number format error +user.login.success=Login successful +user.register.success=Register successful +user.register.save.error=Failed to save user {0}, The registered account already exists +user.register.error=Register failed, please contact system administrator +user.notfound=Please login again +user.forcelogout=The administrator is forced to exit?please login again +user.unknown.error=Unknown error, please login again +auth.grant.type.error=Auth grant type error +auth.grant.type.blocked=Auth grant type disabled +auth.grant.type.not.blank=Auth grant type cannot be blank +auth.clientid.not.blank=Auth clientid cannot be blank +##?????? +upload.exceed.maxSize=The uploaded file size exceeds the limit file size?
the maximum allowed file size is?{0}MB? +upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters +##?? +no.permission=You do not have permission to the data?please contact your administrator to add permissions [{0}] +no.create.permission=You do not have permission to create data?please contact your administrator to add permissions [{0}] +no.update.permission=You do not have permission to modify data?please contact your administrator to add permissions [{0}] +no.delete.permission=You do not have permission to delete data?please contact your administrator to add permissions [{0}] +no.export.permission=You do not have permission to export data?please contact your administrator to add permissions [{0}] +no.view.permission=You do not have permission to view data?please contact your administrator to add permissions [{0}] +repeat.submit.message=Repeat submit is not allowed, please try again later +rate.limiter.message=Visit too frequently, please try again later +sms.code.not.blank=Sms code cannot be blank +sms.code.retry.limit.count=Sms code input error {0} times +sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {1} minutes +email.code.not.blank=Email code cannot be blank +email.code.retry.limit.count=Email code input error {0} times +email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes +xcx.code.not.blank=Mini program [code] cannot be blank +social.source.not.blank=Social login platform [source] cannot be blank +social.code.not.blank=Social login platform [code] cannot be blank +social.state.not.blank=Social login platform [state] cannot be blank +##?? +tenant.number.not.blank=Tenant number cannot be blank +tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator +tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator +tenant.expired=Sorry, your tenant has expired. Please contact the administrator. diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000..cce11c8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1,61 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=对不起, 您的账号:{0} 不存在. +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次,帐户锁定{1}分钟 +user.password.delete=对不起,您的账号:{0} 已被删除 +user.blocked=对不起,您的账号:{0} 已禁用,请联系管理员 +role.blocked=角色已封禁,请联系管理员 +user.logout.success=退出成功 +length.not.valid=长度必须在{min}到{max}个字符之间 +user.username.not.blank=用户名不能为空 +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成,且必须以非数字开头 +user.username.length.valid=账户长度必须在{min}到{max}个字符之间 +user.password.not.blank=用户密码不能为空 +user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 +user.password.not.valid=* 5-50个字符 +user.email.not.valid=邮箱格式错误 +user.email.not.blank=邮箱不能为空 +user.phonenumber.not.blank=用户手机号不能为空 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.register.save.error=保存用户 {0} 失败,注册账号已存在 +user.register.error=注册失败,请联系系统管理人员 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出,请重新登录 +user.unknown.error=未知错误,请重新登录 +auth.grant.type.error=认证权限类型错误 +auth.grant.type.blocked=认证权限类型已禁用 +auth.grant.type.not.blank=认证权限类型不能为空 +auth.clientid.not.blank=认证客户端id不能为空 +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小!
允许的文件最大大小是:{0}MB! +upload.filename.exceed.length=上传的文件名最长{0}个字符 +##权限 +no.permission=您没有数据的权限,请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限,请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限,请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限,请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限,请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限,请联系管理员添加权限 [{0}] +repeat.submit.message=不允许重复提交,请稍候再试 +rate.limiter.message=访问过于频繁,请稍候再试 +sms.code.not.blank=短信验证码不能为空 +sms.code.retry.limit.count=短信验证码输入错误{0}次 +sms.code.retry.limit.exceed=短信验证码输入错误{0}次,帐户锁定{1}分钟 +email.code.not.blank=邮箱验证码不能为空 +email.code.retry.limit.count=邮箱验证码输入错误{0}次 +email.code.retry.limit.exceed=邮箱验证码输入错误{0}次,帐户锁定{1}分钟 +xcx.code.not.blank=小程序[code]不能为空 +social.source.not.blank=第三方登录平台[source]不能为空 +social.code.not.blank=第三方登录平台[code]不能为空 +social.state.not.blank=第三方登录平台[state]不能为空 +##租户 +tenant.number.not.blank=租户编号不能为空 +tenant.not.exists=对不起, 您的租户不存在,请联系管理员 +tenant.blocked=对不起,您的租户已禁用,请联系管理员 +tenant.expired=对不起,您的租户已过期,请联系管理员 diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/ruoyi-admin/src/main/resources/ip2region.xdb new file mode 100644 index 0000000..7052c05 Binary files /dev/null and b/ruoyi-admin/src/main/resources/ip2region.xdb differ diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/ruoyi-admin/src/main/resources/logback-plus.xml new file mode 100644 index 0000000..b74289e --- /dev/null +++ b/ruoyi-admin/src/main/resources/logback-plus.xml @@ -0,0 +1,129 @@ + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + ${log.path}/sys-console.log + + + ${log.path}/sys-console.%d{yyyy-MM-dd}.log + + 1 + + + ${log.pattern} + utf-8 + + + + INFO + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + 0 + + 512 + + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java new file mode 100644 index 0000000..dba2323 --- /dev/null +++ b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java @@ -0,0 +1,45 @@ +package org.dromara.test; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * 断言单元测试案例 + * + * @author Lion Li + */ +@DisplayName("断言单元测试案例") +public class AssertUnitTest { + + @DisplayName("测试 assertEquals 方法") + @Test + public void testAssertEquals() { + Assertions.assertEquals("666", new String("666")); + Assertions.assertNotEquals("666", new String("666")); + } + + @DisplayName("测试 assertSame 方法") + @Test + public void testAssertSame() { + Object obj = new Object(); + Object obj1 = obj; + Assertions.assertSame(obj, obj1); + Assertions.assertNotSame(obj, obj1); + } + + @DisplayName("测试 assertTrue 方法") + @Test + public void testAssertTrue() { + Assertions.assertTrue(true); + Assertions.assertFalse(true); + } + + @DisplayName("测试 assertNull 方法") + @Test + public void testAssertNull() { + Assertions.assertNull(null); + Assertions.assertNotNull(null); + } + +} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java new file mode 100644 index 0000000..2d11a10 --- /dev/null +++ b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java @@ -0,0 +1,70 @@ +package org.dromara.test; + +import org.dromara.common.web.config.properties.CaptchaProperties; +import org.junit.jupiter.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.concurrent.TimeUnit; + +/** + * 单元测试案例 + * + * @author Lion Li + */ +@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 +@DisplayName("单元测试案例") +public class DemoUnitTest { + + @Autowired + private CaptchaProperties captchaProperties; + + @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") + @Test + public void testTest() { + System.out.println(captchaProperties); + } + + @Disabled + @DisplayName("测试 @Disabled 注解") + @Test + public void testDisabled() { + System.out.println(captchaProperties); + } + + @Timeout(value = 2L, unit = TimeUnit.SECONDS) + @DisplayName("测试 @Timeout 注解") + @Test + public void testTimeout() throws InterruptedException { + Thread.sleep(3000); + System.out.println(captchaProperties); + } + + + @DisplayName("测试 @RepeatedTest 注解") + @RepeatedTest(3) + public void testRepeatedTest() { + System.out.println(666); + } + + @BeforeAll + public static void testBeforeAll() { + System.out.println("@BeforeAll =================="); + } + + @BeforeEach + public void testBeforeEach() { + System.out.println("@BeforeEach =================="); + } + + @AfterEach + public void testAfterEach() { + System.out.println("@AfterEach =================="); + } + + @AfterAll + public static void testAfterAll() { + System.out.println("@AfterAll =================="); + } + +} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java new file mode 100644 index 0000000..1db51df --- /dev/null +++ b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java @@ -0,0 +1,72 @@ +package org.dromara.test; + +import org.dromara.common.core.enums.UserType; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; +import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.NullSource; +import org.junit.jupiter.params.provider.ValueSource; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + +/** + * 带参数单元测试案例 + * + * @author Lion Li + */ +@DisplayName("带参数单元测试案例") +public class ParamUnitTest { + + @DisplayName("测试 @ValueSource 注解") + @ParameterizedTest + @ValueSource(strings = {"t1", "t2", "t3"}) + public void testValueSource(String str) { + System.out.println(str); + } + + @DisplayName("测试 @NullSource 注解") + @ParameterizedTest + @NullSource + public void testNullSource(String str) { + System.out.println(str); + } + + @DisplayName("测试 @EnumSource 注解") + @ParameterizedTest + @EnumSource(UserType.class) + public void testEnumSource(UserType type) { + System.out.println(type.getUserType()); + } + + @DisplayName("测试 @MethodSource 注解") + @ParameterizedTest + @MethodSource("getParam") + public void testMethodSource(String str) { + System.out.println(str); + } + + public static Stream getParam() { + List list = new ArrayList<>(); + list.add("t1"); + list.add("t2"); + list.add("t3"); + return list.stream(); + } + + @BeforeEach + public void testBeforeEach() { + System.out.println("@BeforeEach =================="); + } + + @AfterEach + public void testAfterEach() { + System.out.println("@AfterEach =================="); + } + + +} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java new file mode 100644 index 0000000..b50afa6 --- /dev/null +++ b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java @@ -0,0 +1,54 @@ +package org.dromara.test; + +import org.junit.jupiter.api.*; +import org.springframework.boot.test.context.SpringBootTest; + +/** + * 标签单元测试案例 + * + * @author Lion Li + */ +@SpringBootTest +@DisplayName("标签单元测试案例") +public class TagUnitTest { + + @Tag("dev") + @DisplayName("测试 @Tag dev") + @Test + public void testTagDev() { + System.out.println("dev"); + } + + @Tag("prod") + @DisplayName("测试 @Tag prod") + @Test + public void testTagProd() { + System.out.println("prod"); + } + + @Tag("local") + @DisplayName("测试 @Tag local") + @Test + public void testTagLocal() { + System.out.println("local"); + } + + @Tag("exclude") + @DisplayName("测试 @Tag exclude") + @Test + public void testTagExclude() { + System.out.println("exclude"); + } + + @BeforeEach + public void testBeforeEach() { + System.out.println("@BeforeEach =================="); + } + + @AfterEach + public void testAfterEach() { + System.out.println("@AfterEach =================="); + } + + +} diff --git a/ruoyi-admin/zhFonts/.uuid b/ruoyi-admin/zhFonts/.uuid new file mode 100644 index 0000000..cee5cdd --- /dev/null +++ b/ruoyi-admin/zhFonts/.uuid @@ -0,0 +1 @@ +3f2ee348-0303-40ca-bf03-03f48d2d2141 \ No newline at end of file diff --git a/ruoyi-admin/zhFonts/SIMSUN.TTC b/ruoyi-admin/zhFonts/SIMSUN.TTC new file mode 100644 index 0000000..6ca8de3 Binary files /dev/null and b/ruoyi-admin/zhFonts/SIMSUN.TTC differ diff --git a/ruoyi-admin/zhFonts/fonts.dir b/ruoyi-admin/zhFonts/fonts.dir new file mode 100644 index 0000000..fed9544 --- /dev/null +++ b/ruoyi-admin/zhFonts/fonts.dir @@ -0,0 +1,4 @@ +3 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-iso10646-1 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-iso8859-1 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-koi8-r diff --git a/ruoyi-admin/zhFonts/fonts.scale b/ruoyi-admin/zhFonts/fonts.scale new file mode 100644 index 0000000..fed9544 --- /dev/null +++ b/ruoyi-admin/zhFonts/fonts.scale @@ -0,0 +1,4 @@ +3 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-iso10646-1 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-iso8859-1 +SIMSUN.TTC -misc-simsun-medium-r-normal--0-0-0-0-p-0-koi8-r diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml new file mode 100644 index 0000000..5beddba --- /dev/null +++ b/ruoyi-common/pom.xml @@ -0,0 +1,48 @@ + + + + ruoyi-vue-plus + org.dromara + ${revision} + + 4.0.0 + + + ruoyi-common-bom + ruoyi-common-social + ruoyi-common-core + ruoyi-common-doc + ruoyi-common-excel + ruoyi-common-idempotent + ruoyi-common-job + ruoyi-common-log + ruoyi-common-mail + ruoyi-common-mybatis + ruoyi-common-oss + ruoyi-common-ratelimiter + ruoyi-common-redis + ruoyi-common-satoken + ruoyi-common-security + ruoyi-common-sms + ruoyi-common-web + ruoyi-common-translation + ruoyi-common-sensitive + ruoyi-common-json + ruoyi-common-encrypt + ruoyi-common-tenant + ruoyi-common-websocket + ruoyi-common-sse + ruoyi-common-pay + ruoyi-common-pay-new + + + ruoyi-common + pom + + + common 通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml new file mode 100644 index 0000000..24acb08 --- /dev/null +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -0,0 +1,185 @@ + + + 4.0.0 + + org.dromara + ruoyi-common-bom + ${revision} + pom + + + ruoyi-common-bom common依赖项 + + + + 5.3.0 + + + + + + + org.dromara + ruoyi-common-core + ${revision} + + + + + org.dromara + ruoyi-common-doc + ${revision} + + + + + org.dromara + ruoyi-common-excel + ${revision} + + + + + org.dromara + ruoyi-common-idempotent + ${revision} + + + + + org.dromara + ruoyi-common-job + ${revision} + + + + + org.dromara + ruoyi-common-log + ${revision} + + + + + org.dromara + ruoyi-common-mail + ${revision} + + + + + org.dromara + ruoyi-common-mybatis + ${revision} + + + + + org.dromara + ruoyi-common-oss + ${revision} + + + + + org.dromara + ruoyi-common-ratelimiter + ${revision} + + + + + org.dromara + ruoyi-common-redis + ${revision} + + + + + org.dromara + ruoyi-common-satoken + ${revision} + + + + + org.dromara + ruoyi-common-security + ${revision} + + + + + org.dromara + ruoyi-common-sms + ${revision} + + + + org.dromara + ruoyi-common-social + ${revision} + + + + + org.dromara + ruoyi-common-web + ${revision} + + + + + org.dromara + ruoyi-common-translation + ${revision} + + + + + org.dromara + ruoyi-common-sensitive + ${revision} + + + + + org.dromara + ruoyi-common-json + ${revision} + + + + + org.dromara + ruoyi-common-encrypt + ${revision} + + + + + org.dromara + ruoyi-common-tenant + ${revision} + + + + + org.dromara + ruoyi-common-websocket + ${revision} + + + + + org.dromara + ruoyi-common-sse + ${revision} + + + + + + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml new file mode 100644 index 0000000..081c1ad --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -0,0 +1,119 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-core + + + ruoyi-common-core 核心模块 + + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.apache.commons + commons-lang3 + + + + + jakarta.servlet + jakarta.servlet-api + + + + cn.hutool + hutool-core + + + + cn.hutool + hutool-http + + + + cn.hutool + hutool-extra + + + + org.projectlombok + lombok + + + + + org.springframework.boot + spring-boot-configuration-processor + + + + org.springframework.boot + spring-boot-properties-migrator + runtime + + + + io.github.linpeilie + mapstruct-plus-spring-boot-starter + + + + + org.lionsoul + ip2region + + + + com.alibaba + transmittable-thread-local + + + + + com.qcloud + cos-sts_api + ${com.qcloud.version} + compile + + + + + com.tencentcloudapi + tencentcloud-sdk-java + ${tencentcloudapi.version} + + + + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java new file mode 100644 index 0000000..d9f70e4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java @@ -0,0 +1,17 @@ +package org.dromara.common.core.config; + +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + * 程序注解配置 + * + * @author Lion Li + */ +@AutoConfiguration +@EnableAspectJAutoProxy +@EnableAsync(proxyTargetClass = true) +public class ApplicationConfig { + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java new file mode 100644 index 0000000..cd01e33 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java @@ -0,0 +1,52 @@ +package org.dromara.common.core.config; + +import cn.hutool.core.util.ArrayUtil; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.core.task.VirtualThreadTaskExecutor; +import org.springframework.scheduling.annotation.AsyncConfigurer; + +import java.util.Arrays; +import java.util.concurrent.Executor; + +/** + * 异步配置 + *

+ * 如果未使用虚拟线程则生效 + * + * @author Lion Li + */ +@AutoConfiguration +public class AsyncConfig implements AsyncConfigurer { + + /** + * 自定义 @Async 注解使用系统线程池 + */ + @Override + public Executor getAsyncExecutor() { + if(SpringUtils.isVirtual()) { + return new VirtualThreadTaskExecutor("async-"); + } + return SpringUtils.getBean("scheduledExecutorService"); + } + + /** + * 异步执行异常处理 + */ + @Override + public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { + return (throwable, method, objects) -> { + throwable.printStackTrace(); + StringBuilder sb = new StringBuilder(); + sb.append("Exception message - ").append(throwable.getMessage()) + .append(", Method name - ").append(method.getName()); + if (ArrayUtil.isNotEmpty(objects)) { + sb.append(", Parameter value - ").append(Arrays.toString(objects)); + } + throw new ServiceException(sb.toString()); + }; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java new file mode 100644 index 0000000..2630485 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java @@ -0,0 +1,87 @@ +package org.dromara.common.core.config; + +import jakarta.annotation.PreDestroy; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.dromara.common.core.config.properties.ThreadPoolProperties; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.Threads; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.core.task.VirtualThreadTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadPoolExecutor; + +/** + * 线程池配置 + * + * @author Lion Li + **/ +@Slf4j +@AutoConfiguration +@EnableConfigurationProperties(ThreadPoolProperties.class) +public class ThreadPoolConfig { + + /** + * 核心线程数 = cpu 核心数 + 1 + */ + private final int core = Runtime.getRuntime().availableProcessors() + 1; + + private ScheduledExecutorService scheduledExecutorService; + + @Bean(name = "threadPoolTaskExecutor") + @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true") + public ThreadPoolTaskExecutor threadPoolTaskExecutor(ThreadPoolProperties threadPoolProperties) { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(core); + executor.setMaxPoolSize(core * 2); + executor.setQueueCapacity(threadPoolProperties.getQueueCapacity()); + executor.setKeepAliveSeconds(threadPoolProperties.getKeepAliveSeconds()); + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + return executor; + } + + /** + * 执行周期性或定时任务 + */ + @Bean(name = "scheduledExecutorService") + protected ScheduledExecutorService scheduledExecutorService() { + // daemon 必须为 true + BasicThreadFactory.Builder builder = new BasicThreadFactory.Builder().daemon(true); + if (SpringUtils.isVirtual()) { + builder.namingPattern("virtual-schedule-pool-%d").wrappedFactory(new VirtualThreadTaskExecutor().getVirtualThreadFactory()); + } else { + builder.namingPattern("schedule-pool-%d"); + } + ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(core, + builder.build(), + new ThreadPoolExecutor.CallerRunsPolicy()) { + @Override + protected void afterExecute(Runnable r, Throwable t) { + super.afterExecute(r, t); + Threads.printException(r, t); + } + }; + this.scheduledExecutorService = scheduledThreadPoolExecutor; + return scheduledThreadPoolExecutor; + } + + /** + * 销毁事件 + */ + @PreDestroy + public void destroy() { + try { + log.info("====关闭后台任务任务线程池===="); + Threads.shutdownAndAwaitTermination(scheduledExecutorService); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java new file mode 100644 index 0000000..45c5bd1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java @@ -0,0 +1,40 @@ +package org.dromara.common.core.config; + +import jakarta.validation.Validator; +import org.hibernate.validator.HibernateValidator; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; +import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; + +import java.util.Properties; + +/** + * 校验框架配置类 + * + * @author Lion Li + */ +@AutoConfiguration +public class ValidatorConfig { + + /** + * 配置校验框架 快速返回模式 + */ + @Bean + public Validator validator(MessageSource messageSource) { + try (LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean()) { + // 国际化 + factoryBean.setValidationMessageSource(messageSource); + // 设置使用 HibernateValidator 校验器 + factoryBean.setProviderClass(HibernateValidator.class); + Properties properties = new Properties(); + // 设置 快速异常返回 + properties.setProperty("hibernate.validator.fail_fast", "true"); + factoryBean.setValidationProperties(properties); + // 加载配置 + factoryBean.afterPropertiesSet(); + return factoryBean.getValidator(); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java new file mode 100644 index 0000000..820564f --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.config.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 线程池 配置属性 + * + * @author Lion Li + */ +@Data +@ConfigurationProperties(prefix = "thread-pool") +public class ThreadPoolProperties { + + /** + * 是否开启线程池 + */ + private boolean enabled; + + /** + * 队列最大长度 + */ + private int queueCapacity; + + /** + * 线程池维护线程所允许的空闲时间 + */ + private int keepAliveSeconds; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java new file mode 100644 index 0000000..ceb8370 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.constant; + +/** + * 缓存的key 常量 + * + * @author Lion Li + */ +public interface CacheConstants { + + /** + * 在线用户 redis key + */ + String ONLINE_TOKEN_KEY = "online_tokens:"; + + /** + * 参数管理 cache key + */ + String SYS_CONFIG_KEY = "sys_config:"; + + /** + * 字典管理 cache key + */ + String SYS_DICT_KEY = "sys_dict:"; + + /** + * 登录账户密码错误次数 redis key + */ + String PWD_ERR_CNT_KEY = "pwd_err_cnt:"; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java new file mode 100644 index 0000000..519034c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java @@ -0,0 +1,88 @@ +package org.dromara.common.core.constant; + +/** + * 缓存组名称常量 + *

+ * key 格式为 cacheNames#ttl#maxIdleTime#maxSize + *

+ * ttl 过期时间 如果设置为0则不过期 默认为0 + * maxIdleTime 最大空闲时间 根据LRU算法清理空闲数据 如果设置为0则不检测 默认为0 + * maxSize 组最大长度 根据LRU算法清理溢出数据 如果设置为0则无限长 默认为0 + *

+ * 例子: test#60s、test#0#60s、test#0#1m#1000、test#1h#0#500 + * + * @author Lion Li + */ +public interface CacheNames { + + /** + * 演示案例 + */ + String DEMO_CACHE = "demo:cache#60s#10m#20"; + + /** + * 系统配置 + */ + String SYS_CONFIG = "sys_config"; + + /** + * 数据字典 + */ + String SYS_DICT = "sys_dict"; + + /** + * 数据字典类型 + */ + String SYS_DICT_TYPE = "sys_dict_type"; + + /** + * 租户 + */ + String SYS_TENANT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_tenant#30d"; + + /** + * 客户端 + */ + String SYS_CLIENT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_client#30d"; + + /** + * 用户账户 + */ + String SYS_USER_NAME = "sys_user_name#30d"; + + /** + * 用户名称 + */ + String SYS_NICKNAME = "sys_nickname#30d"; + + /** + * 部门 + */ + String SYS_DEPT = "sys_dept#30d"; + + /** + * OSS内容 + */ + String SYS_OSS = "sys_oss#30d"; + + /** + * 角色自定义权限 + */ + String SYS_ROLE_CUSTOM = "sys_role_custom#30d"; + + /** + * 部门及以下权限 + */ + String SYS_DEPT_AND_CHILD = "sys_dept_and_child#30d"; + + /** + * OSS配置 + */ + String SYS_OSS_CONFIG = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss_config"; + + /** + * 在线用户 + */ + String ONLINE_TOKEN = "online_tokens"; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java new file mode 100644 index 0000000..273c734 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java @@ -0,0 +1,76 @@ +package org.dromara.common.core.constant; + +/** + * 通用常量信息 + * + * @author ruoyi + */ +public interface Constants { + + /** + * UTF-8 字符集 + */ + String UTF8 = "UTF-8"; + + /** + * GBK 字符集 + */ + String GBK = "GBK"; + + /** + * www主域 + */ + String WWW = "www."; + + /** + * http请求 + */ + String HTTP = "http://"; + + /** + * https请求 + */ + String HTTPS = "https://"; + + /** + * 通用成功标识 + */ + String SUCCESS = "0"; + + /** + * 通用失败标识 + */ + String FAIL = "1"; + + /** + * 登录成功 + */ + String LOGIN_SUCCESS = "Success"; + + /** + * 注销 + */ + String LOGOUT = "Logout"; + + /** + * 注册 + */ + String REGISTER = "Register"; + + /** + * 登录失败 + */ + String LOGIN_FAIL = "Error"; + + /** + * 验证码有效期(分钟) + */ + Integer CAPTCHA_EXPIRATION = 2; + + /** + * 顶级父级id + */ + Long TOP_PARENT_ID = 0L; + +} + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java new file mode 100644 index 0000000..5352b11 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java @@ -0,0 +1,34 @@ +package org.dromara.common.core.constant; + +/** + * 全局的key常量 (业务无关的key) + * + * @author Lion Li + */ +public interface GlobalConstants { + + /** + * 全局 redis key (业务无关的key) + */ + String GLOBAL_REDIS_KEY = "global:"; + + /** + * 验证码 redis key + */ + String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:"; + + /** + * 防重提交 redis key + */ + String REPEAT_SUBMIT_KEY = GLOBAL_REDIS_KEY + "repeat_submit:"; + + /** + * 限流 redis key + */ + String RATE_LIMIT_KEY = GLOBAL_REDIS_KEY + "rate_limit:"; + + /** + * 三方认证 redis key + */ + String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:"; +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java new file mode 100644 index 0000000..85566e8 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java @@ -0,0 +1,93 @@ +package org.dromara.common.core.constant; + +/** + * 返回状态码 + * + * @author Lion Li + */ +public interface HttpStatus { + /** + * 操作成功 + */ + int SUCCESS = 200; + + /** + * 对象创建成功 + */ + int CREATED = 201; + + /** + * 请求已经被接受 + */ + int ACCEPTED = 202; + + /** + * 操作已经执行成功,但是没有返回数据 + */ + int NO_CONTENT = 204; + + /** + * 资源已被移除 + */ + int MOVED_PERM = 301; + + /** + * 重定向 + */ + int SEE_OTHER = 303; + + /** + * 资源没有被修改 + */ + int NOT_MODIFIED = 304; + + /** + * 参数列表错误(缺少,格式不匹配) + */ + int BAD_REQUEST = 400; + + /** + * 未授权 + */ + int UNAUTHORIZED = 401; + + /** + * 访问受限,授权过期 + */ + int FORBIDDEN = 403; + + /** + * 资源,服务未找到 + */ + int NOT_FOUND = 404; + + /** + * 不允许的http方法 + */ + int BAD_METHOD = 405; + + /** + * 资源冲突,或者资源被锁 + */ + int CONFLICT = 409; + + /** + * 不支持的数据,媒体类型 + */ + int UNSUPPORTED_TYPE = 415; + + /** + * 系统内部错误 + */ + int ERROR = 500; + + /** + * 接口未实现 + */ + int NOT_IMPLEMENTED = 501; + + /** + * 系统警告消息 + */ + int WARN = 601; +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java new file mode 100644 index 0000000..77eed8c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java @@ -0,0 +1,54 @@ +package org.dromara.common.core.constant; + +import cn.hutool.core.lang.RegexPool; + +/** + * 常用正则表达式字符串 + *

+ * 常用正则表达式集合,更多正则见: https://any86.github.io/any-rule/ + * + * @author Feng + */ +public interface RegexConstants extends RegexPool { + + /** + * 字典类型必须以字母开头,且只能为(小写字母,数字,下滑线) + */ + String DICTIONARY_TYPE = "^[a-z][a-z0-9_]*$"; + + /** + * 权限标识必须符合 tool:build:list 格式,或者空字符串 + */ + String PERMISSION_STRING = "^(|^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+:[a-zA-Z0-9_]+)$"; + + /** + * 身份证号码(后6位) + */ + String ID_CARD_LAST_6 = "^(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$"; + + /** + * QQ号码 + */ + String QQ_NUMBER = "^[1-9][0-9]\\d{4,9}$"; + + /** + * 邮政编码 + */ + String POSTAL_CODE = "^[1-9]\\d{5}$"; + + /** + * 注册账号 + */ + String ACCOUNT = "^[a-zA-Z][a-zA-Z0-9_]{4,15}$"; + + /** + * 密码:包含至少8个字符,包括大写字母、小写字母、数字和特殊字符 + */ + String PASSWORD = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$"; + + /** + * 通用状态(0表示正常,1表示停用) + */ + String STATUS = "^[01]$"; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java new file mode 100644 index 0000000..8a37a51 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java @@ -0,0 +1,80 @@ +package org.dromara.common.core.constant; + +/** + * 系统常量信息 + * + * @author Lion Li + */ +public interface SystemConstants { + + /** + * 正常状态 + */ + String NORMAL = "0"; + + /** + * 异常状态 + */ + String DISABLE = "1"; + + /** + * 是否为系统默认(是) + */ + String YES = "Y"; + + /** + * 是否为系统默认(否) + */ + String NO = "N"; + + /** + * 是否菜单外链(是) + */ + String YES_FRAME = "0"; + + /** + * 是否菜单外链(否) + */ + String NO_FRAME = "1"; + + /** + * 菜单类型(目录) + */ + String TYPE_DIR = "M"; + + /** + * 菜单类型(菜单) + */ + String TYPE_MENU = "C"; + + /** + * 菜单类型(按钮) + */ + String TYPE_BUTTON = "F"; + + /** + * Layout组件标识 + */ + String LAYOUT = "Layout"; + + /** + * ParentView组件标识 + */ + String PARENT_VIEW = "ParentView"; + + /** + * InnerLink组件标识 + */ + String INNER_LINK = "InnerLink"; + + /** + * 超级管理员ID + */ + Long SUPER_ADMIN_ID = 1L; + + /** + * 根部门祖级列表 + */ + String ROOT_DEPT_ANCESTORS = "0"; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java new file mode 100644 index 0000000..33ce0cf --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java @@ -0,0 +1,35 @@ +package org.dromara.common.core.constant; + +/** + * 租户常量信息 + * + * @author Lion Li + */ +public interface TenantConstants { + + /** + * 超级管理员ID + */ + Long SUPER_ADMIN_ID = 1L; + + /** + * 超级管理员角色 roleKey + */ + String SUPER_ADMIN_ROLE_KEY = "superadmin"; + + /** + * 租户管理员角色 roleKey + */ + String TENANT_ADMIN_ROLE_KEY = "admin"; + + /** + * 租户管理员角色名称 + */ + String TENANT_ADMIN_ROLE_NAME = "管理员"; + + /** + * 默认租户ID + */ + String DEFAULT_TENANT_ID = "000000"; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java new file mode 100644 index 0000000..76f6dd4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java @@ -0,0 +1,152 @@ +package org.dromara.common.core.constant; + +/** + * 用户常量信息 + * + * @author ruoyi + */ +public interface UserConstants { + + /** + * 平台内系统用户的唯一标志 + */ + String SYS_USER = "SYS_USER"; + + /** + * 正常状态 + */ + String NORMAL = "0"; + + /** + * 异常状态 + */ + String EXCEPTION = "1"; + + /** + * 用户正常状态 + */ + String USER_NORMAL = "0"; + + /** + * 用户封禁状态 + */ + String USER_DISABLE = "1"; + + /** + * 角色正常状态 + */ + String ROLE_NORMAL = "0"; + + /** + * 角色封禁状态 + */ + String ROLE_DISABLE = "1"; + + /** + * 部门正常状态 + */ + String DEPT_NORMAL = "0"; + + /** + * 部门停用状态 + */ + String DEPT_DISABLE = "1"; + + /** + * 岗位正常状态 + */ + String POST_NORMAL = "0"; + + /** + * 岗位停用状态 + */ + String POST_DISABLE = "1"; + + /** + * 字典正常状态 + */ + String DICT_NORMAL = "0"; + + /** + * 通用存在标志 + */ + String DEL_FLAG_NORMAL = "0"; + + /** + * 通用删除标志 + */ + String DEL_FLAG_REMOVED = "2"; + + /** + * 是否为系统默认(是) + */ + String YES = "Y"; + + /** + * 是否菜单外链(是) + */ + String YES_FRAME = "0"; + + /** + * 是否菜单外链(否) + */ + String NO_FRAME = "1"; + + /** + * 菜单正常状态 + */ + String MENU_NORMAL = "0"; + + /** + * 菜单停用状态 + */ + String MENU_DISABLE = "1"; + + /** + * 菜单类型(目录) + */ + String TYPE_DIR = "M"; + + /** + * 菜单类型(菜单) + */ + String TYPE_MENU = "C"; + + /** + * 菜单类型(按钮) + */ + String TYPE_BUTTON = "F"; + + /** + * Layout组件标识 + */ + String LAYOUT = "Layout"; + + /** + * ParentView组件标识 + */ + String PARENT_VIEW = "ParentView"; + + /** + * InnerLink组件标识 + */ + String INNER_LINK = "InnerLink"; + + /** + * 用户名长度限制 + */ + int USERNAME_MIN_LENGTH = 2; + int USERNAME_MAX_LENGTH = 20; + + /** + * 密码长度限制 + */ + int PASSWORD_MIN_LENGTH = 5; + int PASSWORD_MAX_LENGTH = 20; + + /** + * 超级管理员ID + */ + Long SUPER_ADMIN_ID = 1L; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java new file mode 100644 index 0000000..3cb1cc4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java @@ -0,0 +1,110 @@ +package org.dromara.common.core.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.HttpStatus; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 响应信息主体 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class R implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 成功 + */ + public static final int SUCCESS = 200; + + /** + * 失败 + */ + public static final int FAIL = 500; + + private int code; + + private String msg; + + private T data; + + public static R ok() { + return restResult(null, SUCCESS, "操作成功"); + } + + public static R ok(T data) { + return restResult(data, SUCCESS, "操作成功"); + } + + public static R ok(String msg) { + return restResult(null, SUCCESS, msg); + } + + public static R ok(String msg, T data) { + return restResult(data, SUCCESS, msg); + } + + public static R fail() { + return restResult(null, FAIL, "操作失败"); + } + + public static R fail(String msg) { + return restResult(null, FAIL, msg); + } + + public static R fail(T data) { + return restResult(data, FAIL, "操作失败"); + } + + public static R fail(String msg, T data) { + return restResult(data, FAIL, msg); + } + + public static R fail(int code, String msg) { + return restResult(null, code, msg); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static R warn(String msg) { + return restResult(null, HttpStatus.WARN, msg); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static R warn(String msg, T data) { + return restResult(data, HttpStatus.WARN, msg); + } + + private static R restResult(T data, int code, String msg) { + R r = new R<>(); + r.setCode(code); + r.setData(data); + r.setMsg(msg); + return r; + } + + public static Boolean isError(R ret) { + return !isSuccess(ret); + } + + public static Boolean isSuccess(R ret) { + return R.SUCCESS == ret.getCode(); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java new file mode 100644 index 0000000..2e63f8a --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java @@ -0,0 +1,71 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 办理任务请求对象 + * + * @author may + */ +@Data +public class CompleteTaskDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务id + */ + private Long taskId; + + /** + * 附件id + */ + private String fileId; + + /** + * 抄送人员 + */ + private List flowCopyList; + + /** + * 消息类型 + */ + private List messageType; + + /** + * 办理意见 + */ + private String message; + + /** + * 消息通知 + */ + private String notice; + + /** + * 流程变量 + */ + private Map variables; + + /** + * 扩展变量(此处为逗号分隔的ossId) + */ + private String ext; + + public Map getVariables() { + if (variables == null) { + return new HashMap<>(16); + } + variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); + return variables; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java new file mode 100644 index 0000000..7b748b0 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java @@ -0,0 +1,36 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 部门 + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class DeptDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 父部门ID + */ + private Long parentId; + + /** + * 部门名称 + */ + private String deptName; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java new file mode 100644 index 0000000..dff1a75 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java @@ -0,0 +1,41 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 字典数据DTO + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class DictDataDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字典标签 + */ + private String dictLabel; + + /** + * 字典键值 + */ + private String dictValue; + + /** + * 是否默认(Y是 N否) + */ + private String isDefault; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java new file mode 100644 index 0000000..43ab142 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java @@ -0,0 +1,41 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 字典类型DTO + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class DictTypeDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字典主键 + */ + private Long dictId; + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java new file mode 100644 index 0000000..2f20b21 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 抄送 + * + * @author may + */ +@Data +public class FlowCopyDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户名称 + */ + private String userName; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java new file mode 100644 index 0000000..463821c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java @@ -0,0 +1,46 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * OSS对象 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class OssDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 对象存储主键 + */ + private Long ossId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 原名 + */ + private String originalName; + + /** + * 文件后缀名 + */ + private String fileSuffix; + + /** + * URL地址 + */ + private String url; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java new file mode 100644 index 0000000..7536ee3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java @@ -0,0 +1,46 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 岗位 + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class PostDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 岗位ID + */ + private Long postId; + + /** + * 部门id + */ + private Long deptId; + + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 岗位类别编码 + */ + private String postCategory; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java new file mode 100644 index 0000000..aea8e7a --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java @@ -0,0 +1,42 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 角色 + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +public class RoleDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + private Long roleId; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + + /** + * 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) + */ + private String dataScope; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java new file mode 100644 index 0000000..3934ada --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java @@ -0,0 +1,45 @@ +package org.dromara.common.core.domain.dto; + + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * 启动流程对象 + * + * @author may + */ +@Data +public class StartProcessDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 业务唯一值id + */ + private String businessId; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程变量,前端会提交一个元素{'entity': {业务详情数据对象}} + */ + private Map variables; + + public Map getVariables() { + if (variables == null) { + return new HashMap<>(16); + } + variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); + return variables; + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java new file mode 100644 index 0000000..9bcbd12 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.domain.dto; + + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 启动流程返回对象 + * + * @author Lion Li + */ +@Data +public class StartProcessReturnDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流程实例id + */ + private Long processInstanceId; + + /** + * 任务id + */ + private Long taskId; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java new file mode 100644 index 0000000..85893e1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java @@ -0,0 +1,101 @@ +package org.dromara.common.core.domain.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 任务受让人 + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class TaskAssigneeDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总大小 + */ + private Long total = 0L; + + /** + * + */ + private List list; + + public TaskAssigneeDTO(Long total, List list) { + this.total = total; + this.list = list; + } + + /** + * 将源列表转换为 TaskHandler 列表 + * + * @param 通用类型 + * @param sourceList 待转换的源列表 + * @param storageId 提取 storageId 的函数 + * @param handlerCode 提取 handlerCode 的函数 + * @param handlerName 提取 handlerName 的函数 + * @param groupName 提取 groupName 的函数 + * @param createTimeMapper 提取 createTime 的函数 + * @return 转换后的 TaskHandler 列表 + */ + public static List convertToHandlerList( + List sourceList, + Function storageId, + Function handlerCode, + Function handlerName, + Function groupName, + Function createTimeMapper) { + return sourceList.stream() + .map(item -> new TaskHandler( + String.valueOf(storageId.apply(item)), + handlerCode.apply(item), + handlerName.apply(item), + groupName != null ? String.valueOf(groupName.apply(item)) : null, + createTimeMapper.apply(item) + )).collect(Collectors.toList()); + } + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class TaskHandler { + + /** + * 主键 + */ + private String storageId; + + /** + * 权限编码 + */ + private String handlerCode; + + /** + * 权限名称 + */ + private String handlerName; + + /** + * 权限分组 + */ + private String groupName; + + /** + * 创建时间 + */ + private Date createTime; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java new file mode 100644 index 0000000..cb5def9 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java @@ -0,0 +1,73 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 用户 + * + * @author Michelle.Chung + */ +@Data +@NoArgsConstructor +public class UserDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户类型(sys_user系统用户) + */ + private String userType; + + /** + * 用户邮箱 + */ + private String email; + + /** + * 手机号码 + */ + private String phonenumber; + + /** + * 用户性别(0男 1女 2未知) + */ + private String sex; + + /** + * 帐号状态(0正常 1停用) + */ + private String status; + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java new file mode 100644 index 0000000..43d8c3c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java @@ -0,0 +1,72 @@ +package org.dromara.common.core.domain.dto; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 当前在线会话 + * + * @author ruoyi + */ + +@Data +@NoArgsConstructor +public class UserOnlineDTO implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 会话编号 + */ + private String tokenId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 用户名称 + */ + private String userName; + + /** + * 客户端 + */ + private String clientKey; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地址 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 登录时间 + */ + private Long loginTime; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java new file mode 100644 index 0000000..05047ab --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java @@ -0,0 +1,44 @@ +package org.dromara.common.core.domain.event; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 流程创建任务监听 + * + * @author may + */ +@Data +public class ProcessCreateTaskEvent implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 审批节点编码 + */ + private String nodeCode; + + /** + * 任务id + */ + private Long taskId; + + /** + * 业务id + */ + private String businessId; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java new file mode 100644 index 0000000..d570c31 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java @@ -0,0 +1,34 @@ +package org.dromara.common.core.domain.event; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 删除流程监听 + * + * @author AprilWind + */ +@Data +public class ProcessDeleteEvent implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 业务id + */ + private String businessId; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java new file mode 100644 index 0000000..6329b9c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java @@ -0,0 +1,50 @@ +package org.dromara.common.core.domain.event; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Map; + +/** + * 总体流程监听 + * + * @author may + */ +@Data +public class ProcessEvent implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 业务id + */ + private String businessId; + + /** + * 状态 + */ + private String status; + + /** + * 办理参数 + */ + private Map params; + + /** + * 当为true时为申请人节点办理 + */ + private boolean submit; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java new file mode 100644 index 0000000..ffde8c6 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java @@ -0,0 +1,31 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 邮件登录对象 + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class EmailLoginBody extends LoginBody { + + /** + * 邮箱 + */ + @NotBlank(message = "{user.email.not.blank}") + @Email(message = "{user.email.not.valid}") + private String email; + + /** + * 邮箱code + */ + @NotBlank(message = "{email.code.not.blank}") + private String emailCode; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java new file mode 100644 index 0000000..63bee0d --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java @@ -0,0 +1,48 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 用户登录对象 + * + * @author Lion Li + */ + +@Data +public class LoginBody implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 客户端id + */ + @NotBlank(message = "{auth.clientid.not.blank}") + private String clientId; + + /** + * 授权类型 + */ + @NotBlank(message = "{auth.grant.type.not.blank}") + private String grantType; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 验证码 + */ + private String code; + + /** + * 唯一标识 + */ + private String uuid; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java new file mode 100644 index 0000000..338d4d7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java @@ -0,0 +1,148 @@ +package org.dromara.common.core.domain.model; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.domain.dto.PostDTO; +import org.dromara.common.core.domain.dto.RoleDTO; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; +import java.util.Set; + +/** + * 登录用户身份权限 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class LoginUser implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 部门类别编码 + */ + private String deptCategory; + + /** + * 部门名 + */ + private String deptName; + + /** + * 用户唯一标识 + */ + private String token; + + /** + * 用户类型 + */ + private String userType; + + /** + * 登录时间 + */ + private Long loginTime; + + /** + * 过期时间 + */ + private Long expireTime; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地点 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 菜单权限 + */ + private Set menuPermission; + + /** + * 角色权限 + */ + private Set rolePermission; + + /** + * 用户名 + */ + private String username; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 角色对象 + */ + private List roles; + + /** + * 岗位对象 + */ + private List posts; + + /** + * 数据权限 当前角色ID + */ + private Long roleId; + + /** + * 客户端 + */ + private String clientKey; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * 获取登录id + */ + public String getLoginId() { + if (userType == null) { + throw new IllegalArgumentException("用户类型不能为空"); + } + if (userId == null) { + throw new IllegalArgumentException("用户ID不能为空"); + } + return userType + ":" + userId; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java new file mode 100644 index 0000000..87d0e8e --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java @@ -0,0 +1,31 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +/** + * 密码登录对象 + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PasswordLoginBody extends LoginBody { + + /** + * 用户名 + */ + @NotBlank(message = "{user.username.not.blank}") + @Length(min = 2, max = 20, message = "{user.username.length.valid}") + private String username; + + /** + * 用户密码 + */ + @NotBlank(message = "{user.password.not.blank}") + @Length(min = 5, max = 20, message = "{user.password.length.valid}") + private String password; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java new file mode 100644 index 0000000..6ea8a76 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java @@ -0,0 +1,33 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +/** + * 用户注册对象 + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class RegisterBody extends LoginBody { + + /** + * 用户名 + */ + @NotBlank(message = "{user.username.not.blank}") + @Length(min = 2, max = 20, message = "{user.username.length.valid}") + private String username; + + /** + * 用户密码 + */ + @NotBlank(message = "{user.password.not.blank}") + @Length(min = 5, max = 20, message = "{user.password.length.valid}") + private String password; + + private String userType; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java new file mode 100644 index 0000000..a878348 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java @@ -0,0 +1,29 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 短信登录对象 + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class SmsLoginBody extends LoginBody { + + /** + * 手机号 + */ + @NotBlank(message = "{user.phonenumber.not.blank}") + private String phonenumber; + + /** + * 短信code + */ + @NotBlank(message = "{sms.code.not.blank}") + private String smsCode; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java new file mode 100644 index 0000000..0d1b121 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java @@ -0,0 +1,35 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 三方登录对象 + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class SocialLoginBody extends LoginBody { + + /** + * 第三方登录平台 + */ + @NotBlank(message = "{social.source.not.blank}") + private String source; + + /** + * 第三方登录code + */ + @NotBlank(message = "{social.code.not.blank}") + private String socialCode; + + /** + * 第三方登录socialState + */ + @NotBlank(message = "{social.state.not.blank}") + private String socialState; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java new file mode 100644 index 0000000..0cbed2f --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java @@ -0,0 +1,56 @@ +package org.dromara.common.core.domain.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 任务受让人 + * + * @author AprilWind + */ +@Data +@NoArgsConstructor +public class TaskAssigneeBody implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 权限编码 + */ + private String handlerCode; + + /** + * 权限名称 + */ + private String handlerName; + + /** + * 权限分组 + */ + private String groupId; + + /** + * 开始时间 + */ + private String beginTime; + + /** + * 结束时间 + */ + private String endTime; + + /** + * 当前页 + */ + private Integer pageNum = 1; + + /** + * 每页显示条数 + */ + private Integer pageSize = 10; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java new file mode 100644 index 0000000..518fe2e --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java @@ -0,0 +1,28 @@ +package org.dromara.common.core.domain.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 三方登录对象 + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class XcxLoginBody extends LoginBody { + + /** + * 小程序id(多个小程序时使用) + */ + private String appid; + + /** + * 小程序code + */ + @NotBlank(message = "{xcx.code.not.blank}") + private String xcxCode; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java new file mode 100644 index 0000000..e5f3d6c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java @@ -0,0 +1,27 @@ +package org.dromara.common.core.domain.model; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serial; + +/** + * 小程序登录用户身份权限 + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +public class XcxLoginUser extends LoginUser { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * openid + */ + private String openid; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java new file mode 100644 index 0000000..c1660ee --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java @@ -0,0 +1,215 @@ +package org.dromara.common.core.enums; + +import cn.hutool.core.util.StrUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StringUtils; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 业务状态枚举 + * + * @author may + */ +@Getter +@AllArgsConstructor +public enum BusinessStatusEnum { + + /** + * 已撤销 + */ + CANCEL("cancel", "已撤销"), + + /** + * 草稿 + */ + DRAFT("draft", "草稿"), + + /** + * 待审核 + */ + WAITING("waiting", "待审核"), + + /** + * 已完成 + */ + FINISH("finish", "已完成"), + + /** + * 已作废 + */ + INVALID("invalid", "已作废"), + + /** + * 已退回 + */ + BACK("back", "已退回"), + + /** + * 已终止 + */ + TERMINATION("termination", "已终止"); + + /** + * 状态 + */ + private final String status; + + /** + * 描述 + */ + private final String desc; + + private static final Map STATUS_MAP = Arrays.stream(BusinessStatusEnum.values()) + .collect(Collectors.toConcurrentMap(BusinessStatusEnum::getStatus, Function.identity())); + + /** + * 根据状态获取对应的 BusinessStatusEnum 枚举 + * + * @param status 业务状态码 + * @return 对应的 BusinessStatusEnum 枚举,如果找不到则返回 null + */ + public static BusinessStatusEnum getByStatus(String status) { + // 使用 STATUS_MAP 获取对应的枚举,若找不到则返回 null + return STATUS_MAP.get(status); + } + + /** + * 根据状态获取对应的业务状态描述信息 + * + * @param status 业务状态码 + * @return 返回业务状态描述,若状态码为空或未找到对应的枚举,返回空字符串 + */ + public static String findByStatus(String status) { + if (StringUtils.isBlank(status)) { + return StrUtil.EMPTY; + } + BusinessStatusEnum statusEnum = STATUS_MAP.get(status); + return (statusEnum != null) ? statusEnum.getDesc() : StrUtil.EMPTY; + } + + /** + * 判断是否为指定的状态之一:草稿、已撤销或已退回 + * + * @param status 要检查的状态 + * @return 如果状态为草稿、已撤销或已退回之一,则返回 true;否则返回 false + */ + public static boolean isDraftOrCancelOrBack(String status) { + return DRAFT.status.equals(status) || CANCEL.status.equals(status) || BACK.status.equals(status); + } + + /** + * 判断是否为撤销,退回,作废,终止 + * + * @param status status + * @return 结果 + */ + public static boolean initialState(String status) { + return CANCEL.status.equals(status) || BACK.status.equals(status) || INVALID.status.equals(status) || TERMINATION.status.equals(status); + } + + /** + * 获取运行中的实例状态列表 + * + * @return 包含运行中实例状态的不可变列表 + * (包含 DRAFT、WAITING、BACK 和 CANCEL 状态) + */ + public static List runningStatus() { + return Arrays.asList(DRAFT.status, WAITING.status, BACK.status, CANCEL.status); + } + + /** + * 获取结束实例的状态列表 + * + * @return 包含结束实例状态的不可变列表 + * (包含 FINISH、INVALID 和 TERMINATION 状态) + */ + public static List finishStatus() { + return Arrays.asList(FINISH.status, INVALID.status, TERMINATION.status); + } + + /** + * 启动流程校验 + * + * @param status 状态 + */ + public static void checkStartStatus(String status) { + if (WAITING.getStatus().equals(status)) { + throw new ServiceException("该单据已提交过申请,正在审批中!"); + } else if (FINISH.getStatus().equals(status)) { + throw new ServiceException("该单据已完成申请!"); + } else if (INVALID.getStatus().equals(status)) { + throw new ServiceException("该单据已作废!"); + } else if (TERMINATION.getStatus().equals(status)) { + throw new ServiceException("该单据已终止!"); + } else if (StringUtils.isBlank(status)) { + throw new ServiceException("流程状态为空!"); + } + } + + /** + * 撤销流程校验 + * + * @param status 状态 + */ + public static void checkCancelStatus(String status) { + if (CANCEL.getStatus().equals(status)) { + throw new ServiceException("该单据已撤销!"); + } else if (FINISH.getStatus().equals(status)) { + throw new ServiceException("该单据已完成申请!"); + } else if (INVALID.getStatus().equals(status)) { + throw new ServiceException("该单据已作废!"); + } else if (TERMINATION.getStatus().equals(status)) { + throw new ServiceException("该单据已终止!"); + } else if (BACK.getStatus().equals(status)) { + throw new ServiceException("该单据已退回!"); + } else if (StringUtils.isBlank(status)) { + throw new ServiceException("流程状态为空!"); + } + } + + /** + * 驳回流程校验 + * + * @param status 状态 + */ + public static void checkBackStatus(String status) { + if (BACK.getStatus().equals(status)) { + throw new ServiceException("该单据已退回!"); + } else if (FINISH.getStatus().equals(status)) { + throw new ServiceException("该单据已完成申请!"); + } else if (INVALID.getStatus().equals(status)) { + throw new ServiceException("该单据已作废!"); + } else if (TERMINATION.getStatus().equals(status)) { + throw new ServiceException("该单据已终止!"); + } else if (CANCEL.getStatus().equals(status)) { + throw new ServiceException("该单据已撤销!"); + } else if (StringUtils.isBlank(status)) { + throw new ServiceException("流程状态为空!"); + } + } + + /** + * 作废,终止流程校验 + * + * @param status 状态 + */ + public static void checkInvalidStatus(String status) { + if (FINISH.getStatus().equals(status)) { + throw new ServiceException("该单据已完成申请!"); + } else if (INVALID.getStatus().equals(status)) { + throw new ServiceException("该单据已作废!"); + } else if (TERMINATION.getStatus().equals(status)) { + throw new ServiceException("该单据已终止!"); + } else if (StringUtils.isBlank(status)) { + throw new ServiceException("流程状态为空!"); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java new file mode 100644 index 0000000..dbadfc2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java @@ -0,0 +1,37 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 设备类型 + * 针对一套 用户体系 + * + * @author Lion Li + */ +@Getter +@AllArgsConstructor +public enum DeviceType { + + /** + * pc端 + */ + PC("pc"), + + /** + * app端 + */ + APP("app"), + + /** + * 小程序端 + */ + XCX("xcx"), + + /** + * social第三方端 + */ + SOCIAL("social"); + + private final String device; +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java new file mode 100644 index 0000000..8d4b6d9 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java @@ -0,0 +1,146 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.utils.StringUtils; + +/* + * 日期格式 + * "yyyy":4位数的年份,例如:2023年表示为"2023"。 + * "yy":2位数的年份,例如:2023年表示为"23"。 + * "MM":2位数的月份,取值范围为01到12,例如:7月表示为"07"。 + * "M":不带前导零的月份,取值范围为1到12,例如:7月表示为"7"。 + * "dd":2位数的日期,取值范围为01到31,例如:22日表示为"22"。 + * "d":不带前导零的日期,取值范围为1到31,例如:22日表示为"22"。 + * "EEEE":星期的全名,例如:星期三表示为"Wednesday"。 + * "E":星期的缩写,例如:星期三表示为"Wed"。 + * "DDD" 或 "D":一年中的第几天,取值范围为001到366,例如:第200天表示为"200"。 + * 时间格式 + * "HH":24小时制的小时数,取值范围为00到23,例如:下午5点表示为"17"。 + * "hh":12小时制的小时数,取值范围为01到12,例如:下午5点表示为"05"。 + * "mm":分钟数,取值范围为00到59,例如:30分钟表示为"30"。 + * "ss":秒数,取值范围为00到59,例如:45秒表示为"45"。 + * "SSS":毫秒数,取值范围为000到999,例如:123毫秒表示为"123"。 + */ + +/** + * 日期格式与时间格式枚举 + */ +@Getter +@AllArgsConstructor +public enum FormatsType { + + /** + * 例如:2023年表示为"23" + */ + YY("yy"), + + /** + * 例如:2023年表示为"2023" + */ + YYYY("yyyy"), + + /** + * 例例如,2023年7月可以表示为 "2023-07" + */ + YYYY_MM("yyyy-MM"), + + /** + * 例如,日期 "2023年7月22日" 可以表示为 "2023-07-22" + */ + YYYY_MM_DD("yyyy-MM-dd"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分",则可以表示为 "2023-07-22 15:30" + */ + YYYY_MM_DD_HH_MM("yyyy-MM-dd HH:mm"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分45秒",则可以表示为 "2023-07-22 15:30:45" + */ + YYYY_MM_DD_HH_MM_SS("yyyy-MM-dd HH:mm:ss"), + + /** + * 例如:下午3点30分45秒,表示为 "15:30:45" + */ + HH_MM_SS("HH:mm:ss"), + + /** + * 例例如,2023年7月可以表示为 "2023/07" + */ + YYYY_MM_SLASH("yyyy/MM"), + + /** + * 例如,日期 "2023年7月22日" 可以表示为 "2023/07/22" + */ + YYYY_MM_DD_SLASH("yyyy/MM/dd"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分45秒",则可以表示为 "2023/07/22 15:30:45" + */ + YYYY_MM_DD_HH_MM_SLASH("yyyy/MM/dd HH:mm"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分45秒",则可以表示为 "2023/07/22 15:30:45" + */ + YYYY_MM_DD_HH_MM_SS_SLASH("yyyy/MM/dd HH:mm:ss"), + + /** + * 例例如,2023年7月可以表示为 "2023.07" + */ + YYYY_MM_DOT("yyyy.MM"), + + /** + * 例如,日期 "2023年7月22日" 可以表示为 "2023.07.22" + */ + YYYY_MM_DD_DOT("yyyy.MM.dd"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分",则可以表示为 "2023.07.22 15:30" + */ + YYYY_MM_DD_HH_MM_DOT("yyyy.MM.dd HH:mm"), + + /** + * 例如,当前时间如果是 "2023年7月22日下午3点30分45秒",则可以表示为 "2023.07.22 15:30:45" + */ + YYYY_MM_DD_HH_MM_SS_DOT("yyyy.MM.dd HH:mm:ss"), + + /** + * 例如,2023年7月可以表示为 "202307" + */ + YYYYMM("yyyyMM"), + + /** + * 例如,2023年7月22日可以表示为 "20230722" + */ + YYYYMMDD("yyyyMMdd"), + + /** + * 例如,2023年7月22日下午3点可以表示为 "2023072215" + */ + YYYYMMDDHH("yyyyMMddHH"), + + /** + * 例如,2023年7月22日下午3点30分可以表示为 "202307221530" + */ + YYYYMMDDHHMM("yyyyMMddHHmm"), + + /** + * 例如,2023年7月22日下午3点30分45秒可以表示为 "20230722153045" + */ + YYYYMMDDHHMMSS("yyyyMMddHHmmss"); + + /** + * 时间格式 + */ + private final String timeFormat; + + public static FormatsType getFormatsType(String str) { + for (FormatsType value : values()) { + if (StringUtils.contains(str, value.getTimeFormat())) { + return value; + } + } + throw new RuntimeException("'FormatsType' not found By " + str); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java new file mode 100644 index 0000000..f9cac66 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java @@ -0,0 +1,44 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 登录类型 + * + * @author Lion Li + */ +@Getter +@AllArgsConstructor +public enum LoginType { + + /** + * 密码登录 + */ + PASSWORD("user.password.retry.limit.exceed", "user.password.retry.limit.count"), + + /** + * 短信登录 + */ + SMS("sms.code.retry.limit.exceed", "sms.code.retry.limit.count"), + + /** + * 邮箱登录 + */ + EMAIL("email.code.retry.limit.exceed", "email.code.retry.limit.count"), + + /** + * 小程序登录 + */ + XCX("", ""); + + /** + * 登录重试超出限制提示 + */ + final String retryLimitExceed; + + /** + * 登录重试限制计数提示 + */ + final String retryLimitCount; +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java new file mode 100644 index 0000000..400a399 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 用户状态 + * + * @author LionLi + */ +@Getter +@AllArgsConstructor +public enum TenantStatus { + /** + * 正常 + */ + OK("0", "正常"), + /** + * 停用 + */ + DISABLE("1", "停用"), + /** + * 删除 + */ + DELETED("2", "删除"); + + private final String code; + private final String info; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java new file mode 100644 index 0000000..be7e44d --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java @@ -0,0 +1,30 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 用户状态 + * + * @author ruoyi + */ +@Getter +@AllArgsConstructor +public enum UserStatus { + /** + * 正常 + */ + OK("0", "正常"), + /** + * 停用 + */ + DISABLE("1", "停用"), + /** + * 删除 + */ + DELETED("2", "删除"); + + private final String code; + private final String info; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java new file mode 100644 index 0000000..c028809 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java @@ -0,0 +1,60 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.utils.StringUtils; + +/** + * 设备类型 + * 针对多套 用户体系 + * + * @author Lion Li + */ +@Getter +@AllArgsConstructor +public enum UserType { + + /** + * pc端-系统用户 + */ + SYS_USER("sys_user"), + + /** + * 客服 + */ + KF_USER("kf_user"), + + /** + * 采购 + */ + CG_USER("cg_user"), + + /** + * 财务 + */ + CW_USER("cw_user"), + + + /** + * 租户 + */ + ZH_USER("zh_user"), + + /** + * app端 + */ + APP_USER("app_user"); + + + + private final String userType; + + public static UserType getUserType(String str) { + for (UserType value : values()) { + if (StringUtils.contains(str, value.getUserType())) { + return value; + } + } + throw new RuntimeException("'UserType' not found By " + str); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java new file mode 100644 index 0000000..67f66b4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java @@ -0,0 +1,62 @@ +package org.dromara.common.core.exception; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serial; + +/** + * 业务异常 + * + * @author ruoyi + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public final class ServiceException extends RuntimeException { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细,内部调试错误 + */ + private String detailMessage; + + public ServiceException(String message) { + this.message = message; + } + + public ServiceException(String message, Integer code) { + this.message = message; + this.code = code; + } + + @Override + public String getMessage() { + return message; + } + + public ServiceException setMessage(String message) { + this.message = message; + return this; + } + + public ServiceException setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + return this; + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java new file mode 100644 index 0000000..a76e16d --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java @@ -0,0 +1,62 @@ +package org.dromara.common.core.exception; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.io.Serial; + +/** + * sse 特制异常 + * + * @author LionLi + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public final class SseException extends RuntimeException { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细,内部调试错误 + */ + private String detailMessage; + + public SseException(String message) { + this.message = message; + } + + public SseException(String message, Integer code) { + this.message = message; + this.code = code; + } + + @Override + public String getMessage() { + return message; + } + + public SseException setMessage(String message) { + this.message = message; + return this; + } + + public SseException setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + return this; + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java new file mode 100644 index 0000000..942b83d --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java @@ -0,0 +1,74 @@ +package org.dromara.common.core.exception.base; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.StringUtils; + +import java.io.Serial; + +/** + * 基础异常 + * + * @author ruoyi + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +public class BaseException extends RuntimeException { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 所属模块 + */ + private String module; + + /** + * 错误码 + */ + private String code; + + /** + * 错误码对应的参数 + */ + private Object[] args; + + /** + * 错误消息 + */ + private String defaultMessage; + + public BaseException(String module, String code, Object[] args) { + this(module, code, args, null); + } + + public BaseException(String module, String defaultMessage) { + this(module, null, null, defaultMessage); + } + + public BaseException(String code, Object[] args) { + this(null, code, args, null); + } + + public BaseException(String defaultMessage) { + this(null, null, null, defaultMessage); + } + + @Override + public String getMessage() { + String message = null; + if (!StringUtils.isEmpty(code)) { + message = MessageUtils.message(code, args); + } + if (message == null) { + message = defaultMessage; + } + return message; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java new file mode 100644 index 0000000..d374fc0 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java @@ -0,0 +1,21 @@ +package org.dromara.common.core.exception.file; + +import org.dromara.common.core.exception.base.BaseException; + +import java.io.Serial; + +/** + * 文件信息异常类 + * + * @author ruoyi + */ +public class FileException extends BaseException { + + @Serial + private static final long serialVersionUID = 1L; + + public FileException(String code, Object[] args) { + super("file", code, args, null); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java new file mode 100644 index 0000000..af98124 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.exception.file; + +import java.io.Serial; + +/** + * 文件名称超长限制异常类 + * + * @author ruoyi + */ +public class FileNameLengthLimitExceededException extends FileException { + + @Serial + private static final long serialVersionUID = 1L; + + public FileNameLengthLimitExceededException(int defaultFileNameLength) { + super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java new file mode 100644 index 0000000..1eb8d40 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.exception.file; + +import java.io.Serial; + +/** + * 文件名大小限制异常类 + * + * @author ruoyi + */ +public class FileSizeLimitExceededException extends FileException { + + @Serial + private static final long serialVersionUID = 1L; + + public FileSizeLimitExceededException(long defaultMaxSize) { + super("upload.exceed.maxSize", new Object[]{defaultMaxSize}); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java new file mode 100644 index 0000000..43824e0 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.exception.user; + +import java.io.Serial; + +/** + * 验证码错误异常类 + * + * @author ruoyi + */ +public class CaptchaException extends UserException { + + @Serial + private static final long serialVersionUID = 1L; + + public CaptchaException() { + super("user.jcaptcha.error"); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java new file mode 100644 index 0000000..f4b8cac --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.exception.user; + +import java.io.Serial; + +/** + * 验证码失效异常类 + * + * @author ruoyi + */ +public class CaptchaExpireException extends UserException { + + @Serial + private static final long serialVersionUID = 1L; + + public CaptchaExpireException() { + super("user.jcaptcha.expire"); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java new file mode 100644 index 0000000..024fed6 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java @@ -0,0 +1,20 @@ +package org.dromara.common.core.exception.user; + +import org.dromara.common.core.exception.base.BaseException; + +import java.io.Serial; + +/** + * 用户信息异常类 + * + * @author ruoyi + */ +public class UserException extends BaseException { + + @Serial + private static final long serialVersionUID = 1L; + + public UserException(String code, Object... args) { + super("user", code, args, null); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java new file mode 100644 index 0000000..fd907d2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java @@ -0,0 +1,52 @@ +package org.dromara.common.core.factory; + +import cn.hutool.core.lang.PatternPool; +import org.dromara.common.core.constant.RegexConstants; + +import java.util.regex.Pattern; + +/** + * 正则表达式模式池工厂 + *

初始化的时候将正则表达式加入缓存池当中

+ *

提高正则表达式的性能,避免重复编译相同的正则表达式

+ * + * @author 21001 + */ +public class RegexPatternPoolFactory extends PatternPool { + + /** + * 字典类型必须以字母开头,且只能为(小写字母,数字,下滑线) + */ + public static final Pattern DICTIONARY_TYPE = get(RegexConstants.DICTIONARY_TYPE); + + /** + * 身份证号码(后6位) + */ + public static final Pattern ID_CARD_LAST_6 = get(RegexConstants.ID_CARD_LAST_6); + + /** + * QQ号码 + */ + public static final Pattern QQ_NUMBER = get(RegexConstants.QQ_NUMBER); + + /** + * 邮政编码 + */ + public static final Pattern POSTAL_CODE = get(RegexConstants.POSTAL_CODE); + + /** + * 注册账号 + */ + public static final Pattern ACCOUNT = get(RegexConstants.ACCOUNT); + + /** + * 密码:包含至少8个字符,包括大写字母、小写字母、数字和特殊字符 + */ + public static final Pattern PASSWORD = get(RegexConstants.PASSWORD); + + /** + * 通用状态(0表示正常,1表示停用) + */ + public static final Pattern STATUS = get(RegexConstants.STATUS); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java new file mode 100644 index 0000000..af61b90 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java @@ -0,0 +1,31 @@ +package org.dromara.common.core.factory; + +import org.dromara.common.core.utils.StringUtils; +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.env.PropertiesPropertySource; +import org.springframework.core.env.PropertySource; +import org.springframework.core.io.support.DefaultPropertySourceFactory; +import org.springframework.core.io.support.EncodedResource; + +import java.io.IOException; + +/** + * yml 配置源工厂 + * + * @author Lion Li + */ +public class YmlPropertySourceFactory extends DefaultPropertySourceFactory { + + @Override + public PropertySource createPropertySource(String name, EncodedResource resource) throws IOException { + String sourceName = resource.getResource().getFilename(); + if (StringUtils.isNotBlank(sourceName) && StringUtils.endsWithAny(sourceName, ".yml", ".yaml")) { + YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean(); + factory.setResources(resource.getResource()); + factory.afterPropertiesSet(); + return new PropertiesPropertySource(sourceName, factory.getObject()); + } + return super.createPropertySource(name, resource); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java new file mode 100644 index 0000000..7328c69 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.service; + +/** + * 通用 参数配置服务 + * + * @author Lion Li + */ +public interface ConfigService { + + /** + * 根据参数 key 获取参数值 + * + * @param configKey 参数 key + * @return 参数值 + */ + String getConfigValue(String configKey); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java new file mode 100644 index 0000000..f93d177 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java @@ -0,0 +1,37 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.DeptDTO; + +import java.util.List; + +/** + * 通用 部门服务 + * + * @author Lion Li + */ +public interface DeptService { + + /** + * 通过部门ID查询部门名称 + * + * @param deptIds 部门ID串逗号分隔 + * @return 部门名称串逗号分隔 + */ + String selectDeptNameByIds(String deptIds); + + /** + * 根据部门ID查询部门负责人 + * + * @param deptId 部门ID,用于指定需要查询的部门 + * @return 返回该部门的负责人ID + */ + Long selectDeptLeaderById(Long deptId); + + /** + * 查询部门 + * + * @return 部门列表 + */ + List selectDeptsByList(); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java new file mode 100644 index 0000000..7c50977 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java @@ -0,0 +1,87 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.DictDataDTO; +import org.dromara.common.core.domain.dto.DictTypeDTO; + +import java.util.List; +import java.util.Map; + +/** + * 通用 字典服务 + * + * @author Lion Li + */ +public interface DictService { + + /** + * 分隔符 + */ + String SEPARATOR = ","; + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @return 字典标签 + */ + default String getDictLabel(String dictType, String dictValue) { + return getDictLabel(dictType, dictValue, SEPARATOR); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @return 字典值 + */ + default String getDictValue(String dictType, String dictLabel) { + return getDictValue(dictType, dictLabel, SEPARATOR); + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @param separator 分隔符 + * @return 字典标签 + */ + String getDictLabel(String dictType, String dictValue, String separator); + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @param separator 分隔符 + * @return 字典值 + */ + String getDictValue(String dictType, String dictLabel, String separator); + + /** + * 获取字典下所有的字典值与标签 + * + * @param dictType 字典类型 + * @return dictValue为key,dictLabel为值组成的Map + */ + Map getAllDictByDictType(String dictType); + + /** + * 根据字典类型查询详细信息 + * + * @param dictType 字典类型 + * @return 字典类型详细信息 + */ + DictTypeDTO getDictTypeDto(String dictType); + + /** + * 根据字典类型查询字典数据列表 + * + * @param dictType 字典类型 + * @return 字典数据列表 + */ + List getDictDataDto(String dictType); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java new file mode 100644 index 0000000..1a52de0 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java @@ -0,0 +1,29 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.OssDTO; + +import java.util.List; + +/** + * 通用 OSS服务 + * + * @author Lion Li + */ +public interface OssService { + + /** + * 通过ossId查询对应的url + * + * @param ossIds ossId串逗号分隔 + * @return url串逗号分隔 + */ + String selectUrlByIds(String ossIds); + + /** + * 通过ossId查询列表 + * + * @param ossIds ossId串逗号分隔 + * @return 列表 + */ + List selectByIds(String ossIds); +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java new file mode 100644 index 0000000..41d4e83 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java @@ -0,0 +1,10 @@ +package org.dromara.common.core.service; + +/** + * 通用 岗位服务 + * + * @author AprilWind + */ +public interface PostService { + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java new file mode 100644 index 0000000..ba62c82 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java @@ -0,0 +1,10 @@ +package org.dromara.common.core.service; + +/** + * 通用 角色服务 + * + * @author AprilWind + */ +public interface RoleService { + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java new file mode 100644 index 0000000..9af6691 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java @@ -0,0 +1,45 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.TaskAssigneeDTO; +import org.dromara.common.core.domain.model.TaskAssigneeBody; + +/** + * 工作流设计器获取任务执行人 + * + * @author Lion Li + */ +public interface TaskAssigneeService { + + /** + * 查询角色并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + TaskAssigneeDTO selectRolesByTaskAssigneeList(TaskAssigneeBody taskQuery); + + /** + * 查询岗位并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + TaskAssigneeDTO selectPostsByTaskAssigneeList(TaskAssigneeBody taskQuery); + + /** + * 查询部门并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + TaskAssigneeDTO selectDeptsByTaskAssigneeList(TaskAssigneeBody taskQuery); + + /** + * 查询用户并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + TaskAssigneeDTO selectUsersByTaskAssigneeList(TaskAssigneeBody taskQuery); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java new file mode 100644 index 0000000..67cd54f --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java @@ -0,0 +1,94 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.UserDTO; + +import java.util.List; + +/** + * 通用 用户服务 + * + * @author Lion Li + */ +public interface UserService { + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ + String selectUserNameById(Long userId); + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户名称 + */ + String selectNicknameById(Long userId); + + /** + * 通过用户ID查询用户账户 + * + * @param userIds 用户ID 多个用逗号隔开 + * @return 用户名称 + */ + String selectNicknameByIds(String userIds); + + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + String selectPhonenumberById(Long userId); + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + String selectEmailById(Long userId); + + /** + * 通过用户ID查询用户列表 + * + * @param userIds 用户ids + * @return 用户列表 + */ + List selectListByIds(List userIds); + + /** + * 通过角色ID查询用户ID + * + * @param roleIds 角色ids + * @return 用户ids + */ + List selectUserIdsByRoleIds(List roleIds); + + /** + * 通过角色ID查询用户 + * + * @param roleIds 角色ids + * @return 用户 + */ + List selectUsersByRoleIds(List roleIds); + + /** + * 通过部门ID查询用户 + * + * @param deptIds 部门ids + * @return 用户 + */ + List selectUsersByDeptIds(List deptIds); + + /** + * 通过岗位ID查询用户 + * + * @param postIds 岗位ids + * @return 用户 + */ + List selectUsersByPostIds(List postIds); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java new file mode 100644 index 0000000..abbcbff --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java @@ -0,0 +1,86 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.CompleteTaskDTO; +import org.dromara.common.core.domain.dto.StartProcessDTO; +import org.dromara.common.core.domain.dto.StartProcessReturnDTO; + +import java.util.List; +import java.util.Map; + +/** + * 通用 工作流服务 + * + * @author may + */ +public interface WorkflowService { + + /** + * 运行中的实例 删除程实例,删除历史记录,删除业务与流程关联信息 + * + * @param businessIds 业务id + * @return 结果 + */ + boolean deleteInstance(List businessIds); + + /** + * 获取当前流程状态 + * + * @param taskId 任务id + * @return 状态 + */ + String getBusinessStatusByTaskId(Long taskId); + + /** + * 获取当前流程状态 + * + * @param businessId 业务id + * @return 状态 + */ + String getBusinessStatus(String businessId); + + /** + * 设置流程变量 + * + * @param instanceId 流程实例id + * @param variable 流程变量 + */ + void setVariable(Long instanceId, Map variable); + + /** + * 获取流程变量 + * + * @param instanceId 流程实例id + */ + Map instanceVariable(Long instanceId); + + /** + * 按照业务id查询流程实例id + * + * @param businessId 业务id + * @return 结果 + */ + Long getInstanceIdByBusinessId(String businessId); + + /** + * 新增租户流程定义 + * + * @param tenantId 租户id + */ + void syncDef(String tenantId); + + /** + * 启动流程 + * + * @param startProcess 参数 + * @return 结果 + */ + StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess); + + /** + * 办理任务 + * + * @param completeTask 参数 + * @return 结果 + */ + boolean completeTask(CompleteTaskDTO completeTask); +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java new file mode 100644 index 0000000..41d0f6c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java @@ -0,0 +1,287 @@ +package org.dromara.common.core.utils; + +import org.apache.commons.lang3.time.DateFormatUtils; +import org.dromara.common.core.enums.FormatsType; +import org.dromara.common.core.exception.ServiceException; + +import java.lang.management.ManagementFactory; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.*; +import java.util.Date; +import java.util.concurrent.TimeUnit; + +/** + * 时间工具类 + * + * @author ruoyi + */ +public class DateUtils extends org.apache.commons.lang3.time.DateUtils { + private static final String[] PARSE_PATTERNS = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + + @Deprecated + private DateUtils() { + } + + /** + * 获取当前日期和时间 + * + * @return 当前日期和时间的 Date 对象表示 + */ + public static Date getNowDate() { + return new Date(); + } + + /** + * 获取当前日期的字符串表示,格式为YYYY-MM-DD + * + * @return 当前日期的字符串表示 + */ + public static String getDate() { + return dateTimeNow(FormatsType.YYYY_MM_DD); + } + + /** + * 获取当前日期的字符串表示,格式为yyyyMMdd + * + * @return 当前日期的字符串表示 + */ + public static String getCurrentDate() { + return DateFormatUtils.format(new Date(), FormatsType.YYYYMMDD.getTimeFormat()); + } + + /** + * 获取当前日期的路径格式字符串,格式为"yyyy/MM/dd" + * + * @return 当前日期的路径格式字符串 + */ + public static String datePath() { + Date now = new Date(); + return DateFormatUtils.format(now, FormatsType.YYYY_MM_DD_SLASH.getTimeFormat()); + } + + /** + * 获取当前时间的字符串表示,格式为YYYY-MM-DD HH:MM:SS + * + * @return 当前时间的字符串表示 + */ + public static String getTime() { + return dateTimeNow(FormatsType.YYYY_MM_DD_HH_MM_SS); + } + + /** + * 获取当前时间的字符串表示,格式为 "HH:MM:SS" + * + * @return 当前时间的字符串表示,格式为 "HH:MM:SS" + */ + public static String getTimeWithHourMinuteSecond() { + return dateTimeNow(FormatsType.HH_MM_SS); + } + + /** + * 获取当前日期和时间的字符串表示,格式为YYYYMMDDHHMMSS + * + * @return 当前日期和时间的字符串表示 + */ + public static String dateTimeNow() { + return dateTimeNow(FormatsType.YYYYMMDDHHMMSS); + } + + /** + * 获取当前日期和时间的指定格式的字符串表示 + * + * @param format 日期时间格式,例如"YYYY-MM-DD HH:MM:SS" + * @return 当前日期和时间的字符串表示 + */ + public static String dateTimeNow(final FormatsType format) { + return parseDateToStr(format, new Date()); + } + + /** + * 将指定日期格式化为 YYYY-MM-DD 格式的字符串 + * + * @param date 要格式化的日期对象 + * @return 格式化后的日期字符串 + */ + public static String formatDate(final Date date) { + return parseDateToStr(FormatsType.YYYY_MM_DD, date); + } + + /** + * 将指定日期格式化为 YYYY-MM-DD HH:MM:SS 格式的字符串 + * + * @param date 要格式化的日期对象 + * @return 格式化后的日期时间字符串 + */ + public static String formatDateTime(final Date date) { + return parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, date); + } + + /** + * 将指定日期按照指定格式进行格式化 + * + * @param format 要使用的日期时间格式,例如"YYYY-MM-DD HH:MM:SS" + * @param date 要格式化的日期对象 + * @return 格式化后的日期时间字符串 + */ + public static String parseDateToStr(final FormatsType format, final Date date) { + return new SimpleDateFormat(format.getTimeFormat()).format(date); + } + + /** + * 将指定格式的日期时间字符串转换为 Date 对象 + * + * @param format 要解析的日期时间格式,例如"YYYY-MM-DD HH:MM:SS" + * @param ts 要解析的日期时间字符串 + * @return 解析后的 Date 对象 + * @throws RuntimeException 如果解析过程中发生异常 + */ + public static Date parseDateTime(final FormatsType format, final String ts) { + try { + return new SimpleDateFormat(format.getTimeFormat()).parse(ts); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * 将对象转换为日期对象 + * + * @param str 要转换的对象,通常是字符串 + * @return 转换后的日期对象,如果转换失败或输入为null,则返回null + */ + public static Date parseDate(Object str) { + if (str == null) { + return null; + } + try { + return parseDate(str.toString(), PARSE_PATTERNS); + } catch (ParseException e) { + return null; + } + } + + /** + * 获取服务器启动时间 + * + * @return 服务器启动时间的 Date 对象表示 + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + /** + * 计算两个日期之间的天数差(以毫秒为单位) + * + * @param date1 第一个日期 + * @param date2 第二个日期 + * @return 两个日期之间的天数差的绝对值 + */ + public static int differentDaysByMillisecond(Date date1, Date date2) { + return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); + } + + /** + * 计算两个日期之间的时间差,并以天、小时和分钟的格式返回 + * + * @param endDate 结束日期 + * @param nowDate 当前日期 + * @return 表示时间差的字符串,格式为"天 小时 分钟" + */ + public static String getDatePoor(Date endDate, Date nowDate) { + long diffInMillis = endDate.getTime() - nowDate.getTime(); + long day = TimeUnit.MILLISECONDS.toDays(diffInMillis); + long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24; + long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60; + return String.format("%d天 %d小时 %d分钟", day, hour, min); + } + + /** + * 计算两个时间点的差值(天、小时、分钟、秒),当值为0时不显示该单位 + * + * @param endDate 结束时间 + * @param nowDate 当前时间 + * @return 时间差字符串,格式为 "x天 x小时 x分钟 x秒",若为 0 则不显示 + */ + public static String getTimeDifference(Date endDate, Date nowDate) { + long diffInMillis = endDate.getTime() - nowDate.getTime(); + long day = TimeUnit.MILLISECONDS.toDays(diffInMillis); + long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24; + long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60; + long sec = TimeUnit.MILLISECONDS.toSeconds(diffInMillis) % 60; + // 构建时间差字符串,条件是值不为0才显示 + StringBuilder result = new StringBuilder(); + if (day > 0) { + result.append(String.format("%d天 ", day)); + } + if (hour > 0) { + result.append(String.format("%d小时 ", hour)); + } + if (min > 0) { + result.append(String.format("%d分钟 ", min)); + } + if (sec > 0) { + result.append(String.format("%d秒", sec)); + } + return result.length() > 0 ? result.toString().trim() : "0秒"; + } + + /** + * 将 LocalDateTime 对象转换为 Date 对象 + * + * @param temporalAccessor 要转换的 LocalDateTime 对象 + * @return 转换后的 Date 对象 + */ + public static Date toDate(LocalDateTime temporalAccessor) { + ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + /** + * 将 LocalDate 对象转换为 Date 对象 + * + * @param temporalAccessor 要转换的 LocalDate 对象 + * @return 转换后的 Date 对象 + */ + public static Date toDate(LocalDate temporalAccessor) { + LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); + ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + /** + * 校验日期范围 + * + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param maxValue 最大时间跨度的限制值 + * @param unit 时间跨度的单位,可选择 "DAYS"、"HOURS" 或 "MINUTES" + */ + public static void validateDateRange(Date startDate, Date endDate, int maxValue, TimeUnit unit) { + // 校验结束日期不能早于开始日期 + if (endDate.before(startDate)) { + throw new ServiceException("结束日期不能早于开始日期"); + } + + // 计算时间跨度 + long diffInMillis = endDate.getTime() - startDate.getTime(); + + // 根据单位转换时间跨度 + long diff = switch (unit) { + case DAYS -> TimeUnit.MILLISECONDS.toDays(diffInMillis); + case HOURS -> TimeUnit.MILLISECONDS.toHours(diffInMillis); + case MINUTES -> TimeUnit.MILLISECONDS.toMinutes(diffInMillis); + default -> throw new IllegalArgumentException("不支持的时间单位"); + }; + + // 校验时间跨度不超过最大限制 + if (diff > maxValue) { + throw new ServiceException("最大时间跨度为 " + maxValue + " " + unit.toString().toLowerCase()); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java new file mode 100644 index 0000000..b6acff7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java @@ -0,0 +1,93 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import io.github.linpeilie.Converter; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * Mapstruct 工具类 + *

参考文档:mapstruct-plus

+ * + * + * @author Michelle.Chung + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class MapstructUtils { + + private final static Converter CONVERTER = SpringUtils.getBean(Converter.class); + + /** + * 将 T 类型对象,转换为 desc 类型的对象并返回 + * + * @param source 数据来源实体 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static V convert(T source, Class desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + return CONVERTER.convert(source, desc); + } + + /** + * 将 T 类型对象,按照配置的映射字段规则,给 desc 类型的对象赋值并返回 desc 对象 + * + * @param source 数据来源实体 + * @param desc 转换后的对象 + * @return desc + */ + public static V convert(T source, V desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + return CONVERTER.convert(source, desc); + } + + /** + * 将 T 类型的集合,转换为 desc 类型的集合并返回 + * + * @param sourceList 数据来源实体列表 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static List convert(List sourceList, Class desc) { + if (ObjectUtil.isNull(sourceList)) { + return null; + } + if (CollUtil.isEmpty(sourceList)) { + return CollUtil.newArrayList(); + } + return CONVERTER.convert(sourceList, desc); + } + + /** + * 将 Map 转换为 beanClass 类型的集合并返回 + * + * @param map 数据来源 + * @param beanClass bean类 + * @return bean对象 + */ + public static T convert(Map map, Class beanClass) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(beanClass)) { + return null; + } + return CONVERTER.convert(map, beanClass); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java new file mode 100644 index 0000000..48dfc08 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java @@ -0,0 +1,33 @@ +package org.dromara.common.core.utils; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.context.MessageSource; +import org.springframework.context.NoSuchMessageException; +import org.springframework.context.i18n.LocaleContextHolder; + +/** + * 获取i18n资源文件 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class MessageUtils { + + private static final MessageSource MESSAGE_SOURCE = SpringUtils.getBean(MessageSource.class); + + /** + * 根据消息键和参数 获取消息 委托给spring messageSource + * + * @param code 消息键 + * @param args 参数 + * @return 获取国际化翻译值 + */ + public static String message(String code, Object... args) { + try { + return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale()); + } catch (NoSuchMessageException e) { + return code; + } + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java new file mode 100644 index 0000000..199fd82 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java @@ -0,0 +1,60 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.function.Function; + +/** + * 对象工具类 + * + * @author 秋辞未寒 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ObjectUtils extends ObjectUtil { + + /** + * 如果对象不为空,则获取对象中的某个字段 ObjectUtils.notNullGetter(user, User::getName); + * + * @param obj 对象 + * @param func 获取方法 + * @return 对象字段 + */ + public static E notNullGetter(T obj, Function func) { + if (isNotNull(obj) && isNotNull(func)) { + return func.apply(obj); + } + return null; + } + + /** + * 如果对象不为空,则获取对象中的某个字段,否则返回默认值 + * + * @param obj 对象 + * @param func 获取方法 + * @param defaultValue 默认值 + * @return 对象字段 + */ + public static E notNullGetter(T obj, Function func, E defaultValue) { + if (isNotNull(obj) && isNotNull(func)) { + return func.apply(obj); + } + return defaultValue; + } + + /** + * 如果值不为空,则返回值,否则返回默认值 + * + * @param obj 对象 + * @param defaultValue 默认值 + * @return 对象字段 + */ + public static T notNull(T obj, T defaultValue) { + if (isNotNull(obj)) { + return obj; + } + return defaultValue; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java new file mode 100644 index 0000000..bd1aab8 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java @@ -0,0 +1,289 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.convert.Convert; +import cn.hutool.extra.servlet.JakartaServletUtil; +import cn.hutool.http.HttpStatus; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.http.MediaType; +import org.springframework.util.LinkedCaseInsensitiveMap; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.io.IOException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +/** + * 客户端工具类,提供获取请求参数、响应处理、头部信息等常用操作 + * + * @author ruoyi + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ServletUtils extends JakartaServletUtil { + + /** + * 获取指定名称的 String 类型的请求参数 + * + * @param name 参数名 + * @return 参数值 + */ + public static String getParameter(String name) { + return getRequest().getParameter(name); + } + + /** + * 获取指定名称的 String 类型的请求参数,若参数不存在,则返回默认值 + * + * @param name 参数名 + * @param defaultValue 默认值 + * @return 参数值或默认值 + */ + public static String getParameter(String name, String defaultValue) { + return Convert.toStr(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取指定名称的 Integer 类型的请求参数 + * + * @param name 参数名 + * @return 参数值 + */ + public static Integer getParameterToInt(String name) { + return Convert.toInt(getRequest().getParameter(name)); + } + + /** + * 获取指定名称的 Integer 类型的请求参数,若参数不存在,则返回默认值 + * + * @param name 参数名 + * @param defaultValue 默认值 + * @return 参数值或默认值 + */ + public static Integer getParameterToInt(String name, Integer defaultValue) { + return Convert.toInt(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取指定名称的 Boolean 类型的请求参数 + * + * @param name 参数名 + * @return 参数值 + */ + public static Boolean getParameterToBool(String name) { + return Convert.toBool(getRequest().getParameter(name)); + } + + /** + * 获取指定名称的 Boolean 类型的请求参数,若参数不存在,则返回默认值 + * + * @param name 参数名 + * @param defaultValue 默认值 + * @return 参数值或默认值 + */ + public static Boolean getParameterToBool(String name, Boolean defaultValue) { + return Convert.toBool(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取所有请求参数(以 Map 的形式返回) + * + * @param request 请求对象{@link ServletRequest} + * @return 请求参数的 Map,键为参数名,值为参数值数组 + */ + public static Map getParams(ServletRequest request) { + final Map map = request.getParameterMap(); + return Collections.unmodifiableMap(map); + } + + /** + * 获取所有请求参数(以 Map 的形式返回,值为字符串形式的拼接) + * + * @param request 请求对象{@link ServletRequest} + * @return 请求参数的 Map,键为参数名,值为拼接后的字符串 + */ + public static Map getParamMap(ServletRequest request) { + Map params = new HashMap<>(); + for (Map.Entry entry : getParams(request).entrySet()) { + params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR)); + } + return params; + } + + /** + * 获取当前 HTTP 请求对象 + * + * @return 当前 HTTP 请求对象 + */ + public static HttpServletRequest getRequest() { + try { + return getRequestAttributes().getRequest(); + } catch (Exception e) { + return null; + } + } + + /** + * 获取当前 HTTP 响应对象 + * + * @return 当前 HTTP 响应对象 + */ + public static HttpServletResponse getResponse() { + try { + return getRequestAttributes().getResponse(); + } catch (Exception e) { + return null; + } + } + + /** + * 获取当前请求的 HttpSession 对象 + *

+ * 如果当前请求已经关联了一个会话(即已经存在有效的 session ID), + * 则返回该会话对象;如果没有关联会话,则会创建一个新的会话对象并返回。 + *

+ * HttpSession 用于存储会话级别的数据,如用户登录信息、购物车内容等, + * 可以在多个请求之间共享会话数据 + * + * @return 当前请求的 HttpSession 对象 + */ + public static HttpSession getSession() { + return getRequest().getSession(); + } + + /** + * 获取当前请求的请求属性 + * + * @return {@link ServletRequestAttributes} 请求属性对象 + */ + public static ServletRequestAttributes getRequestAttributes() { + try { + RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); + return (ServletRequestAttributes) attributes; + } catch (Exception e) { + return null; + } + } + + /** + * 获取指定请求头的值,如果头部为空则返回空字符串 + * + * @param request 请求对象 + * @param name 头部名称 + * @return 头部值 + */ + public static String getHeader(HttpServletRequest request, String name) { + String value = request.getHeader(name); + if (StringUtils.isEmpty(value)) { + return StringUtils.EMPTY; + } + return urlDecode(value); + } + + /** + * 获取所有请求头的 Map,键为头部名称,值为头部值 + * + * @param request 请求对象 + * @return 请求头的 Map + */ + public static Map getHeaders(HttpServletRequest request) { + Map map = new LinkedCaseInsensitiveMap<>(); + Enumeration enumeration = request.getHeaderNames(); + if (enumeration != null) { + while (enumeration.hasMoreElements()) { + String key = enumeration.nextElement(); + String value = request.getHeader(key); + map.put(key, value); + } + } + return map; + } + + /** + * 将字符串渲染到客户端(以 JSON 格式返回) + * + * @param response 渲染对象 + * @param string 待渲染的字符串 + */ + public static void renderString(HttpServletResponse response, String string) { + try { + response.setStatus(HttpStatus.HTTP_OK); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding(StandardCharsets.UTF_8.toString()); + response.getWriter().print(string); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 判断当前请求是否为 Ajax 异步请求 + * + * @param request 请求对象 + * @return 是否为 Ajax 请求 + */ + public static boolean isAjaxRequest(HttpServletRequest request) { + + // 判断 Accept 头部是否包含 application/json + String accept = request.getHeader("accept"); + if (accept != null && accept.contains(MediaType.APPLICATION_JSON_VALUE)) { + return true; + } + + // 判断 X-Requested-With 头部是否包含 XMLHttpRequest + String xRequestedWith = request.getHeader("X-Requested-With"); + if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { + return true; + } + + // 判断 URI 后缀是否为 .json 或 .xml + String uri = request.getRequestURI(); + if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) { + return true; + } + + // 判断请求参数 __ajax 是否为 json 或 xml + String ajax = request.getParameter("__ajax"); + return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml"); + } + + /** + * 获取客户端 IP 地址 + * + * @return 客户端 IP 地址 + */ + public static String getClientIP() { + return getClientIP(getRequest()); + } + + /** + * 对内容进行 URL 编码 + * + * @param str 内容 + * @return 编码后的内容 + */ + public static String urlEncode(String str) { + return URLEncoder.encode(str, StandardCharsets.UTF_8); + } + + /** + * 对内容进行 URL 解码 + * + * @param str 内容 + * @return 解码后的内容 + */ + public static String urlDecode(String str) { + return URLDecoder.decode(str, StandardCharsets.UTF_8); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java new file mode 100644 index 0000000..169c6e2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java @@ -0,0 +1,67 @@ +package org.dromara.common.core.utils; + +import cn.hutool.extra.spring.SpringUtil; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.boot.autoconfigure.thread.Threading; +import org.springframework.context.ApplicationContext; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +/** + * spring工具类 + * + * @author Lion Li + */ +@Component +public final class SpringUtils extends SpringUtil { + + /** + * 如果BeanFactory包含一个与所给名称匹配的bean定义,则返回true + */ + public static boolean containsBean(String name) { + return getBeanFactory().containsBean(name); + } + + /** + * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 + * 如果与给定名字相应的bean定义没有被找到,将会抛出一个异常(NoSuchBeanDefinitionException) + */ + public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException { + return getBeanFactory().isSingleton(name); + } + + /** + * @return Class 注册对象的类型 + */ + public static Class getType(String name) throws NoSuchBeanDefinitionException { + return getBeanFactory().getType(name); + } + + /** + * 如果给定的bean名字在bean定义中有别名,则返回这些别名 + */ + public static String[] getAliases(String name) throws NoSuchBeanDefinitionException { + return getBeanFactory().getAliases(name); + } + + /** + * 获取aop代理对象 + */ + @SuppressWarnings("unchecked") + public static T getAopProxy(T invoker) { + return (T) getBean(invoker.getClass()); + } + + + /** + * 获取spring上下文 + */ + public static ApplicationContext context() { + return getApplicationContext(); + } + + public static boolean isVirtual() { + return Threading.VIRTUAL.isActive(getBean(Environment.class)); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java new file mode 100644 index 0000000..f9e53a5 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java @@ -0,0 +1,282 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +/** + * stream 流工具类 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StreamUtils { + + /** + * 将collection过滤 + * + * @param collection 需要转化的集合 + * @param function 过滤方法 + * @return 过滤后的list + */ + public static List filter(Collection collection, Predicate function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + return collection.stream().filter(function).collect(Collectors.toList()); + } + + /** + * 找到流中满足条件的第一个元素 + * + * @param collection 需要查询的集合 + * @param function 过滤方法 + * @return 找到符合条件的第一个元素,没有则返回null + */ + public static E findFirst(Collection collection, Predicate function) { + if (CollUtil.isEmpty(collection)) { + return null; + } + return collection.stream().filter(function).findFirst().orElse(null); + } + + /** + * 找到流中任意一个满足条件的元素 + * + * @param collection 需要查询的集合 + * @param function 过滤方法 + * @return 找到符合条件的任意一个元素,没有则返回null + */ + public static Optional findAny(Collection collection, Predicate function) { + if (CollUtil.isEmpty(collection)) { + return Optional.empty(); + } + return collection.stream().filter(function).findAny(); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function) { + return join(collection, function, StringUtils.SEPARATOR); + } + + /** + * 将collection拼接 + * + * @param collection 需要转化的集合 + * @param function 拼接方法 + * @param delimiter 拼接符 + * @return 拼接后的list + */ + public static String join(Collection collection, Function function, CharSequence delimiter) { + if (CollUtil.isEmpty(collection)) { + return StringUtils.EMPTY; + } + return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter)); + } + + /** + * 将collection排序 + * + * @param collection 需要转化的集合 + * @param comparing 排序方法 + * @return 排序后的list + */ + public static List sorted(Collection collection, Comparator comparing) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + return collection.stream().filter(Objects::nonNull).sorted(comparing).collect(Collectors.toList()); + } + + /** + * 将collection转化为类型不变的map
+ * {@code Collection ----> Map} + * + * @param collection 需要转化的集合 + * @param key V类型转化为K类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @return 转化后的map + */ + public static Map toIdentityMap(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, Function.identity(), (l, r) -> l)); + } + + /** + * 将Collection转化为map(value类型与collection的泛型不同)
+ * {@code Collection -----> Map } + * + * @param collection 需要转化的集合 + * @param key E类型转化为K类型的lambda方法 + * @param value E类型转化为V类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @param map中的value类型 + * @return 转化后的map + */ + public static Map toMap(Collection collection, Function key, Function value) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, value, (l, r) -> l)); + } + + /** + * 将collection按照规则(比如有相同的班级id)分类成map
+ * {@code Collection -------> Map> } + * + * @param collection 需要分类的集合 + * @param key 分类的规则 + * @param collection中的泛型 + * @param map中的key类型 + * @return 分类后的map + */ + public static Map> groupByKey(Collection collection, Function key) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList())); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map>> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 集合元素类型 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @return 分类后的map + */ + public static Map>> groupBy2Key(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection)) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList()))); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map
+ * {@code Collection ---> Map> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @param collection中的泛型 + * @return 分类后的map + */ + public static Map> group2Map(Collection collection, Function key1, Function key2) { + if (CollUtil.isEmpty(collection) || key1 == null || key2 == null) { + return MapUtil.newHashMap(); + } + return collection + .stream().filter(Objects::nonNull) + .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l))); + } + + /** + * 将collection转化为List集合,但是两者的泛型不同
+ * {@code Collection ------> List } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为list泛型的lambda表达式 + * @param collection中的泛型 + * @param List中的泛型 + * @return 转化后的list + */ + public static List toList(Collection collection, Function function) { + if (CollUtil.isEmpty(collection)) { + return CollUtil.newArrayList(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题 + .collect(Collectors.toList()); + } + + /** + * 将collection转化为Set集合,但是两者的泛型不同
+ * {@code Collection ------> Set } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为set泛型的lambda表达式 + * @param collection中的泛型 + * @param Set中的泛型 + * @return 转化后的Set + */ + public static Set toSet(Collection collection, Function function) { + if (CollUtil.isEmpty(collection) || function == null) { + return CollUtil.newHashSet(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + } + + + /** + * 合并两个相同key类型的map + * + * @param map1 第一个需要合并的 map + * @param map2 第二个需要合并的 map + * @param merge 合并的lambda,将key value1 value2合并成最终的类型,注意value可能为空的情况 + * @param map中的key类型 + * @param 第一个 map的value类型 + * @param 第二个 map的value类型 + * @param 最终map的value类型 + * @return 合并后的map + */ + public static Map merge(Map map1, Map map2, BiFunction merge) { + if (MapUtil.isEmpty(map1) && MapUtil.isEmpty(map2)) { + return MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map1)) { + map1 = MapUtil.newHashMap(); + } else if (MapUtil.isEmpty(map2)) { + map2 = MapUtil.newHashMap(); + } + Set key = new HashSet<>(); + key.addAll(map1.keySet()); + key.addAll(map2.keySet()); + Map map = new HashMap<>(); + for (K t : key) { + X x = map1.get(t); + Y y = map2.get(t); + V z = merge.apply(x, y); + if (z != null) { + map.put(t, z); + } + } + return map; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java new file mode 100644 index 0000000..0363ad4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -0,0 +1,342 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; +import org.springframework.util.AntPathMatcher; + +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 字符串工具类 + * + * @author Lion Li + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + public static final String SEPARATOR = ","; + + public static final String SLASH = "/"; + + @Deprecated + private StringUtils() { + } + + /** + * 获取参数不为空值 + * + * @param str defaultValue 要判断的value + * @return value 返回值 + */ + public static String blankToDefault(String str, String defaultValue) { + return StrUtil.blankToDefault(str, defaultValue); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true:为空 false:非空 + */ + public static boolean isEmpty(String str) { + return StrUtil.isEmpty(str); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true:非空串 false:空串 + */ + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } + + /** + * 去空格 + */ + public static String trim(String str) { + return StrUtil.trim(str); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) { + return substring(str, start, str.length()); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) { + return StrUtil.sub(str, start, end); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可,如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例:
+ * 通常使用:format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}: format("this is \\{} for {}", "a", "b") -> this is {} for a
+ * 转义\: format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板,被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) { + return StrUtil.format(template, params); + } + + /** + * 是否为http(s)://开头 + * + * @param link 链接 + * @return 结果 + */ + public static boolean ishttp(String link) { + return Validator.isUrl(link); + } + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static Set str2Set(String str, String sep) { + return new HashSet<>(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static List str2List(String str, String sep, boolean filterBlank, boolean trim) { + List list = new ArrayList<>(); + if (isEmpty(str)) { + return list; + } + + // 过滤空白字符串 + if (filterBlank && isBlank(str)) { + return list; + } + String[] split = str.split(sep); + for (String string : split) { + if (filterBlank && isBlank(string)) { + continue; + } + if (trim) { + string = trim(string); + } + list.add(string); + } + + return list; + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { + return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences); + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) { + return StrUtil.toUnderlineCase(str); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) { + return StrUtil.equalsAnyIgnoreCase(str, strs); + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空,则返回空字符串。 例如:HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) { + return StrUtil.upperFirst(StrUtil.toCamelCase(name)); + } + + /** + * 驼峰式命名法 例如:user_name->userName + */ + public static String toCamelCase(String s) { + return StrUtil.toCamelCase(s); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || CollUtil.isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串,不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + /** + * 数字左边补齐0,使之达到指定长度。注意,如果数字转换为字符串后,长度大于size,则只保留 最后size个字符。 + * + * @param num 数字对象 + * @param size 字符串指定长度 + * @return 返回数字的字符串格式,该字符串为指定长度。 + */ + public static String padl(final Number num, final int size) { + return padl(num.toString(), size, '0'); + } + + /** + * 字符串左补齐。如果原始字符串s长度大于size,则只保留最后size个字符。 + * + * @param s 原始字符串 + * @param size 字符串指定长度 + * @param c 用于补齐的字符 + * @return 返回指定长度的字符串,由原字符串左补齐或截取得到。 + */ + public static String padl(final String s, final int size, final char c) { + final StringBuilder sb = new StringBuilder(size); + if (s != null) { + final int len = s.length(); + if (s.length() <= size) { + sb.append(String.valueOf(c).repeat(size - len)); + sb.append(s); + } else { + return s.substring(len - size, len); + } + } else { + sb.append(String.valueOf(c).repeat(Math.max(0, size))); + } + return sb.toString(); + } + + /** + * 切分字符串(分隔符默认逗号) + * + * @param str 被切分的字符串 + * @return 分割后的数据列表 + */ + public static List splitList(String str) { + return splitTo(str, Convert::toStr); + } + + /** + * 切分字符串 + * + * @param str 被切分的字符串 + * @param separator 分隔符 + * @return 分割后的数据列表 + */ + public static List splitList(String str, String separator) { + return splitTo(str, separator, Convert::toStr); + } + + /** + * 切分字符串自定义转换(分隔符默认逗号) + * + * @param str 被切分的字符串 + * @param mapper 自定义转换 + * @return 分割后的数据列表 + */ + public static List splitTo(String str, Function mapper) { + return splitTo(str, SEPARATOR, mapper); + } + + /** + * 切分字符串自定义转换 + * + * @param str 被切分的字符串 + * @param separator 分隔符 + * @param mapper 自定义转换 + * @return 分割后的数据列表 + */ + public static List splitTo(String str, String separator, Function mapper) { + if (isBlank(str)) { + return new ArrayList<>(0); + } + return StrUtil.split(str, separator) + .stream() + .filter(Objects::nonNull) + .map(mapper) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + /** + * 不区分大小写检查 CharSequence 是否以指定的前缀开头。 + * + * @param str 要检查的 CharSequence 可能为 null + * @param prefixs 要查找的前缀可能为 null + * @return 是否包含 + */ + public static boolean startWithAnyIgnoreCase(CharSequence str, CharSequence... prefixs) { + // 判断是否是以指定字符串开头 + for (CharSequence prefix : prefixs) { + if (StringUtils.startsWithIgnoreCase(str, prefix)) { + return true; + } + } + return false; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java new file mode 100644 index 0000000..82ea5ca --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java @@ -0,0 +1,63 @@ +package org.dromara.common.core.utils; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.util.concurrent.*; + +/** + * 线程相关工具类. + * + * @author ruoyi + */ +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class Threads { + /** + * 停止线程池 + * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. + * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. + * 如果仍然超時,則強制退出. + * 另对在shutdown时线程本身被调用中断做了处理. + */ + public static void shutdownAndAwaitTermination(ExecutorService pool) { + if (pool != null && !pool.isShutdown()) { + pool.shutdown(); + try { + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) { + pool.shutdownNow(); + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) { + log.info("Pool did not terminate"); + } + } + } catch (InterruptedException ie) { + pool.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + } + + /** + * 打印线程异常信息 + */ + public static void printException(Runnable r, Throwable t) { + if (t == null && r instanceof Future) { + try { + Future future = (Future) r; + if (future.isDone()) { + future.get(); + } + } catch (CancellationException ce) { + t = ce; + } catch (ExecutionException ee) { + t = ee.getCause(); + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + } + } + if (t != null) { + log.error(t.getMessage(), t); + } + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java new file mode 100644 index 0000000..2ab42cb --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java @@ -0,0 +1,96 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.lang.tree.TreeNodeConfig; +import cn.hutool.core.lang.tree.TreeUtil; +import cn.hutool.core.lang.tree.parser.NodeParser; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.reflect.ReflectUtils; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 扩展 hutool TreeUtil 封装系统树构建 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class TreeBuildUtils extends TreeUtil { + + /** + * 根据前端定制差异化字段 + */ + public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label"); + + /** + * 构建树形结构 + * + * @param 输入节点的类型 + * @param 节点ID的类型 + * @param list 节点列表,其中包含了要构建树形结构的所有节点 + * @param nodeParser 解析器,用于将输入节点转换为树节点 + * @return 构建好的树形结构列表 + */ + public static List> build(List list, NodeParser nodeParser) { + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + K k = ReflectUtils.invokeGetter(list.get(0), "parentId"); + return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser); + } + + /** + * 构建树形结构 + * + * @param 输入节点的类型 + * @param 节点ID的类型 + * @param parentId 顶级节点 + * @param list 节点列表,其中包含了要构建树形结构的所有节点 + * @param nodeParser 解析器,用于将输入节点转换为树节点 + * @return 构建好的树形结构列表 + */ + public static List> build(List list, K parentId, NodeParser nodeParser) { + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + return TreeUtil.build(list, parentId, DEFAULT_CONFIG, nodeParser); + } + + /** + * 获取节点列表中所有节点的叶子节点 + * + * @param 节点ID的类型 + * @param nodes 节点列表 + * @return 包含所有叶子节点的列表 + */ + public static List> getLeafNodes(List> nodes) { + if (CollUtil.isEmpty(nodes)) { + return CollUtil.newArrayList(); + } + return nodes.stream() + .flatMap(TreeBuildUtils::extractLeafNodes) + .collect(Collectors.toList()); + } + + /** + * 获取指定节点下的所有叶子节点 + * + * @param 节点ID的类型 + * @param node 要查找叶子节点的根节点 + * @return 包含所有叶子节点的列表 + */ + private static Stream> extractLeafNodes(Tree node) { + if (!node.hasChild()) { + return Stream.of(node); + } else { + // 递归调用,获取所有子节点的叶子节点 + return node.getChildren().stream() + .flatMap(TreeBuildUtils::extractLeafNodes); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TxApiSdkUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TxApiSdkUtils.java new file mode 100644 index 0000000..f9da109 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TxApiSdkUtils.java @@ -0,0 +1,189 @@ +package org.dromara.common.core.utils; + +import cn.hutool.core.codec.Base64; +import com.tencent.cloud.CosStsClient; +import com.tencent.cloud.Policy; +import com.tencent.cloud.Response; +import com.tencent.cloud.Statement; +import com.tencent.cloud.cos.util.Jackson; +import com.tencentcloudapi.common.AbstractModel; +import com.tencentcloudapi.common.Credential; +import com.tencentcloudapi.common.exception.TencentCloudSDKException; +import com.tencentcloudapi.common.profile.ClientProfile; +import com.tencentcloudapi.common.profile.HttpProfile; +import com.tencentcloudapi.ims.v20201229.ImsClient; +import com.tencentcloudapi.ims.v20201229.models.ImageModerationRequest; +import com.tencentcloudapi.ims.v20201229.models.ImageModerationResponse; +import com.tencentcloudapi.sms.v20210111.SmsClient; +import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; +import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; +import com.tencentcloudapi.tms.v20201229.TmsClient; +import com.tencentcloudapi.tms.v20201229.models.TextModerationRequest; +import com.tencentcloudapi.tms.v20201229.models.TextModerationResponse; + +import java.util.TreeMap; + + +public class TxApiSdkUtils +{ + + private static final String SMS_SECRET_ID = "AKIDMcmoeNr64nIpicWBYeU6TaR8h280uyAF"; + + private static final String SMS_SECRET_KEY = "yg8JEzVmriLjtqZ3KURUIrDRQ9euxmbI"; + + /** + * 获取上传临时密钥 + */ + public void getCredential() { + TreeMap config = new TreeMap(); + try { + //这里的 SecretId 和 SecretKey 代表了用于申请临时密钥的永久身份(主账号、子账号等),子账号需要具有操作存储桶的权限。 + String secretId = System.getenv(SMS_SECRET_ID); + String secretKey = System.getenv(SMS_SECRET_KEY); + // 替换为您的云 api 密钥 SecretId + config.put("secretId", secretId); + // 替换为您的云 api 密钥 SecretKey + config.put("secretKey", secretKey); + // 初始化 policy + Policy policy = new Policy(); + // 临时密钥有效时长,单位是秒,默认 1800 秒,目前主账号最长 2 小时(即 7200 秒),子账号最长 36 小时(即 129600)秒 + config.put("durationSeconds", 1800); + // 换成您的 bucket + config.put("bucket", "examplebucket-1250000000"); + // 换成 bucket 所在地区 + config.put("region", "ap-shanghai"); + + // 开始构建一条 statement + Statement statement = new Statement(); + // 声明设置的结果是允许操作 + statement.setEffect("allow"); + statement.addActions(new String[]{ + "cos:PutObject", + // 表单上传、小程序上传 + "cos:PostObject", + // 分块上传 + "cos:InitiateMultipartUpload", + "cos:ListMultipartUploads", + "cos:ListParts", + "cos:UploadPart", + "cos:CompleteMultipartUpload", + // 处理相关接口一般为数据万象产品 权限中以ci开头 + // 创建媒体处理任务 + "ci:CreateMediaJobs", + // 文件压缩 + "ci:CreateFileProcessJobs" + }); + + statement.addResources(new String[]{ + "qcs::cos:ap-chongqing:uid/1250000000:examplebucket-1250000000/*", + "qcs::ci:ap-chongqing:uid/1250000000:bucket/examplebucket-1250000000/*"}); + + // 把一条 statement 添加到 policy 可以添加多条 + policy.addStatement(statement); + // 将 Policy 示例转化成 String,可以使用任何 json 转化方式,这里是本 SDK 自带的推荐方式 + config.put("policy", Jackson.toJsonPrettyString(policy)); + Response response = CosStsClient.getCredential(config); + } catch (Exception e) { + throw new IllegalArgumentException("no valid secret !"); + } + } + + /** + * 腾讯云文件安全检测 + * @param content + * @return + */ + public static String checkContext(String content){ + try{ + Credential cred = new Credential(SMS_SECRET_ID, SMS_SECRET_KEY); + // 实例化一个http选项,可选的,没有特殊需求可以跳过 + HttpProfile httpProfile = new HttpProfile(); + httpProfile.setEndpoint("tms.ap-shanghai.tencentcloudapi.com"); + // 实例化一个client选项,可选的,没有特殊需求可以跳过 + ClientProfile clientProfile = new ClientProfile(); + clientProfile.setHttpProfile(httpProfile); + // 实例化要请求产品的client对象,clientProfile是可选的 + TmsClient client = new TmsClient(cred, "ap-shanghai", clientProfile); + // 实例化一个请求对象,每个接口都会对应一个request对象 + TextModerationRequest req = new TextModerationRequest(); + + String str = Base64.encode(content); + req.setContent(str); + // 返回的resp是一个TextModerationResponse的实例,与请求对象对应 + TextModerationResponse resp = client.TextModeration(req); + // 输出json格式的字符串回包 + return AbstractModel.toJsonString(resp); + } catch (TencentCloudSDKException e) { + throw new IllegalArgumentException("文件检测接口异常"); + } + } + + + /** + * 腾讯云图片安全检测 + * @param imgUrl + * @return + */ + public static String checkImages(String imgUrl){ + try{ + Credential cred = new Credential(SMS_SECRET_ID, SMS_SECRET_KEY); + // 实例化一个http选项,可选的,没有特殊需求可以跳过 + HttpProfile httpProfile = new HttpProfile(); + httpProfile.setEndpoint("ims.ap-shanghai.tencentcloudapi.com"); + // 实例化一个client选项,可选的,没有特殊需求可以跳过 + ClientProfile clientProfile = new ClientProfile(); + clientProfile.setHttpProfile(httpProfile); + // 实例化要请求产品的client对象,clientProfile是可选的 + ImsClient client = new ImsClient(cred, "ap-shanghai", clientProfile); + // 实例化一个请求对象,每个接口都会对应一个request对象jkighjkhgkhgkhgjhghkjj + ImageModerationRequest req = new ImageModerationRequest(); + req.setFileUrl(imgUrl); + // 返回的resp是一个ImageModerationResponse的实例,与请求对象对应 + ImageModerationResponse resp = client.ImageModeration(req); + // 输出json格式的字符串回包 + return AbstractModel.toJsonString(resp); + } catch (TencentCloudSDKException e) { + throw new IllegalArgumentException("文件检测接口异常"); + } + } + + + /** + * 腾讯云发送短信 + * @param phoneNumber + * @param code + * @return + */ + public static String sendSmsMsg(String phoneNumber, String code){ + try{ + Credential cred = new Credential(SMS_SECRET_ID, SMS_SECRET_KEY); + // 实例化一个http选项,可选的,没有特殊需求可以跳过 + HttpProfile httpProfile = new HttpProfile(); + httpProfile.setEndpoint("sms.tencentcloudapi.com"); + // 实例化一个client选项,可选的,没有特殊需求可以跳过 + ClientProfile clientProfile = new ClientProfile(); + clientProfile.setHttpProfile(httpProfile); + // 实例化要请求产品的client对象,clientProfile是可选的 + SmsClient client = new SmsClient(cred, "ap-nanjing", clientProfile); + // 实例化一个请求对象,每个接口都会对应一个request对象 + SendSmsRequest req = new SendSmsRequest(); + + String[] phoneNumberSet1 = {phoneNumber}; + req.setPhoneNumberSet(phoneNumberSet1); + req.setSmsSdkAppId("1400926380"); + req.setTemplateId("2222045"); + req.setSignName("合肥小图科技"); + + String[] templateParamSet1 = {code}; + req.setTemplateParamSet(templateParamSet1); + + // 返回的resp是一个SendSmsResponse的实例,与请求对象对应 + SendSmsResponse resp = client.SendSms(req); + // 输出json格式的字符串回包 + return AbstractModel.toJsonString(resp); + } catch (TencentCloudSDKException e) { + throw new IllegalArgumentException("短信接口异常"); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/UserLoginUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/UserLoginUtil.java new file mode 100644 index 0000000..a63704a --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/UserLoginUtil.java @@ -0,0 +1,17 @@ +package org.dromara.common.core.utils; + +public class UserLoginUtil { + public static boolean validate(String userName){ + if("cjname".equals(userName)){ + return true; + } + return false; + } + + public static boolean validateId(String userName) { + if("cjid".equals(userName)){ + return true; + } + return false; + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java new file mode 100644 index 0000000..06b8fd6 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java @@ -0,0 +1,35 @@ +package org.dromara.common.core.utils; + +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.Set; + +/** + * Validator 校验框架工具 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ValidatorUtils { + + private static final Validator VALID = SpringUtils.getBean(Validator.class); + + /** + * 对给定对象进行参数校验,并根据指定的校验组进行校验 + * + * @param object 要进行校验的对象 + * @param groups 校验组 + * @throws ConstraintViolationException 如果校验不通过,则抛出参数校验异常 + */ + public static void validate(T object, Class... groups) { + Set> validate = VALID.validate(object, groups); + if (!validate.isEmpty()) { + throw new ConstraintViolationException("参数校验异常", validate); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java new file mode 100644 index 0000000..573b207 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java @@ -0,0 +1,43 @@ +package org.dromara.common.core.utils.file; + +import cn.hutool.core.io.FileUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + +/** + * 文件处理工具类 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class FileUtils extends FileUtil { + + /** + * 下载文件名重新编码 + * + * @param response 响应对象 + * @param realFileName 真实文件名 + */ + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) { + String percentEncodedFileName = percentEncode(realFileName); + String contentDispositionValue = "attachment; filename=%s;filename*=utf-8''%s".formatted(percentEncodedFileName, percentEncodedFileName); + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); + response.setHeader("Content-disposition", contentDispositionValue); + response.setHeader("download-filename", percentEncodedFileName); + } + + /** + * 百分号编码工具方法 + * + * @param s 需要百分号编码的字符串 + * @return 百分号编码后的字符串 + */ + public static String percentEncode(String s) { + String encode = URLEncoder.encode(s, StandardCharsets.UTF_8); + return encode.replaceAll("\\+", "%20"); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java new file mode 100644 index 0000000..23fa2cf --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java @@ -0,0 +1,40 @@ +package org.dromara.common.core.utils.file; + +/** + * 媒体类型工具类 + * + * @author ruoyi + */ +public class MimeTypeUtils { + public static final String IMAGE_PNG = "image/png"; + + public static final String IMAGE_JPG = "image/jpg"; + + public static final String IMAGE_JPEG = "image/jpeg"; + + public static final String IMAGE_BMP = "image/bmp"; + + public static final String IMAGE_GIF = "image/gif"; + + public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"}; + + public static final String[] FLASH_EXTENSION = {"swf", "flv"}; + + public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", + "asf", "rm", "rmvb"}; + + public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"}; + + public static final String[] DEFAULT_ALLOWED_EXTENSION = { + // 图片 + "bmp", "gif", "jpg", "jpeg", "png", + // word excel powerpoint + "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", + // 压缩文件 + "rar", "zip", "gz", "bz2", + // 视频格式 + "mp4", "avi", "rmvb", + // pdf + "pdf"}; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java new file mode 100644 index 0000000..808f440 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java @@ -0,0 +1,33 @@ +package org.dromara.common.core.utils.ip; + +import cn.hutool.core.net.NetUtil; +import cn.hutool.http.HtmlUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.StringUtils; + +/** + * 获取地址类 + * + * @author Lion Li + */ +@Slf4j +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class AddressUtils { + + // 未知地址 + public static final String UNKNOWN = "XX XX"; + + public static String getRealAddressByIP(String ip) { + if (StringUtils.isBlank(ip)) { + return UNKNOWN; + } + // 内网不查询 + ip = StringUtils.contains(ip, "0:0:0:0:0:0:0:1") ? "127.0.0.1" : HtmlUtil.cleanHtmlTag(ip); + if (NetUtil.isInnerIP(ip)) { + return "内网IP"; + } + return RegionUtils.getCityInfo(ip); + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java new file mode 100644 index 0000000..eadfcf7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java @@ -0,0 +1,67 @@ +package org.dromara.common.core.utils.ip; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.resource.ClassPathResource; +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.file.FileUtils; +import org.lionsoul.ip2region.xdb.Searcher; + +import java.io.File; + +/** + * 根据ip地址定位工具类,离线方式 + * 参考地址:集成 ip2region 实现离线IP地址定位库 + * + * @author lishuyan + */ +@Slf4j +public class RegionUtils { + + private static final Searcher SEARCHER; + + static { + String fileName = "/ip2region.xdb"; + File existFile = FileUtils.file(FileUtil.getTmpDir() + FileUtil.FILE_SEPARATOR + fileName); + if (!FileUtils.exist(existFile)) { + ClassPathResource fileStream = new ClassPathResource(fileName); + if (ObjectUtil.isEmpty(fileStream.getStream())) { + throw new ServiceException("RegionUtils初始化失败,原因:IP地址库数据不存在!"); + } + FileUtils.writeFromStream(fileStream.getStream(), existFile); + } + + String dbPath = existFile.getPath(); + + // 1、从 dbPath 加载整个 xdb 到内存。 + byte[] cBuff; + try { + cBuff = Searcher.loadContentFromFile(dbPath); + } catch (Exception e) { + throw new ServiceException("RegionUtils初始化失败,原因:从ip2region.xdb文件加载内容失败!" + e.getMessage()); + } + // 2、使用上述的 cBuff 创建一个完全基于内存的查询对象。 + try { + SEARCHER = Searcher.newWithBuffer(cBuff); + } catch (Exception e) { + throw new ServiceException("RegionUtils初始化失败,原因:" + e.getMessage()); + } + } + + /** + * 根据IP地址离线获取城市 + */ + public static String getCityInfo(String ip) { + try { + ip = ip.trim(); + // 3、执行查询 + String region = SEARCHER.search(ip); + return region.replace("0|", "").replace("|0", ""); + } catch (Exception e) { + log.error("IP地址离线获取城市异常 {}", ip); + return "未知"; + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java new file mode 100644 index 0000000..073983f --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java @@ -0,0 +1,56 @@ +package org.dromara.common.core.utils.reflect; + +import cn.hutool.core.util.ReflectUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; + +import java.lang.reflect.Method; + +/** + * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. + * + * @author Lion Li + */ +@SuppressWarnings("rawtypes") +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ReflectUtils extends ReflectUtil { + + private static final String SETTER_PREFIX = "set"; + + private static final String GETTER_PREFIX = "get"; + + /** + * 调用Getter方法. + * 支持多级,如:对象名.对象名.方法 + */ + @SuppressWarnings("unchecked") + public static E invokeGetter(Object obj, String propertyName) { + Object object = obj; + for (String name : StringUtils.split(propertyName, ".")) { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); + object = invoke(object, getterMethodName); + } + return (E) object; + } + + /** + * 调用Setter方法, 仅匹配方法名。 + * 支持多级,如:对象名.对象名.方法 + */ + public static void invokeSetter(Object obj, String propertyName, E value) { + Object object = obj; + String[] names = StringUtils.split(propertyName, "."); + for (int i = 0; i < names.length; i++) { + if (i < names.length - 1) { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); + object = invoke(object, getterMethodName); + } else { + String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); + Method method = getMethodByName(object.getClass(), setterMethodName); + invoke(object, method, value); + } + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java new file mode 100644 index 0000000..6dde129 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java @@ -0,0 +1,31 @@ +package org.dromara.common.core.utils.regex; + + +import cn.hutool.core.util.ReUtil; +import org.dromara.common.core.constant.RegexConstants; + +/** + * 正则相关工具类 + * + * @author Feng + */ +public final class RegexUtils extends ReUtil { + + /** + * 从输入字符串中提取匹配的部分,如果没有匹配则返回默认值 + * + * @param input 要提取的输入字符串 + * @param regex 用于匹配的正则表达式,可以使用 {@link RegexConstants} 中定义的常量 + * @param defaultInput 如果没有匹配时返回的默认值 + * @return 如果找到匹配的部分,则返回匹配的部分,否则返回默认值 + */ + public static String extractFromString(String input, String regex, String defaultInput) { + try { + String str = ReUtil.get(regex, input, 1); + return str == null ? defaultInput : str; + } catch (Exception e) { + return defaultInput; + } + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java new file mode 100644 index 0000000..c0dda20 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java @@ -0,0 +1,105 @@ +package org.dromara.common.core.utils.regex; + +import cn.hutool.core.exceptions.ValidateException; +import cn.hutool.core.lang.Validator; +import org.dromara.common.core.factory.RegexPatternPoolFactory; + +import java.util.regex.Pattern; + +/** + * 正则字段校验器 + * 主要验证字段非空、是否为满足指定格式等 + * + * @author Feng + */ +public class RegexValidator extends Validator { + + /** + * 字典类型必须以字母开头,且只能为(小写字母,数字,下滑线) + */ + public static final Pattern DICTIONARY_TYPE = RegexPatternPoolFactory.DICTIONARY_TYPE; + + /** + * 身份证号码(后6位) + */ + public static final Pattern ID_CARD_LAST_6 = RegexPatternPoolFactory.ID_CARD_LAST_6; + + /** + * QQ号码 + */ + public static final Pattern QQ_NUMBER = RegexPatternPoolFactory.QQ_NUMBER; + + /** + * 邮政编码 + */ + public static final Pattern POSTAL_CODE = RegexPatternPoolFactory.POSTAL_CODE; + + /** + * 注册账号 + */ + public static final Pattern ACCOUNT = RegexPatternPoolFactory.ACCOUNT; + + /** + * 密码:包含至少8个字符,包括大写字母、小写字母、数字和特殊字符 + */ + public static final Pattern PASSWORD = RegexPatternPoolFactory.PASSWORD; + + /** + * 通用状态(0表示正常,1表示停用) + */ + public static final Pattern STATUS = RegexPatternPoolFactory.STATUS; + + + /** + * 检查输入的账号是否匹配预定义的规则 + * + * @param value 要验证的账号 + * @return 如果账号符合规则,返回 true;否则,返回 false。 + */ + public static boolean isAccount(CharSequence value) { + return isMatchRegex(ACCOUNT, value); + } + + /** + * 验证输入的账号是否符合规则,如果不符合,则抛出 ValidateException 异常 + * + * @param value 要验证的账号 + * @param errorMsg 验证失败时抛出的异常消息 + * @param CharSequence 的子类型 + * @return 如果验证通过,返回输入的账号 + * @throws ValidateException 如果验证失败 + */ + public static T validateAccount(T value, String errorMsg) throws ValidateException { + if (!isAccount(value)) { + throw new ValidateException(errorMsg); + } + return value; + } + + /** + * 检查输入的状态是否匹配预定义的规则 + * + * @param value 要验证的状态 + * @return 如果状态符合规则,返回 true;否则,返回 false。 + */ + public static boolean isStatus(CharSequence value) { + return isMatchRegex(STATUS, value); + } + + /** + * 验证输入的状态是否符合规则,如果不符合,则抛出 ValidateException 异常 + * + * @param value 要验证的状态 + * @param errorMsg 验证失败时抛出的异常消息 + * @param CharSequence 的子类型 + * @return 如果验证通过,返回输入的状态 + * @throws ValidateException 如果验证失败 + */ + public static T validateStatus(T value, String errorMsg) throws ValidateException { + if (!isStatus(value)) { + throw new ValidateException(errorMsg); + } + return value; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java new file mode 100644 index 0000000..1020c81 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java @@ -0,0 +1,56 @@ +package org.dromara.common.core.utils.sql; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; + +/** + * sql操作工具类 + * + * @author ruoyi + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class SqlUtil { + + /** + * 定义常用的 sql关键字 + */ + public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()"; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点(支持多个字段排序) + */ + public static final String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 检查字符,防止注入绕过 + */ + public static String escapeOrderBySql(String value) { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) { + throw new IllegalArgumentException("参数不符合规范,不能进行查询"); + } + return value; + } + + /** + * 验证 order by 语法是否符合规范 + */ + public static boolean isValidOrderBySql(String value) { + return value.matches(SQL_PATTERN); + } + + /** + * SQL关键字检查 + */ + public static void filterKeyword(String value) { + if (StringUtils.isEmpty(value)) { + return; + } + String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); + for (String sqlKeyword : sqlKeywords) { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) { + throw new IllegalArgumentException("参数存在SQL注入风险"); + } + } + } +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java new file mode 100644 index 0000000..0275899 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java @@ -0,0 +1,9 @@ +package org.dromara.common.core.validate; + +/** + * 校验分组 add + * + * @author Lion Li + */ +public interface AddGroup { +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java new file mode 100644 index 0000000..77c5040 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java @@ -0,0 +1,9 @@ +package org.dromara.common.core.validate; + +/** + * 校验分组 edit + * + * @author Lion Li + */ +public interface EditGroup { +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java new file mode 100644 index 0000000..02a0ac2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java @@ -0,0 +1,9 @@ +package org.dromara.common.core.validate; + +/** + * 校验分组 query + * + * @author Lion Li + */ +public interface QueryGroup { +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java new file mode 100644 index 0000000..b1ae504 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java @@ -0,0 +1,51 @@ +package org.dromara.common.core.validate.enumd; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.Documented; +import java.lang.annotation.Repeatable; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * 自定义枚举校验 + * + * @author 秋辞未寒 + * @date 2024-12-09 + */ +@Documented +@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) +@Retention(RUNTIME) +@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解 +@Constraint(validatedBy = {EnumPatternValidator.class}) +public @interface EnumPattern { + + /** + * 需要校验的枚举类型 + */ + Class> type(); + + /** + * 枚举类型校验值字段名称 + * 需确保该字段实现了 getter 方法 + */ + String fieldName(); + + String message() default "输入值不在枚举范围内"; + + Class[] groups() default {}; + + Class[] payload() default {}; + + @Documented + @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) + @Retention(RUNTIME) + @interface List { + EnumPattern[] value(); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java new file mode 100644 index 0000000..923c423 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java @@ -0,0 +1,37 @@ +package org.dromara.common.core.validate.enumd; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.reflect.ReflectUtils; + +/** + * 自定义枚举校验注解实现 + * + * @author 秋辞未寒 + * @date 2024-12-09 + */ +public class EnumPatternValidator implements ConstraintValidator { + + private EnumPattern annotation;; + + @Override + public void initialize(EnumPattern annotation) { + ConstraintValidator.super.initialize(annotation); + this.annotation = annotation; + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { + if (StringUtils.isNotBlank(value)) { + String fieldName = annotation.fieldName(); + for (Object e : annotation.type().getEnumConstants()) { + if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) { + return true; + } + } + } + return false; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java new file mode 100644 index 0000000..eed495f --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java @@ -0,0 +1,26 @@ +package org.dromara.common.core.xss; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义xss校验注解 + * + * @author Lion Li + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER}) +@Constraint(validatedBy = {XssValidator.class}) +public @interface Xss { + + String message() default "不允许任何脚本运行"; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java new file mode 100644 index 0000000..9c32563 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java @@ -0,0 +1,21 @@ +package org.dromara.common.core.xss; + +import cn.hutool.core.util.ReUtil; +import cn.hutool.http.HtmlUtil; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +/** + * 自定义xss校验注解实现 + * + * @author Lion Li + */ +public class XssValidator implements ConstraintValidator { + + @Override + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { + return !ReUtil.contains(HtmlUtil.RE_HTML_MARK, value); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..43c7fcf --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +org.dromara.common.core.config.ApplicationConfig +org.dromara.common.core.config.AsyncConfig +org.dromara.common.core.config.ThreadPoolConfig +org.dromara.common.core.config.ValidatorConfig +org.dromara.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml new file mode 100644 index 0000000..c6199a1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/pom.xml @@ -0,0 +1,41 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-doc + + + ruoyi-common-doc 系统接口 + + + + + org.dromara + ruoyi-common-core + + + + org.springdoc + springdoc-openapi-starter-webmvc-api + + + + com.github.therapi + therapi-runtime-javadoc + + + + com.fasterxml.jackson.module + jackson-module-kotlin + + + + + diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java new file mode 100644 index 0000000..069ef9a --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java @@ -0,0 +1,126 @@ +package org.dromara.common.doc.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Paths; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.doc.config.properties.SpringDocProperties; +import org.dromara.common.doc.handler.OpenApiHandler; +import org.springdoc.core.configuration.SpringDocConfiguration; +import org.springdoc.core.customizers.OpenApiBuilderCustomizer; +import org.springdoc.core.customizers.OpenApiCustomizer; +import org.springdoc.core.customizers.ServerBaseUrlCustomizer; +import org.springdoc.core.properties.SpringDocConfigProperties; +import org.springdoc.core.providers.JavadocProvider; +import org.springdoc.core.service.OpenAPIService; +import org.springdoc.core.service.SecurityService; +import org.springdoc.core.utils.PropertyResolverUtils; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.web.ServerProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +/** + * Swagger 文档配置 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@AutoConfiguration(before = SpringDocConfiguration.class) +@EnableConfigurationProperties(SpringDocProperties.class) +@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true) +public class SpringDocConfig { + + private final ServerProperties serverProperties; + + @Bean + @ConditionalOnMissingBean(OpenAPI.class) + public OpenAPI openApi(SpringDocProperties properties) { + OpenAPI openApi = new OpenAPI(); + // 文档基本信息 + SpringDocProperties.InfoProperties infoProperties = properties.getInfo(); + Info info = convertInfo(infoProperties); + openApi.info(info); + // 扩展文档信息 + openApi.externalDocs(properties.getExternalDocs()); + openApi.tags(properties.getTags()); + openApi.paths(properties.getPaths()); + openApi.components(properties.getComponents()); + Set keySet = properties.getComponents().getSecuritySchemes().keySet(); + List list = new ArrayList<>(); + SecurityRequirement securityRequirement = new SecurityRequirement(); + keySet.forEach(securityRequirement::addList); + list.add(securityRequirement); + openApi.security(list); + + return openApi; + } + + private Info convertInfo(SpringDocProperties.InfoProperties infoProperties) { + Info info = new Info(); + info.setTitle(infoProperties.getTitle()); + info.setDescription(infoProperties.getDescription()); + info.setContact(infoProperties.getContact()); + info.setLicense(infoProperties.getLicense()); + info.setVersion(infoProperties.getVersion()); + return info; + } + + /** + * 自定义 openapi 处理器 + */ + @Bean + public OpenAPIService openApiBuilder(Optional openAPI, + SecurityService securityParser, + SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils, + Optional> openApiBuilderCustomisers, + Optional> serverBaseUrlCustomisers, Optional javadocProvider) { + return new OpenApiHandler(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomisers, serverBaseUrlCustomisers, javadocProvider); + } + + /** + * 对已经生成好的 OpenApi 进行自定义操作 + */ + @Bean + public OpenApiCustomizer openApiCustomizer() { + String contextPath = serverProperties.getServlet().getContextPath(); + String finalContextPath; + if (StringUtils.isBlank(contextPath) || "/".equals(contextPath)) { + finalContextPath = ""; + } else { + finalContextPath = contextPath; + } + // 对所有路径增加前置上下文路径 + return openApi -> { + Paths oldPaths = openApi.getPaths(); + if (oldPaths instanceof PlusPaths) { + return; + } + PlusPaths newPaths = new PlusPaths(); + oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v)); + openApi.setPaths(newPaths); + }; + } + + /** + * 单独使用一个类便于判断 解决springdoc路径拼接重复问题 + * + * @author Lion Li + */ + static class PlusPaths extends Paths { + + public PlusPaths() { + super(); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java new file mode 100644 index 0000000..eae3b4c --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java @@ -0,0 +1,94 @@ +package org.dromara.common.doc.config.properties; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.ExternalDocumentation; +import io.swagger.v3.oas.models.Paths; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.tags.Tag; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.NestedConfigurationProperty; + +import java.util.List; + +/** + * swagger 配置属性 + * + * @author Lion Li + */ +@Data +@ConfigurationProperties(prefix = "springdoc") +public class SpringDocProperties { + + /** + * 文档基本信息 + */ + @NestedConfigurationProperty + private InfoProperties info = new InfoProperties(); + + /** + * 扩展文档地址 + */ + @NestedConfigurationProperty + private ExternalDocumentation externalDocs; + + /** + * 标签 + */ + private List tags = null; + + /** + * 路径 + */ + @NestedConfigurationProperty + private Paths paths = null; + + /** + * 组件 + */ + @NestedConfigurationProperty + private Components components = null; + + /** + *

+ * 文档的基础属性信息 + *

+ * + * @see io.swagger.v3.oas.models.info.Info + * + * 为了 springboot 自动生产配置提示信息,所以这里复制一个类出来 + */ + @Data + public static class InfoProperties { + + /** + * 标题 + */ + private String title = null; + + /** + * 描述 + */ + private String description = null; + + /** + * 联系人信息 + */ + @NestedConfigurationProperty + private Contact contact = null; + + /** + * 许可证 + */ + @NestedConfigurationProperty + private License license = null; + + /** + * 版本 + */ + private String version = null; + + } + +} diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java new file mode 100644 index 0000000..56b7369 --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java @@ -0,0 +1,253 @@ +package org.dromara.common.doc.handler; + +import cn.hutool.core.io.IoUtil; +import io.swagger.v3.core.jackson.TypeNameResolver; +import io.swagger.v3.core.util.AnnotationsUtils; +import io.swagger.v3.oas.annotations.tags.Tags; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.Operation; +import io.swagger.v3.oas.models.Paths; +import io.swagger.v3.oas.models.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.springdoc.core.customizers.OpenApiBuilderCustomizer; +import org.springdoc.core.customizers.ServerBaseUrlCustomizer; +import org.springdoc.core.properties.SpringDocConfigProperties; +import org.springdoc.core.providers.JavadocProvider; +import org.springdoc.core.service.OpenAPIService; +import org.springdoc.core.service.SecurityService; +import org.springdoc.core.utils.PropertyResolverUtils; +import org.springframework.context.ApplicationContext; +import org.springframework.core.annotation.AnnotatedElementUtils; +import org.springframework.util.CollectionUtils; +import org.springframework.web.method.HandlerMethod; + +import java.io.StringReader; +import java.lang.reflect.Method; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 自定义 openapi 处理器 + * 对源码功能进行修改 增强使用 + */ +@Slf4j +@SuppressWarnings("all") +public class OpenApiHandler extends OpenAPIService { + + /** + * The Basic error controller. + */ + private static Class basicErrorController; + + /** + * The Security parser. + */ + private final SecurityService securityParser; + + /** + * The Mappings map. + */ + private final Map mappingsMap = new HashMap<>(); + + /** + * The Springdoc tags. + */ + private final Map springdocTags = new HashMap<>(); + + /** + * The Open api builder customisers. + */ + private final Optional> openApiBuilderCustomisers; + + /** + * The server base URL customisers. + */ + private final Optional> serverBaseUrlCustomizers; + + /** + * The Spring doc config properties. + */ + private final SpringDocConfigProperties springDocConfigProperties; + + /** + * The Cached open api map. + */ + private final Map cachedOpenAPI = new HashMap<>(); + + /** + * The Property resolver utils. + */ + private final PropertyResolverUtils propertyResolverUtils; + + /** + * The javadoc provider. + */ + private final Optional javadocProvider; + + /** + * The Context. + */ + private ApplicationContext context; + + /** + * The Open api. + */ + private OpenAPI openAPI; + + /** + * The Is servers present. + */ + private boolean isServersPresent; + + /** + * The Server base url. + */ + private String serverBaseUrl; + + /** + * Instantiates a new Open api builder. + * + * @param openAPI the open api + * @param securityParser the security parser + * @param springDocConfigProperties the spring doc config properties + * @param propertyResolverUtils the property resolver utils + * @param openApiBuilderCustomizers the open api builder customisers + * @param serverBaseUrlCustomizers the server base url customizers + * @param javadocProvider the javadoc provider + */ + public OpenApiHandler(Optional openAPI, SecurityService securityParser, + SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils, + Optional> openApiBuilderCustomizers, + Optional> serverBaseUrlCustomizers, + Optional javadocProvider) { + super(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomizers, serverBaseUrlCustomizers, javadocProvider); + if (openAPI.isPresent()) { + this.openAPI = openAPI.get(); + if (this.openAPI.getComponents() == null) + this.openAPI.setComponents(new Components()); + if (this.openAPI.getPaths() == null) + this.openAPI.setPaths(new Paths()); + if (!CollectionUtils.isEmpty(this.openAPI.getServers())) + this.isServersPresent = true; + } + this.propertyResolverUtils = propertyResolverUtils; + this.securityParser = securityParser; + this.springDocConfigProperties = springDocConfigProperties; + this.openApiBuilderCustomisers = openApiBuilderCustomizers; + this.serverBaseUrlCustomizers = serverBaseUrlCustomizers; + this.javadocProvider = javadocProvider; + if (springDocConfigProperties.isUseFqn()) + TypeNameResolver.std.setUseFqn(true); + } + + @Override + public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI, Locale locale) { + + Set tags = new HashSet<>(); + Set tagsStr = new HashSet<>(); + + buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr, locale); + buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr, locale); + + if (!CollectionUtils.isEmpty(tagsStr)) + tagsStr = tagsStr.stream() + .map(str -> propertyResolverUtils.resolve(str, locale)) + .collect(Collectors.toSet()); + + if (springdocTags.containsKey(handlerMethod)) { + io.swagger.v3.oas.models.tags.Tag tag = springdocTags.get(handlerMethod); + tagsStr.add(tag.getName()); + if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) { + openAPI.addTagsItem(tag); + } + } + + if (!CollectionUtils.isEmpty(tagsStr)) { + if (CollectionUtils.isEmpty(operation.getTags())) + operation.setTags(new ArrayList<>(tagsStr)); + else { + Set operationTagsSet = new HashSet<>(operation.getTags()); + operationTagsSet.addAll(tagsStr); + operation.getTags().clear(); + operation.getTags().addAll(operationTagsSet); + } + } + + if (isAutoTagClasses(operation)) { + + + if (javadocProvider.isPresent()) { + String description = javadocProvider.get().getClassJavadoc(handlerMethod.getBeanType()); + if (StringUtils.isNotBlank(description)) { + io.swagger.v3.oas.models.tags.Tag tag = new io.swagger.v3.oas.models.tags.Tag(); + + // 自定义部分 修改使用java注释当tag名 + List list = IoUtil.readLines(new StringReader(description), new ArrayList<>()); + // tag.setName(tagAutoName); + tag.setName(list.get(0)); + operation.addTagsItem(list.get(0)); + + tag.setDescription(description); + if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) { + openAPI.addTagsItem(tag); + } + } + } else { + String tagAutoName = splitCamelCase(handlerMethod.getBeanType().getSimpleName()); + operation.addTagsItem(tagAutoName); + } + } + + if (!CollectionUtils.isEmpty(tags)) { + // Existing tags + List openApiTags = openAPI.getTags(); + if (!CollectionUtils.isEmpty(openApiTags)) + tags.addAll(openApiTags); + openAPI.setTags(new ArrayList<>(tags)); + } + + // Handle SecurityRequirement at operation level + io.swagger.v3.oas.annotations.security.SecurityRequirement[] securityRequirements = securityParser + .getSecurityRequirements(handlerMethod); + if (securityRequirements != null) { + if (securityRequirements.length == 0) + operation.setSecurity(Collections.emptyList()); + else + securityParser.buildSecurityRequirement(securityRequirements, operation); + } + + return operation; + } + + private void buildTagsFromMethod(Method method, Set tags, Set tagsStr, Locale locale) { + // method tags + Set tagsSet = AnnotatedElementUtils + .findAllMergedAnnotations(method, Tags.class); + Set methodTags = tagsSet.stream() + .flatMap(x -> Stream.of(x.value())).collect(Collectors.toSet()); + methodTags.addAll(AnnotatedElementUtils.findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.tags.Tag.class)); + if (!CollectionUtils.isEmpty(methodTags)) { + tagsStr.addAll(StreamUtils.toSet(methodTags, tag -> propertyResolverUtils.resolve(tag.name(), locale))); + List allTags = new ArrayList<>(methodTags); + addTags(allTags, tags, locale); + } + } + + private void addTags(List sourceTags, Set tags, Locale locale) { + Optional> optionalTagSet = AnnotationsUtils + .getTags(sourceTags.toArray(new io.swagger.v3.oas.annotations.tags.Tag[0]), true); + optionalTagSet.ifPresent(tagsSet -> { + tagsSet.forEach(tag -> { + tag.name(propertyResolverUtils.resolve(tag.getName(), locale)); + tag.description(propertyResolverUtils.resolve(tag.getDescription(), locale)); + if (tags.stream().noneMatch(t -> t.getName().equals(tag.getName()))) + tags.add(tag); + }); + }); + } + +} diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..fe11e76 --- /dev/null +++ b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.doc.config.SpringDocConfig diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml new file mode 100644 index 0000000..ed4910e --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml @@ -0,0 +1,54 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-encrypt + + + ruoyi-common-encrypt 数据加解密模块 + + + + + + org.dromara + ruoyi-common-core + + + + org.bouncycastle + bcprov-jdk15to18 + + + + cn.hutool + hutool-crypto + + + + org.springframework + spring-webmvc + + + + com.baomidou + mybatis-plus-spring-boot3-starter + true + + + org.mybatis + mybatis-spring + + + + + + + diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java new file mode 100644 index 0000000..7f52de8 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java @@ -0,0 +1,20 @@ +package org.dromara.common.encrypt.annotation; + +import java.lang.annotation.*; + +/** + * 强制加密注解 + * + * @author Michelle.Chung + */ +@Documented +@Target({ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ApiEncrypt { + + /** + * 响应加密忽略,默认不加密,为 true 时加密 + */ + boolean response() default false; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java new file mode 100644 index 0000000..d357d72 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java @@ -0,0 +1,44 @@ +package org.dromara.common.encrypt.annotation; + +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; + +import java.lang.annotation.*; + +/** + * 字段加密注解 + * + * @author 老马 + */ +@Documented +@Inherited +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface EncryptField { + + /** + * 加密算法 + */ + AlgorithmType algorithm() default AlgorithmType.DEFAULT; + + /** + * 秘钥。AES、SM4需要 + */ + String password() default ""; + + /** + * 公钥。RSA、SM2需要 + */ + String publicKey() default ""; + + /** + * 私钥。RSA、SM2需要 + */ + String privateKey() default ""; + + /** + * 编码方式。对加密算法为BASE64的不起作用 + */ + EncodeType encode() default EncodeType.DEFAULT; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java new file mode 100644 index 0000000..098f6bc --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java @@ -0,0 +1,32 @@ +package org.dromara.common.encrypt.config; + +import jakarta.servlet.DispatcherType; +import org.dromara.common.encrypt.filter.CryptoFilter; +import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; + +/** + * api 解密自动配置 + * + * @author wdhcr + */ +@AutoConfiguration +@EnableConfigurationProperties(ApiDecryptProperties.class) +@ConditionalOnProperty(value = "api-decrypt.enabled", havingValue = "true") +public class ApiDecryptAutoConfiguration { + + @Bean + public FilterRegistrationBean cryptoFilterRegistration(ApiDecryptProperties properties) { + FilterRegistrationBean registration = new FilterRegistrationBean<>(); + registration.setDispatcherTypes(DispatcherType.REQUEST); + registration.setFilter(new CryptoFilter(properties)); + registration.addUrlPatterns("/*"); + registration.setName("cryptoFilter"); + registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE); + return registration; + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java new file mode 100644 index 0000000..fbc4e52 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java @@ -0,0 +1,49 @@ +package org.dromara.common.encrypt.config; + +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.encrypt.core.EncryptorManager; +import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor; +import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor; +import org.dromara.common.encrypt.properties.EncryptorProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +/** + * 加解密配置 + * + * @author 老马 + * @version 4.6.0 + */ +@AutoConfiguration(after = MybatisPlusAutoConfiguration.class) +@EnableConfigurationProperties(EncryptorProperties.class) +@ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true") +@Slf4j +public class EncryptorAutoConfiguration { + + @Autowired + private EncryptorProperties properties; + + @Bean + public EncryptorManager encryptorManager(MybatisPlusProperties mybatisPlusProperties) { + return new EncryptorManager(mybatisPlusProperties.getTypeAliasesPackage()); + } + + @Bean + public MybatisEncryptInterceptor mybatisEncryptInterceptor(EncryptorManager encryptorManager) { + return new MybatisEncryptInterceptor(encryptorManager, properties); + } + + @Bean + public MybatisDecryptInterceptor mybatisDecryptInterceptor(EncryptorManager encryptorManager) { + return new MybatisDecryptInterceptor(encryptorManager, properties); + } + +} + + + diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java new file mode 100644 index 0000000..35b6b6c --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java @@ -0,0 +1,41 @@ +package org.dromara.common.encrypt.core; + +import lombok.Data; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; + +/** + * 加密上下文 用于encryptor传递必要的参数。 + * + * @author 老马 + * @version 4.6.0 + */ +@Data +public class EncryptContext { + + /** + * 默认算法 + */ + private AlgorithmType algorithm; + + /** + * 安全秘钥 + */ + private String password; + + /** + * 公钥 + */ + private String publicKey; + + /** + * 私钥 + */ + private String privateKey; + + /** + * 编码方式,base64/hex + */ + private EncodeType encode; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java new file mode 100644 index 0000000..b5f194d --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java @@ -0,0 +1,159 @@ +package org.dromara.common.encrypt.core; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ReflectUtil; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.io.Resources; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.EncryptField; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.core.type.ClassMetadata; +import org.springframework.core.type.classreading.CachingMetadataReaderFactory; +import org.springframework.util.ClassUtils; + +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +/** + * 加密管理类 + * + * @author 老马 + * @version 4.6.0 + */ +@Slf4j +@NoArgsConstructor +public class EncryptorManager { + + /** + * 缓存加密器 + */ + Map encryptorMap = new ConcurrentHashMap<>(); + + /** + * 类加密字段缓存 + */ + Map, Set> fieldCache = new ConcurrentHashMap<>(); + + /** + * 构造方法传入类加密字段缓存 + * + * @param typeAliasesPackage 实体类包 + */ + public EncryptorManager(String typeAliasesPackage) { + scanEncryptClasses(typeAliasesPackage); + } + + + /** + * 获取类加密字段缓存 + */ + public Set getFieldCache(Class sourceClazz) { + return ObjectUtils.notNullGetter(fieldCache, f -> f.get(sourceClazz)); + } + + /** + * 注册加密执行者到缓存 + * + * @param encryptContext 加密执行者需要的相关配置参数 + */ + public IEncryptor registAndGetEncryptor(EncryptContext encryptContext) { + int key = encryptContext.hashCode(); + if (encryptorMap.containsKey(key)) { + return encryptorMap.get(key); + } + IEncryptor encryptor = ReflectUtil.newInstance(encryptContext.getAlgorithm().getClazz(), encryptContext); + encryptorMap.put(key, encryptor); + return encryptor; + } + + /** + * 移除缓存中的加密执行者 + * + * @param encryptContext 加密执行者需要的相关配置参数 + */ + public void removeEncryptor(EncryptContext encryptContext) { + this.encryptorMap.remove(encryptContext.hashCode()); + } + + /** + * 根据配置进行加密。会进行本地缓存对应的算法和对应的秘钥信息。 + * + * @param value 待加密的值 + * @param encryptContext 加密相关的配置信息 + */ + public String encrypt(String value, EncryptContext encryptContext) { + IEncryptor encryptor = this.registAndGetEncryptor(encryptContext); + return encryptor.encrypt(value, encryptContext.getEncode()); + } + + /** + * 根据配置进行解密 + * + * @param value 待解密的值 + * @param encryptContext 加密相关的配置信息 + */ + public String decrypt(String value, EncryptContext encryptContext) { + IEncryptor encryptor = this.registAndGetEncryptor(encryptContext); + return encryptor.decrypt(value); + } + + /** + * 通过 typeAliasesPackage 设置的扫描包 扫描缓存实体 + */ + private void scanEncryptClasses(String typeAliasesPackage) { + PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory(); + String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); + String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX; + try { + for (String packagePattern : packagePatternArray) { + String path = ClassUtils.convertClassNameToResourcePath(packagePattern); + Resource[] resources = resolver.getResources(classpath + path + "/*.class"); + for (Resource resource : resources) { + ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata(); + Class clazz = Resources.classForName(classMetadata.getClassName()); + Set encryptFieldSet = getEncryptFieldSetFromClazz(clazz); + if (CollUtil.isNotEmpty(encryptFieldSet)) { + fieldCache.put(clazz, encryptFieldSet); + } + } + } + } catch (Exception e) { + log.error("初始化数据安全缓存时出错:{}", e.getMessage()); + } + } + + /** + * 获得一个类的加密字段集合 + */ + private Set getEncryptFieldSetFromClazz(Class clazz) { + Set fieldSet = new HashSet<>(); + // 判断clazz如果是接口,内部类,匿名类就直接返回 + if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) { + return fieldSet; + } + while (clazz != null) { + Field[] fields = clazz.getDeclaredFields(); + fieldSet.addAll(Arrays.asList(fields)); + clazz = clazz.getSuperclass(); + } + fieldSet = fieldSet.stream().filter(field -> + field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class) + .collect(Collectors.toSet()); + for (Field field : fieldSet) { + field.setAccessible(true); + } + return fieldSet; + } + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java new file mode 100644 index 0000000..dbc4420 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java @@ -0,0 +1,35 @@ +package org.dromara.common.encrypt.core; + +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; + +/** + * 加解者 + * + * @author 老马 + * @version 4.6.0 + */ +public interface IEncryptor { + + /** + * 获得当前算法 + */ + AlgorithmType algorithm(); + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + * @return 加密后的字符串 + */ + String encrypt(String value, EncodeType encodeType); + + /** + * 解密 + * + * @param value 待加密字符串 + * @return 解密后的字符串 + */ + String decrypt(String value); +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java new file mode 100644 index 0000000..858d229 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java @@ -0,0 +1,18 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.core.IEncryptor; + +/** + * 所有加密执行者的基类 + * + * @author 老马 + * @version 4.6.0 + */ +public abstract class AbstractEncryptor implements IEncryptor { + + public AbstractEncryptor(EncryptContext context) { + // 用户配置校验与配置注入 + } + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java new file mode 100644 index 0000000..e4dc597 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java @@ -0,0 +1,55 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.utils.EncryptUtils; + +/** + * AES算法实现 + * + * @author 老马 + * @version 4.6.0 + */ +public class AesEncryptor extends AbstractEncryptor { + + private final EncryptContext context; + + public AesEncryptor(EncryptContext context) { + super(context); + this.context = context; + } + + /** + * 获得当前算法 + */ + @Override + public AlgorithmType algorithm() { + return AlgorithmType.AES; + } + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + */ + @Override + public String encrypt(String value, EncodeType encodeType) { + if (encodeType == EncodeType.HEX) { + return EncryptUtils.encryptByAesHex(value, context.getPassword()); + } else { + return EncryptUtils.encryptByAes(value, context.getPassword()); + } + } + + /** + * 解密 + * + * @param value 待加密字符串 + */ + @Override + public String decrypt(String value) { + return EncryptUtils.decryptByAes(value, context.getPassword()); + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java new file mode 100644 index 0000000..0028548 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java @@ -0,0 +1,48 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.utils.EncryptUtils; + +/** + * Base64算法实现 + * + * @author 老马 + * @version 4.6.0 + */ +public class Base64Encryptor extends AbstractEncryptor { + + public Base64Encryptor(EncryptContext context) { + super(context); + } + + /** + * 获得当前算法 + */ + @Override + public AlgorithmType algorithm() { + return AlgorithmType.BASE64; + } + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + */ + @Override + public String encrypt(String value, EncodeType encodeType) { + return EncryptUtils.encryptByBase64(value); + } + + /** + * 解密 + * + * @param value 待加密字符串 + */ + @Override + public String decrypt(String value) { + return EncryptUtils.decryptByBase64(value); + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java new file mode 100644 index 0000000..5f03a4b --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java @@ -0,0 +1,62 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.utils.EncryptUtils; + + +/** + * RSA算法实现 + * + * @author 老马 + * @version 4.6.0 + */ +public class RsaEncryptor extends AbstractEncryptor { + + private final EncryptContext context; + + public RsaEncryptor(EncryptContext context) { + super(context); + String privateKey = context.getPrivateKey(); + String publicKey = context.getPublicKey(); + if (StringUtils.isAnyEmpty(privateKey, publicKey)) { + throw new IllegalArgumentException("RSA公私钥均需要提供,公钥加密,私钥解密。"); + } + this.context = context; + } + + /** + * 获得当前算法 + */ + @Override + public AlgorithmType algorithm() { + return AlgorithmType.RSA; + } + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + */ + @Override + public String encrypt(String value, EncodeType encodeType) { + if (encodeType == EncodeType.HEX) { + return EncryptUtils.encryptByRsaHex(value, context.getPublicKey()); + } else { + return EncryptUtils.encryptByRsa(value, context.getPublicKey()); + } + } + + /** + * 解密 + * + * @param value 待加密字符串 + */ + @Override + public String decrypt(String value) { + return EncryptUtils.decryptByRsa(value, context.getPrivateKey()); + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java new file mode 100644 index 0000000..aec5d82 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java @@ -0,0 +1,61 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.utils.EncryptUtils; + +/** + * sm2算法实现 + * + * @author 老马 + * @version 4.6.0 + */ +public class Sm2Encryptor extends AbstractEncryptor { + + private final EncryptContext context; + + public Sm2Encryptor(EncryptContext context) { + super(context); + String privateKey = context.getPrivateKey(); + String publicKey = context.getPublicKey(); + if (StringUtils.isAnyEmpty(privateKey, publicKey)) { + throw new IllegalArgumentException("SM2公私钥均需要提供,公钥加密,私钥解密。"); + } + this.context = context; + } + + /** + * 获得当前算法 + */ + @Override + public AlgorithmType algorithm() { + return AlgorithmType.SM2; + } + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + */ + @Override + public String encrypt(String value, EncodeType encodeType) { + if (encodeType == EncodeType.HEX) { + return EncryptUtils.encryptBySm2Hex(value, context.getPublicKey()); + } else { + return EncryptUtils.encryptBySm2(value, context.getPublicKey()); + } + } + + /** + * 解密 + * + * @param value 待加密字符串 + */ + @Override + public String decrypt(String value) { + return EncryptUtils.decryptBySm2(value, context.getPrivateKey()); + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java new file mode 100644 index 0000000..adaf674 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java @@ -0,0 +1,55 @@ +package org.dromara.common.encrypt.core.encryptor; + +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.utils.EncryptUtils; + +/** + * sm4算法实现 + * + * @author 老马 + * @version 4.6.0 + */ +public class Sm4Encryptor extends AbstractEncryptor { + + private final EncryptContext context; + + public Sm4Encryptor(EncryptContext context) { + super(context); + this.context = context; + } + + /** + * 获得当前算法 + */ + @Override + public AlgorithmType algorithm() { + return AlgorithmType.SM4; + } + + /** + * 加密 + * + * @param value 待加密字符串 + * @param encodeType 加密后的编码格式 + */ + @Override + public String encrypt(String value, EncodeType encodeType) { + if (encodeType == EncodeType.HEX) { + return EncryptUtils.encryptBySm4Hex(value, context.getPassword()); + } else { + return EncryptUtils.encryptBySm4(value, context.getPassword()); + } + } + + /** + * 解密 + * + * @param value 待加密字符串 + */ + @Override + public String decrypt(String value) { + return EncryptUtils.decryptBySm4(value, context.getPassword()); + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java new file mode 100644 index 0000000..26ee1ee --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java @@ -0,0 +1,48 @@ +package org.dromara.common.encrypt.enumd; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.encrypt.core.encryptor.*; + +/** + * 算法名称 + * + * @author 老马 + * @version 4.6.0 + */ +@Getter +@AllArgsConstructor +public enum AlgorithmType { + + /** + * 默认走yml配置 + */ + DEFAULT(null), + + /** + * base64 + */ + BASE64(Base64Encryptor.class), + + /** + * aes + */ + AES(AesEncryptor.class), + + /** + * rsa + */ + RSA(RsaEncryptor.class), + + /** + * sm2 + */ + SM2(Sm2Encryptor.class), + + /** + * sm4 + */ + SM4(Sm4Encryptor.class); + + private final Class clazz; +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java new file mode 100644 index 0000000..f471221 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java @@ -0,0 +1,26 @@ +package org.dromara.common.encrypt.enumd; + +/** + * 编码类型 + * + * @author 老马 + * @version 4.6.0 + */ +public enum EncodeType { + + /** + * 默认使用yml配置 + */ + DEFAULT, + + /** + * base64编码 + */ + BASE64, + + /** + * 16进制编码 + */ + HEX; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java new file mode 100644 index 0000000..79d58da --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java @@ -0,0 +1,110 @@ +package org.dromara.common.encrypt.filter; + +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.core.constant.HttpStatus; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.encrypt.properties.ApiDecryptProperties; +import org.springframework.http.HttpMethod; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.servlet.HandlerExecutionChain; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +import java.io.IOException; + + +/** + * Crypto 过滤器 + * + * @author wdhcr + */ +public class CryptoFilter implements Filter { + private final ApiDecryptProperties properties; + + public CryptoFilter(ApiDecryptProperties properties) { + this.properties = properties; + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + HttpServletRequest servletRequest = (HttpServletRequest) request; + HttpServletResponse servletResponse = (HttpServletResponse) response; + // 获取加密注解 + ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest); + boolean responseFlag = apiEncrypt != null && apiEncrypt.response(); + ServletRequest requestWrapper = null; + ServletResponse responseWrapper = null; + EncryptResponseBodyWrapper responseBodyWrapper = null; + + // 是否为 put 或者 post 请求 + if (HttpMethod.PUT.matches(servletRequest.getMethod()) || HttpMethod.POST.matches(servletRequest.getMethod())) { + // 是否存在加密标头 + String headerValue = servletRequest.getHeader(properties.getHeaderFlag()); + if (StringUtils.isNotBlank(headerValue)) { + // 请求解密 + requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag()); + } else { + // 是否有注解,有就报错,没有放行 + if (ObjectUtil.isNotNull(apiEncrypt)) { + HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver", HandlerExceptionResolver.class); + exceptionResolver.resolveException( + servletRequest, servletResponse, null, + new ServiceException("没有访问权限,请联系管理员授权", HttpStatus.FORBIDDEN)); + return; + } + } + } + + // 判断是否响应加密 + if (responseFlag) { + responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse); + responseWrapper = responseBodyWrapper; + } + + chain.doFilter( + ObjectUtil.defaultIfNull(requestWrapper, request), + ObjectUtil.defaultIfNull(responseWrapper, response)); + + if (responseFlag) { + servletResponse.reset(); + // 对原始内容加密 + String encryptContent = responseBodyWrapper.getEncryptContent( + servletResponse, properties.getPublicKey(), properties.getHeaderFlag()); + // 对加密后的内容写出 + servletResponse.getWriter().write(encryptContent); + } + } + + /** + * 获取 ApiEncrypt 注解 + */ + private ApiEncrypt getApiEncryptAnnotation(HttpServletRequest servletRequest) { + RequestMappingHandlerMapping handlerMapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class); + // 获取注解 + try { + HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest); + if (ObjectUtil.isNotNull(mappingHandler)) { + Object handler = mappingHandler.getHandler(); + if (ObjectUtil.isNotNull(handler)) { + // 从handler获取注解 + if (handler instanceof HandlerMethod handlerMethod) { + return handlerMethod.getMethodAnnotation(ApiEncrypt.class); + } + } + } + } catch (Exception e) { + return null; + } + return null; + } + + @Override + public void destroy() { + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java new file mode 100644 index 0000000..98f4bc7 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java @@ -0,0 +1,94 @@ +package org.dromara.common.encrypt.filter; + +import cn.hutool.core.io.IoUtil; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.encrypt.utils.EncryptUtils; +import org.springframework.http.MediaType; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; + +/** + * 解密请求参数工具类 + * + * @author wdhcr + */ +public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper { + + private final byte[] body; + + public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException { + super(request); + // 获取 AES 密码 采用 RSA 加密 + String headerRsa = request.getHeader(headerFlag); + String decryptAes = EncryptUtils.decryptByRsa(headerRsa, privateKey); + // 解密 AES 密码 + String aesPassword = EncryptUtils.decryptByBase64(decryptAes); + request.setCharacterEncoding(Constants.UTF8); + byte[] readBytes = IoUtil.readBytes(request.getInputStream(), false); + String requestBody = new String(readBytes, StandardCharsets.UTF_8); + // 解密 body 采用 AES 加密 + String decryptBody = EncryptUtils.decryptByAes(requestBody, aesPassword); + body = decryptBody.getBytes(StandardCharsets.UTF_8); + } + + @Override + public BufferedReader getReader() { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + + @Override + public int getContentLength() { + return body.length; + } + + @Override + public long getContentLengthLong() { + return body.length; + } + + @Override + public String getContentType() { + return MediaType.APPLICATION_JSON_VALUE; + } + + + @Override + public ServletInputStream getInputStream() { + final ByteArrayInputStream bais = new ByteArrayInputStream(body); + return new ServletInputStream() { + @Override + public int read() { + return bais.read(); + } + + @Override + public int available() { + return body.length; + } + + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + }; + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java new file mode 100644 index 0000000..8f068e1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java @@ -0,0 +1,121 @@ +package org.dromara.common.encrypt.filter; + +import cn.hutool.core.util.RandomUtil; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import org.dromara.common.encrypt.utils.EncryptUtils; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; + +/** + * 加密响应参数包装类 + * + * @author Michelle.Chung + */ +public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper { + + private final ByteArrayOutputStream byteArrayOutputStream; + private final ServletOutputStream servletOutputStream; + private final PrintWriter printWriter; + + public EncryptResponseBodyWrapper(HttpServletResponse response) throws IOException { + super(response); + this.byteArrayOutputStream = new ByteArrayOutputStream(); + this.servletOutputStream = this.getOutputStream(); + this.printWriter = new PrintWriter(new OutputStreamWriter(byteArrayOutputStream)); + } + + @Override + public PrintWriter getWriter() { + return printWriter; + } + + @Override + public void flushBuffer() throws IOException { + if (servletOutputStream != null) { + servletOutputStream.flush(); + } + if (printWriter != null) { + printWriter.flush(); + } + } + + @Override + public void reset() { + byteArrayOutputStream.reset(); + } + + public byte[] getResponseData() throws IOException { + flushBuffer(); + return byteArrayOutputStream.toByteArray(); + } + + public String getContent() throws IOException { + flushBuffer(); + return byteArrayOutputStream.toString(); + } + + /** + * 获取加密内容 + * + * @param servletResponse response + * @param publicKey RSA公钥 (用于加密 AES 秘钥) + * @param headerFlag 请求头标志 + * @return 加密内容 + * @throws IOException + */ + public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException { + // 生成秘钥 + String aesPassword = RandomUtil.randomString(32); + // 秘钥使用 Base64 编码 + String encryptAes = EncryptUtils.encryptByBase64(aesPassword); + // Rsa 公钥加密 Base64 编码 + String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey); + + // 设置响应头 + servletResponse.setHeader(headerFlag, encryptPassword); + servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString()); + + // 获取原始内容 + String originalBody = this.getContent(); + // 对内容进行加密 + return EncryptUtils.encryptByAes(originalBody, aesPassword); + } + + @Override + public ServletOutputStream getOutputStream() throws IOException { + return new ServletOutputStream() { + @Override + public boolean isReady() { + return false; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + + } + + @Override + public void write(int b) throws IOException { + byteArrayOutputStream.write(b); + } + + @Override + public void write(byte[] b) throws IOException { + byteArrayOutputStream.write(b); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + byteArrayOutputStream.write(b, off, len); + } + }; + } + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java new file mode 100644 index 0000000..460aa36 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java @@ -0,0 +1,120 @@ +package org.dromara.common.encrypt.interceptor; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.executor.resultset.ResultSetHandler; +import org.apache.ibatis.plugin.*; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.EncryptField; +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.core.EncryptorManager; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.properties.EncryptorProperties; + +import java.lang.reflect.Field; +import java.sql.Statement; +import java.util.*; + +/** + * 出参解密拦截器 + * + * @author 老马 + * @version 4.6.0 + */ +@Slf4j +@Intercepts({@Signature( + type = ResultSetHandler.class, + method = "handleResultSets", + args = {Statement.class}) +}) +@AllArgsConstructor +public class MybatisDecryptInterceptor implements Interceptor { + + private final EncryptorManager encryptorManager; + private final EncryptorProperties defaultProperties; + + @Override + public Object intercept(Invocation invocation) throws Throwable { + // 获取执行mysql执行结果 + Object result = invocation.proceed(); + if (result == null) { + return null; + } + decryptHandler(result); + return result; + } + + /** + * 解密对象 + * + * @param sourceObject 待加密对象 + */ + private void decryptHandler(Object sourceObject) { + if (ObjectUtil.isNull(sourceObject)) { + return; + } + if (sourceObject instanceof Map map) { + new HashSet<>(map.values()).forEach(this::decryptHandler); + return; + } + if (sourceObject instanceof List list) { + if(CollUtil.isEmpty(list)) { + return; + } + // 判断第一个元素是否含有注解。如果没有直接返回,提高效率 + Object firstItem = list.get(0); + if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { + return; + } + list.forEach(this::decryptHandler); + return; + } + // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错) + Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); + if(ObjectUtil.isNull(fields)){ + return; + } + try { + for (Field field : fields) { + field.set(sourceObject, this.decryptField(Convert.toStr(field.get(sourceObject)), field)); + } + } catch (Exception e) { + log.error("处理解密字段时出错", e); + } + } + + /** + * 字段值进行加密。通过字段的批注注册新的加密算法 + * + * @param value 待加密的值 + * @param field 待加密字段 + * @return 加密后结果 + */ + private String decryptField(String value, Field field) { + if (ObjectUtil.isNull(value)) { + return null; + } + EncryptField encryptField = field.getAnnotation(EncryptField.class); + EncryptContext encryptContext = new EncryptContext(); + encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm()); + encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode()); + encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password()); + encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey()); + encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey()); + return this.encryptorManager.decrypt(value, encryptContext); + } + + @Override + public Object plugin(Object target) { + return Plugin.wrap(target, this); + } + + @Override + public void setProperties(Properties properties) { + + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java new file mode 100644 index 0000000..bcc2f4c --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -0,0 +1,124 @@ +package org.dromara.common.encrypt.interceptor; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.executor.parameter.ParameterHandler; +import org.apache.ibatis.plugin.Interceptor; +import org.apache.ibatis.plugin.Intercepts; +import org.apache.ibatis.plugin.Invocation; +import org.apache.ibatis.plugin.Signature; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.EncryptField; +import org.dromara.common.encrypt.core.EncryptContext; +import org.dromara.common.encrypt.core.EncryptorManager; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.dromara.common.encrypt.properties.EncryptorProperties; + +import java.lang.reflect.Field; +import java.sql.PreparedStatement; +import java.util.*; + +/** + * 入参加密拦截器 + * + * @author 老马 + * @version 4.6.0 + */ +@Slf4j +@Intercepts({@Signature( + type = ParameterHandler.class, + method = "setParameters", + args = {PreparedStatement.class}) +}) +@AllArgsConstructor +public class MybatisEncryptInterceptor implements Interceptor { + + private final EncryptorManager encryptorManager; + private final EncryptorProperties defaultProperties; + + @Override + public Object intercept(Invocation invocation) throws Throwable { + return invocation; + } + + @Override + public Object plugin(Object target) { + if (target instanceof ParameterHandler parameterHandler) { + // 进行加密操作 + Object parameterObject = parameterHandler.getParameterObject(); + if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) { + this.encryptHandler(parameterObject); + } + } + return target; + } + + /** + * 加密对象 + * + * @param sourceObject 待加密对象 + */ + private void encryptHandler(Object sourceObject) { + if (ObjectUtil.isNull(sourceObject)) { + return; + } + if (sourceObject instanceof Map map) { + new HashSet<>(map.values()).forEach(this::encryptHandler); + return; + } + if (sourceObject instanceof List list) { + if(CollUtil.isEmpty(list)) { + return; + } + // 判断第一个元素是否含有注解。如果没有直接返回,提高效率 + Object firstItem = list.get(0); + if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { + return; + } + list.forEach(this::encryptHandler); + return; + } + // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错) + Set fields = encryptorManager.getFieldCache(sourceObject.getClass()); + if(ObjectUtil.isNull(fields)){ + return; + } + try { + for (Field field : fields) { + field.set(sourceObject, this.encryptField(Convert.toStr(field.get(sourceObject)), field)); + } + } catch (Exception e) { + log.error("处理加密字段时出错", e); + } + } + + /** + * 字段值进行加密。通过字段的批注注册新的加密算法 + * + * @param value 待加密的值 + * @param field 待加密字段 + * @return 加密后结果 + */ + private String encryptField(String value, Field field) { + if (ObjectUtil.isNull(value)) { + return null; + } + EncryptField encryptField = field.getAnnotation(EncryptField.class); + EncryptContext encryptContext = new EncryptContext(); + encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm()); + encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode()); + encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password()); + encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey()); + encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey()); + return this.encryptorManager.encrypt(value, encryptContext); + } + + + @Override + public void setProperties(Properties properties) { + } +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java new file mode 100644 index 0000000..6aadb3e --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java @@ -0,0 +1,34 @@ +package org.dromara.common.encrypt.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * api解密属性配置类 + * @author wdhcr + */ +@Data +@ConfigurationProperties(prefix = "api-decrypt") +public class ApiDecryptProperties { + + /** + * 加密开关 + */ + private Boolean enabled; + + /** + * 头部标识 + */ + private String headerFlag; + + /** + * 响应加密公钥 + */ + private String publicKey; + + /** + * 请求解密私钥 + */ + private String privateKey; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java new file mode 100644 index 0000000..e9de900 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java @@ -0,0 +1,48 @@ +package org.dromara.common.encrypt.properties; + +import lombok.Data; +import org.dromara.common.encrypt.enumd.AlgorithmType; +import org.dromara.common.encrypt.enumd.EncodeType; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * 加解密属性配置类 + * + * @author 老马 + * @version 4.6.0 + */ +@Data +@ConfigurationProperties(prefix = "mybatis-encryptor") +public class EncryptorProperties { + + /** + * 过滤开关 + */ + private Boolean enable; + + /** + * 默认算法 + */ + private AlgorithmType algorithm; + + /** + * 安全秘钥 + */ + private String password; + + /** + * 公钥 + */ + private String publicKey; + + /** + * 私钥 + */ + private String privateKey; + + /** + * 编码方式,base64/hex + */ + private EncodeType encode; + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java new file mode 100644 index 0000000..2a096ee --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java @@ -0,0 +1,313 @@ +package org.dromara.common.encrypt.utils; + +import cn.hutool.core.codec.Base64; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.SmUtil; +import cn.hutool.crypto.asymmetric.KeyType; +import cn.hutool.crypto.asymmetric.RSA; +import cn.hutool.crypto.asymmetric.SM2; + +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; + +/** + * 安全相关工具类 + * + * @author 老马 + */ +public class EncryptUtils { + + /** + * 公钥 + */ + public static final String PUBLIC_KEY = "publicKey"; + + /** + * 私钥 + */ + public static final String PRIVATE_KEY = "privateKey"; + + /** + * Base64加密 + * + * @param data 待加密数据 + * @return 加密后字符串 + */ + public static String encryptByBase64(String data) { + return Base64.encode(data, StandardCharsets.UTF_8); + } + + /** + * Base64解密 + * + * @param data 待解密数据 + * @return 解密后字符串 + */ + public static String decryptByBase64(String data) { + return Base64.decodeStr(data, StandardCharsets.UTF_8); + } + + /** + * AES加密 + * + * @param data 待加密数据 + * @param password 秘钥字符串 + * @return 加密后字符串, 采用Base64编码 + */ + public static String encryptByAes(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("AES需要传入秘钥信息"); + } + // aes算法的秘钥要求是16位、24位、32位 + int[] array = {16, 24, 32}; + if (!ArrayUtil.contains(array, password.length())) { + throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); + } + return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8); + } + + /** + * AES加密 + * + * @param data 待加密数据 + * @param password 秘钥字符串 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptByAesHex(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("AES需要传入秘钥信息"); + } + // aes算法的秘钥要求是16位、24位、32位 + int[] array = {16, 24, 32}; + if (!ArrayUtil.contains(array, password.length())) { + throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); + } + return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8); + } + + /** + * AES解密 + * + * @param data 待解密数据 + * @param password 秘钥字符串 + * @return 解密后字符串 + */ + public static String decryptByAes(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("AES需要传入秘钥信息"); + } + // aes算法的秘钥要求是16位、24位、32位 + int[] array = {16, 24, 32}; + if (!ArrayUtil.contains(array, password.length())) { + throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位"); + } + return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8); + } + + /** + * sm4加密 + * + * @param data 待加密数据 + * @param password 秘钥字符串 + * @return 加密后字符串, 采用Base64编码 + */ + public static String encryptBySm4(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("SM4需要传入秘钥信息"); + } + // sm4算法的秘钥要求是16位长度 + int sm4PasswordLength = 16; + if (sm4PasswordLength != password.length()) { + throw new IllegalArgumentException("SM4秘钥长度要求为16位"); + } + return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8); + } + + /** + * sm4加密 + * + * @param data 待加密数据 + * @param password 秘钥字符串 + * @return 加密后字符串, 采用Base64编码 + */ + public static String encryptBySm4Hex(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("SM4需要传入秘钥信息"); + } + // sm4算法的秘钥要求是16位长度 + int sm4PasswordLength = 16; + if (sm4PasswordLength != password.length()) { + throw new IllegalArgumentException("SM4秘钥长度要求为16位"); + } + return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8); + } + + /** + * sm4解密 + * + * @param data 待解密数据 + * @param password 秘钥字符串 + * @return 解密后字符串 + */ + public static String decryptBySm4(String data, String password) { + if (StrUtil.isBlank(password)) { + throw new IllegalArgumentException("SM4需要传入秘钥信息"); + } + // sm4算法的秘钥要求是16位长度 + int sm4PasswordLength = 16; + if (sm4PasswordLength != password.length()) { + throw new IllegalArgumentException("SM4秘钥长度要求为16位"); + } + return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8); + } + + /** + * 产生sm2加解密需要的公钥和私钥 + * + * @return 公私钥Map + */ + public static Map generateSm2Key() { + Map keyMap = new HashMap<>(2); + SM2 sm2 = SmUtil.sm2(); + keyMap.put(PRIVATE_KEY, sm2.getPrivateKeyBase64()); + keyMap.put(PUBLIC_KEY, sm2.getPublicKeyBase64()); + return keyMap; + } + + /** + * sm2公钥加密 + * + * @param data 待加密数据 + * @param publicKey 公钥 + * @return 加密后字符串, 采用Base64编码 + */ + public static String encryptBySm2(String data, String publicKey) { + if (StrUtil.isBlank(publicKey)) { + throw new IllegalArgumentException("SM2需要传入公钥进行加密"); + } + SM2 sm2 = SmUtil.sm2(null, publicKey); + return sm2.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey); + } + + /** + * sm2公钥加密 + * + * @param data 待加密数据 + * @param publicKey 公钥 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptBySm2Hex(String data, String publicKey) { + if (StrUtil.isBlank(publicKey)) { + throw new IllegalArgumentException("SM2需要传入公钥进行加密"); + } + SM2 sm2 = SmUtil.sm2(null, publicKey); + return sm2.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey); + } + + /** + * sm2私钥解密 + * + * @param data 待解密数据 + * @param privateKey 私钥 + * @return 解密后字符串 + */ + public static String decryptBySm2(String data, String privateKey) { + if (StrUtil.isBlank(privateKey)) { + throw new IllegalArgumentException("SM2需要传入私钥进行解密"); + } + SM2 sm2 = SmUtil.sm2(privateKey, null); + return sm2.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8); + } + + /** + * 产生RSA加解密需要的公钥和私钥 + * + * @return 公私钥Map + */ + public static Map generateRsaKey() { + Map keyMap = new HashMap<>(2); + RSA rsa = SecureUtil.rsa(); + keyMap.put(PRIVATE_KEY, rsa.getPrivateKeyBase64()); + keyMap.put(PUBLIC_KEY, rsa.getPublicKeyBase64()); + return keyMap; + } + + /** + * rsa公钥加密 + * + * @param data 待加密数据 + * @param publicKey 公钥 + * @return 加密后字符串, 采用Base64编码 + */ + public static String encryptByRsa(String data, String publicKey) { + if (StrUtil.isBlank(publicKey)) { + throw new IllegalArgumentException("RSA需要传入公钥进行加密"); + } + RSA rsa = SecureUtil.rsa(null, publicKey); + return rsa.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey); + } + + /** + * rsa公钥加密 + * + * @param data 待加密数据 + * @param publicKey 公钥 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptByRsaHex(String data, String publicKey) { + if (StrUtil.isBlank(publicKey)) { + throw new IllegalArgumentException("RSA需要传入公钥进行加密"); + } + RSA rsa = SecureUtil.rsa(null, publicKey); + return rsa.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey); + } + + /** + * rsa私钥解密 + * + * @param data 待解密数据 + * @param privateKey 私钥 + * @return 解密后字符串 + */ + public static String decryptByRsa(String data, String privateKey) { + if (StrUtil.isBlank(privateKey)) { + throw new IllegalArgumentException("RSA需要传入私钥进行解密"); + } + RSA rsa = SecureUtil.rsa(privateKey, null); + return rsa.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8); + } + + /** + * md5加密 + * + * @param data 待加密数据 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptByMd5(String data) { + return SecureUtil.md5(data); + } + + /** + * sha256加密 + * + * @param data 待加密数据 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptBySha256(String data) { + return SecureUtil.sha256(data); + } + + /** + * sm3加密 + * + * @param data 待加密数据 + * @return 加密后字符串, 采用Hex编码 + */ + public static String encryptBySm3(String data) { + return SmUtil.sm3(data); + } + +} diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..132cf29 --- /dev/null +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.dromara.common.encrypt.config.EncryptorAutoConfiguration +org.dromara.common.encrypt.config.ApiDecryptAutoConfiguration + diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml new file mode 100644 index 0000000..43c878b --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/pom.xml @@ -0,0 +1,37 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-excel + + + ruoyi-common-excel + + + + + org.dromara + ruoyi-common-json + + + + com.alibaba + easyexcel + + + + com.aspose + aspose-words + 15.8.0-jdk16 + + + + + diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java new file mode 100644 index 0000000..6b9211b --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java @@ -0,0 +1,29 @@ +package org.dromara.common.excel.annotation; + +import org.dromara.common.excel.core.CellMergeStrategy; + +import java.lang.annotation.*; + +/** + * excel 列单元格合并(合并列相同项) + * + * 需搭配 {@link CellMergeStrategy} 策略使用 + * + * @author Lion Li + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface CellMerge { + + /** + * col index + */ + int index() default -1; + + /** + * 合并需要依赖的其他字段名称 + */ + String[] mergeBy() default {}; + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java new file mode 100644 index 0000000..5c51842 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java @@ -0,0 +1,32 @@ +package org.dromara.common.excel.annotation; + +import org.dromara.common.core.utils.StringUtils; + +import java.lang.annotation.*; + +/** + * 字典格式化 + * + * @author Lion Li + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface ExcelDictFormat { + + /** + * 如果是字典类型,请设置字典的type值 (如: sys_user_sex) + */ + String dictType() default ""; + + /** + * 读取内容转表达式 (如: 0=男,1=女,2=未知) + */ + String readConverterExp() default ""; + + /** + * 分隔符,读取字符串组内容 + */ + String separator() default StringUtils.SEPARATOR; + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java new file mode 100644 index 0000000..290379d --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java @@ -0,0 +1,30 @@ +package org.dromara.common.excel.annotation; + +import java.lang.annotation.*; + +/** + * 枚举格式化 + * + * @author Liang + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Inherited +public @interface ExcelEnumFormat { + + /** + * 字典枚举类型 + */ + Class> enumClass(); + + /** + * 字典枚举类中对应的code属性名称,默认为code + */ + String codeField() default "code"; + + /** + * 字典枚举类中对应的text属性名称,默认为text + */ + String textField() default "text"; + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java new file mode 100644 index 0000000..f358afc --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java @@ -0,0 +1,24 @@ +package org.dromara.common.excel.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 批注 + * @author guzhouyanyu + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExcelNotation { + + /** + * col index + */ + int index() default -1; + /** + * 批注内容 + */ + String value() default ""; +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java new file mode 100644 index 0000000..15784e1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java @@ -0,0 +1,26 @@ +package org.dromara.common.excel.annotation; + +import org.apache.poi.ss.usermodel.IndexedColors; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 是否必填 + * @author guzhouyanyu + */ +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExcelRequired { + + /** + * col index + */ + int index() default -1; + /** + * 字体颜色 + */ + IndexedColors fontColor() default IndexedColors.RED; +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java new file mode 100644 index 0000000..07cc4c4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java @@ -0,0 +1,52 @@ +package org.dromara.common.excel.convert; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import lombok.extern.slf4j.Slf4j; + +import java.math.BigDecimal; + +/** + * 大数值转换 + * Excel 数值长度位15位 大于15位的数值转换位字符串 + * + * @author Lion Li + */ +@Slf4j +public class ExcelBigNumberConvert implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Long.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return CellDataTypeEnum.STRING; + } + + @Override + public Long convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + return Convert.toLong(cellData.getData()); + } + + @Override + public WriteCellData convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + if (ObjectUtil.isNotNull(object)) { + String str = Convert.toStr(object); + if (str.length() > 15) { + return new WriteCellData<>(str); + } + } + WriteCellData cellData = new WriteCellData<>(new BigDecimal(object)); + cellData.setType(CellDataTypeEnum.NUMBER); + return cellData; + } + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java new file mode 100644 index 0000000..1626c89 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java @@ -0,0 +1,73 @@ +package org.dromara.common.excel.convert; + +import cn.hutool.core.annotation.AnnotationUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.service.DictService; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.utils.ExcelUtil; + +import java.lang.reflect.Field; + +/** + * 字典格式化转换处理 + * + * @author Lion Li + */ +@Slf4j +public class ExcelDictConvert implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Object.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return null; + } + + @Override + public Object convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + ExcelDictFormat anno = getAnnotation(contentProperty.getField()); + String type = anno.dictType(); + String label = cellData.getStringValue(); + String value; + if (StringUtils.isBlank(type)) { + value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator()); + } else { + value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator()); + } + return Convert.convert(contentProperty.getField().getType(), value); + } + + @Override + public WriteCellData convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + if (ObjectUtil.isNull(object)) { + return new WriteCellData<>(""); + } + ExcelDictFormat anno = getAnnotation(contentProperty.getField()); + String type = anno.dictType(); + String value = Convert.toStr(object); + String label; + if (StringUtils.isBlank(type)) { + label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator()); + } else { + label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator()); + } + return new WriteCellData<>(label); + } + + private ExcelDictFormat getAnnotation(Field field) { + return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class); + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java new file mode 100644 index 0000000..701a27e --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java @@ -0,0 +1,87 @@ +package org.dromara.common.excel.convert; + +import cn.hutool.core.annotation.AnnotationUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.reflect.ReflectUtils; +import org.dromara.common.excel.annotation.ExcelEnumFormat; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 枚举格式化转换处理 + * + * @author Liang + */ +@Slf4j +public class ExcelEnumConvert implements Converter { + + @Override + public Class supportJavaTypeKey() { + return Object.class; + } + + @Override + public CellDataTypeEnum supportExcelTypeKey() { + return null; + } + + @Override + public Object convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + cellData.checkEmpty(); + // Excel中填入的是枚举中指定的描述 + Object textValue = switch (cellData.getType()) { + case STRING, DIRECT_STRING, RICH_TEXT_STRING -> cellData.getStringValue(); + case NUMBER -> cellData.getNumberValue(); + case BOOLEAN -> cellData.getBooleanValue(); + default -> throw new IllegalArgumentException("单元格类型异常!"); + }; + // 如果是空值 + if (ObjectUtil.isNull(textValue)) { + return null; + } + Map enumCodeToTextMap = beforeConvert(contentProperty); + // 从Java输出至Excel是code转text + // 因此从Excel转Java应该将text与code对调 + Map enumTextToCodeMap = new HashMap<>(); + enumCodeToTextMap.forEach((key, value) -> enumTextToCodeMap.put(value, key)); + // 应该从text -> code中查找 + Object codeValue = enumTextToCodeMap.get(textValue); + return Convert.convert(contentProperty.getField().getType(), codeValue); + } + + @Override + public WriteCellData convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { + if (ObjectUtil.isNull(object)) { + return new WriteCellData<>(""); + } + Map enumValueMap = beforeConvert(contentProperty); + String value = Convert.toStr(enumValueMap.get(object), ""); + return new WriteCellData<>(value); + } + + private Map beforeConvert(ExcelContentProperty contentProperty) { + ExcelEnumFormat anno = getAnnotation(contentProperty.getField()); + Map enumValueMap = new HashMap<>(); + Enum[] enumConstants = anno.enumClass().getEnumConstants(); + for (Enum enumConstant : enumConstants) { + Object codeValue = ReflectUtils.invokeGetter(enumConstant, anno.codeField()); + String textValue = ReflectUtils.invokeGetter(enumConstant, anno.textField()); + enumValueMap.put(codeValue, textValue); + } + return enumValueMap; + } + + private ExcelEnumFormat getAnnotation(Field field) { + return AnnotationUtil.getAnnotation(field, ExcelEnumFormat.class); + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java new file mode 100644 index 0000000..7c7721c --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java @@ -0,0 +1,157 @@ +package org.dromara.common.excel.core; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ReflectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.write.handler.WorkbookWriteHandler; +import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; +import com.alibaba.excel.write.merge.AbstractMergeStrategy; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.util.CellRangeAddress; +import org.dromara.common.core.utils.reflect.ReflectUtils; +import org.dromara.common.excel.annotation.CellMerge; + +import java.lang.reflect.Field; +import java.util.*; + +/** + * 列值重复合并策略 + * + * @author Lion Li + */ +@Slf4j +public class CellMergeStrategy extends AbstractMergeStrategy implements WorkbookWriteHandler { + + private final List cellList; + private final boolean hasTitle; + private int rowIndex; + + public CellMergeStrategy(List list, boolean hasTitle) { + this.hasTitle = hasTitle; + // 行合并开始下标 + this.rowIndex = hasTitle ? 1 : 0; + this.cellList = handle(list, hasTitle); + } + + @Override + protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) { + //单元格写入了,遍历合并区域,如果该Cell在区域内,但非首行,则清空 + final int rowIndex = cell.getRowIndex(); + if (CollUtil.isNotEmpty(cellList)){ + for (CellRangeAddress cellAddresses : cellList) { + final int firstRow = cellAddresses.getFirstRow(); + if (cellAddresses.isInRange(cell) && rowIndex != firstRow){ + cell.setBlank(); + } + } + } + } + + @Override + public void afterWorkbookDispose(final WorkbookWriteHandlerContext context) { + //当前表格写完后,统一写入 + if (CollUtil.isNotEmpty(cellList)){ + for (CellRangeAddress item : cellList) { + context.getWriteContext().writeSheetHolder().getSheet().addMergedRegion(item); + } + } + } + + @SneakyThrows + private List handle(List list, boolean hasTitle) { + List cellList = new ArrayList<>(); + if (CollUtil.isEmpty(list)) { + return cellList; + } + Field[] fields = ReflectUtils.getFields(list.get(0).getClass(), field -> !"serialVersionUID".equals(field.getName())); + + // 有注解的字段 + List mergeFields = new ArrayList<>(); + List mergeFieldsIndex = new ArrayList<>(); + for (int i = 0; i < fields.length; i++) { + Field field = fields[i]; + if (field.isAnnotationPresent(CellMerge.class)) { + CellMerge cm = field.getAnnotation(CellMerge.class); + mergeFields.add(field); + mergeFieldsIndex.add(cm.index() == -1 ? i : cm.index()); + if (hasTitle) { + ExcelProperty property = field.getAnnotation(ExcelProperty.class); + rowIndex = Math.max(rowIndex, property.value().length); + } + } + } + + Map map = new HashMap<>(); + // 生成两两合并单元格 + for (int i = 0; i < list.size(); i++) { + for (int j = 0; j < mergeFields.size(); j++) { + Field field = mergeFields.get(j); + Object val = ReflectUtils.invokeGetter(list.get(i), field.getName()); + + int colNum = mergeFieldsIndex.get(j); + if (!map.containsKey(field)) { + map.put(field, new RepeatCell(val, i)); + } else { + RepeatCell repeatCell = map.get(field); + Object cellValue = repeatCell.getValue(); + if (cellValue == null || "".equals(cellValue)) { + // 空值跳过不合并 + continue; + } + + if (!cellValue.equals(val)) { + if ((i - repeatCell.getCurrent() > 1)) { + cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum)); + } + map.put(field, new RepeatCell(val, i)); + } else if (i == list.size() - 1) { + if (i > repeatCell.getCurrent() && isMerge(list, i, field)) { + cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum)); + } + } else if (!isMerge(list, i, field)) { + if ((i - repeatCell.getCurrent() > 1)) { + cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum)); + } + map.put(field, new RepeatCell(val, i)); + } + } + } + } + return cellList; + } + + private boolean isMerge(List list, int i, Field field) { + boolean isMerge = true; + CellMerge cm = field.getAnnotation(CellMerge.class); + final String[] mergeBy = cm.mergeBy(); + if (StrUtil.isAllNotBlank(mergeBy)) { + //比对当前list(i)和list(i - 1)的各个属性值一一比对 如果全为真 则为真 + for (String fieldName : mergeBy) { + final Object valCurrent = ReflectUtil.getFieldValue(list.get(i), fieldName); + final Object valPre = ReflectUtil.getFieldValue(list.get(i - 1), fieldName); + if (!Objects.equals(valPre, valCurrent)) { + //依赖字段如有任一不等值,则标记为不可合并 + isMerge = false; + } + } + } + return isMerge; + } + + @Data + @AllArgsConstructor + static class RepeatCell { + + private Object value; + + private int current; + + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java new file mode 100644 index 0000000..3d3f5f2 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java @@ -0,0 +1,104 @@ +package org.dromara.common.excel.core; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.exception.ExcelAnalysisException; +import com.alibaba.excel.exception.ExcelDataConvertException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.json.utils.JsonUtils; + +import java.util.Map; +import java.util.Set; + +/** + * Excel 导入监听 + * + * @author Yjoioooo + * @author Lion Li + */ +@Slf4j +@NoArgsConstructor +public class DefaultExcelListener extends AnalysisEventListener implements ExcelListener { + + /** + * 是否Validator检验,默认为是 + */ + private Boolean isValidate = Boolean.TRUE; + + /** + * excel 表头数据 + */ + private Map headMap; + + /** + * 导入回执 + */ + private ExcelResult excelResult; + + public DefaultExcelListener(boolean isValidate) { + this.excelResult = new DefaultExcelResult<>(); + this.isValidate = isValidate; + } + + /** + * 处理异常 + * + * @param exception ExcelDataConvertException + * @param context Excel 上下文 + */ + @Override + public void onException(Exception exception, AnalysisContext context) throws Exception { + String errMsg = null; + if (exception instanceof ExcelDataConvertException excelDataConvertException) { + // 如果是某一个单元格的转换异常 能获取到具体行号 + Integer rowIndex = excelDataConvertException.getRowIndex(); + Integer columnIndex = excelDataConvertException.getColumnIndex(); + errMsg = StrUtil.format("第{}行-第{}列-表头{}: 解析异常
", + rowIndex + 1, columnIndex + 1, headMap.get(columnIndex)); + if (log.isDebugEnabled()) { + log.error(errMsg); + } + } + if (exception instanceof ConstraintViolationException constraintViolationException) { + Set> constraintViolations = constraintViolationException.getConstraintViolations(); + String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", "); + errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg); + if (log.isDebugEnabled()) { + log.error(errMsg); + } + } + excelResult.getErrorList().add(errMsg); + throw new ExcelAnalysisException(errMsg); + } + + @Override + public void invokeHeadMap(Map headMap, AnalysisContext context) { + this.headMap = headMap; + log.debug("解析到一条表头数据: {}", JsonUtils.toJsonString(headMap)); + } + + @Override + public void invoke(T data, AnalysisContext context) { + if (isValidate) { + ValidatorUtils.validate(data); + } + excelResult.getList().add(data); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + log.debug("所有数据解析完成!"); + } + + @Override + public ExcelResult getExcelResult() { + return excelResult; + } + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java new file mode 100644 index 0000000..7373e12 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java @@ -0,0 +1,73 @@ +package org.dromara.common.excel.core; + +import cn.hutool.core.util.StrUtil; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 默认excel返回对象 + * + * @author Yjoioooo + * @author Lion Li + */ +public class DefaultExcelResult implements ExcelResult { + + /** + * 数据对象list + */ + @Setter + private List list; + + /** + * 错误信息列表 + */ + @Setter + private List errorList; + + public DefaultExcelResult() { + this.list = new ArrayList<>(); + this.errorList = new ArrayList<>(); + } + + public DefaultExcelResult(List list, List errorList) { + this.list = list; + this.errorList = errorList; + } + + public DefaultExcelResult(ExcelResult excelResult) { + this.list = excelResult.getList(); + this.errorList = excelResult.getErrorList(); + } + + @Override + public List getList() { + return list; + } + + @Override + public List getErrorList() { + return errorList; + } + + /** + * 获取导入回执 + * + * @return 导入回执 + */ + @Override + public String getAnalysis() { + int successCount = list.size(); + int errorCount = errorList.size(); + if (successCount == 0) { + return "读取失败,未解析到数据"; + } else { + if (errorCount == 0) { + return StrUtil.format("恭喜您,全部读取成功!共{}条", successCount); + } else { + return ""; + } + } + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java new file mode 100644 index 0000000..8b53a0c --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java @@ -0,0 +1,149 @@ +package org.dromara.common.excel.core; + +import cn.hutool.core.util.StrUtil; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.exception.ServiceException; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + *

Excel下拉可选项

+ * 注意:为确保下拉框解析正确,传值务必使用createOptionValue()做为值的拼接 + * + * @author Emil.Zhang + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuppressWarnings("unused") +public class DropDownOptions { + /** + * 一级下拉所在列index,从0开始算 + */ + private int index = 0; + /** + * 二级下拉所在的index,从0开始算,不能与一级相同 + */ + private int nextIndex = 0; + /** + * 一级下拉所包含的数据 + */ + private List options = new ArrayList<>(); + /** + * 二级下拉所包含的数据Map + *

以每一个一级选项值为Key,每个一级选项对应的二级数据为Value

+ */ + private Map> nextOptions = new HashMap<>(); + /** + * 分隔符 + */ + private static final String DELIMITER = "_"; + + /** + * 创建只有一级的下拉选 + */ + public DropDownOptions(int index, List options) { + this.index = index; + this.options = options; + } + + /** + *

创建每个选项可选值

+ *

注意:不能以数字,特殊符号开头,选项中不可以包含任何运算符号

+ * + * @param vars 可选值内包含的参数 + * @return 合规的可选值 + */ + public static String createOptionValue(Object... vars) { + StringBuilder stringBuffer = new StringBuilder(); + String regex = "^[\\S\\d\\u4e00-\\u9fa5]+$"; + for (int i = 0; i < vars.length; i++) { + String var = StrUtil.trimToEmpty(String.valueOf(vars[i])); + if (!var.matches(regex)) { + throw new ServiceException("选项数据不符合规则,仅允许使用中英文字符以及数字"); + } + stringBuffer.append(var); + if (i < vars.length - 1) { + // 直至最后一个前,都以_作为切割线 + stringBuffer.append(DELIMITER); + } + } + if (stringBuffer.toString().matches("^\\d_*$")) { + throw new ServiceException("禁止以数字开头"); + } + return stringBuffer.toString(); + } + + /** + * 将处理后合理的可选值解析为原始的参数 + * + * @param option 经过处理后的合理的可选项 + * @return 原始的参数 + */ + public static List analyzeOptionValue(String option) { + return StrUtil.split(option, DELIMITER, true, true); + } + + /** + * 创建级联下拉选项 + * + * @param parentList 父实体可选项原始数据 + * @param parentIndex 父下拉选位置 + * @param sonList 子实体可选项原始数据 + * @param sonIndex 子下拉选位置 + * @param parentHowToGetIdFunction 父类如何获取唯一标识 + * @param sonHowToGetParentIdFunction 子类如何获取父类的唯一标识 + * @param howToBuildEveryOption 如何生成下拉选内容 + * @return 级联下拉选项 + */ + public static DropDownOptions buildLinkedOptions(List parentList, + int parentIndex, + List sonList, + int sonIndex, + Function parentHowToGetIdFunction, + Function sonHowToGetParentIdFunction, + Function howToBuildEveryOption) { + DropDownOptions parentLinkSonOptions = new DropDownOptions(); + // 先创建父类的下拉 + parentLinkSonOptions.setIndex(parentIndex); + parentLinkSonOptions.setOptions( + parentList.stream() + .map(howToBuildEveryOption) + .collect(Collectors.toList()) + ); + // 提取父-子级联下拉 + Map> sonOptions = new HashMap<>(); + // 父级依据自己的ID分组 + Map> parentGroupByIdMap = + parentList.stream().collect(Collectors.groupingBy(parentHowToGetIdFunction)); + // 遍历每个子集,提取到Map中 + sonList.forEach(everySon -> { + if (parentGroupByIdMap.containsKey(sonHowToGetParentIdFunction.apply(everySon))) { + // 找到对应的上级 + T parentObj = parentGroupByIdMap.get(sonHowToGetParentIdFunction.apply(everySon)).get(0); + // 提取名称和ID作为Key + String key = howToBuildEveryOption.apply(parentObj); + // Key对应的Value + List thisParentSonOptionList; + if (sonOptions.containsKey(key)) { + thisParentSonOptionList = sonOptions.get(key); + } else { + thisParentSonOptionList = new ArrayList<>(); + sonOptions.put(key, thisParentSonOptionList); + } + // 往Value中添加当前子集选项 + thisParentSonOptionList.add(howToBuildEveryOption.apply(everySon)); + } + }); + parentLinkSonOptions.setNextIndex(sonIndex); + parentLinkSonOptions.setNextOptions(sonOptions); + return parentLinkSonOptions; + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java new file mode 100644 index 0000000..32fee7a --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java @@ -0,0 +1,399 @@ +package org.dromara.common.excel.core; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.EnumUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.metadata.FieldCache; +import com.alibaba.excel.metadata.FieldWrapper; +import com.alibaba.excel.util.ClassUtils; +import com.alibaba.excel.write.handler.SheetWriteHandler; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.ss.util.WorkbookUtil; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.DictService; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.annotation.ExcelEnumFormat; + +import java.lang.reflect.Field; +import java.util.*; + +/** + *

Excel表格下拉选操作

+ * 考虑到下拉选过多可能导致Excel打开缓慢的问题,只校验前1000行 + *

+ * 即只有前1000行的数据可以用下拉框,超出的自行通过限制数据量的形式,第二次输出 + * + * @author Emil.Zhang + */ +@Slf4j +public class ExcelDownHandler implements SheetWriteHandler { + + /** + * Excel表格中的列名英文 + * 仅为了解析列英文,禁止修改 + */ + private static final String EXCEL_COLUMN_NAME = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + /** + * 单选数据Sheet名 + */ + private static final String OPTIONS_SHEET_NAME = "options"; + /** + * 联动选择数据Sheet名的头 + */ + private static final String LINKED_OPTIONS_SHEET_NAME = "linkedOptions"; + /** + * 下拉可选项 + */ + private final List dropDownOptions; + private final DictService dictService; + /** + * 当前单选进度 + */ + private int currentOptionsColumnIndex; + /** + * 当前联动选择进度 + */ + private int currentLinkedOptionsSheetIndex; + + public ExcelDownHandler(List options) { + this.dropDownOptions = options; + this.currentOptionsColumnIndex = 0; + this.currentLinkedOptionsSheetIndex = 0; + this.dictService = SpringUtils.getBean(DictService.class); + } + + /** + *

开始创建下拉数据

+ * 1.通过解析传入的@ExcelProperty同级是否标注有@DropDown选项 + * 如果有且设置了value值,则将其直接置为下拉可选项 + *

+ * 2.或者在调用ExcelUtil时指定了可选项,将依据传入的可选项做下拉 + *

+ * 3.二者并存,注意调用方式 + */ + @Override + public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) { + Sheet sheet = writeSheetHolder.getSheet(); + // 开始设置下拉框 HSSFWorkbook + DataValidationHelper helper = sheet.getDataValidationHelper(); + Workbook workbook = writeWorkbookHolder.getWorkbook(); + FieldCache fieldCache = ClassUtils.declaredFields(writeWorkbookHolder.getClazz(), writeWorkbookHolder); + for (Map.Entry entry : fieldCache.getSortedFieldMap().entrySet()) { + Integer index = entry.getKey(); + FieldWrapper wrapper = entry.getValue(); + Field field = wrapper.getField(); + // 循环实体中的每个属性 + // 可选的下拉值 + List options = new ArrayList<>(); + if (field.isAnnotationPresent(ExcelDictFormat.class)) { + // 如果指定了@ExcelDictFormat,则使用字典的逻辑 + ExcelDictFormat format = field.getDeclaredAnnotation(ExcelDictFormat.class); + String dictType = format.dictType(); + String converterExp = format.readConverterExp(); + if (StringUtils.isNotBlank(dictType)) { + // 如果传递了字典名,则依据字典建立下拉 + Collection values = Optional.ofNullable(dictService.getAllDictByDictType(dictType)) + .orElseThrow(() -> new ServiceException(String.format("字典 %s 不存在", dictType))) + .values(); + options = new ArrayList<>(values); + } else if (StringUtils.isNotBlank(converterExp)) { + // 如果指定了确切的值,则直接解析确切的值 + List strList = StringUtils.splitList(converterExp, format.separator()); + options = StreamUtils.toList(strList, s -> StringUtils.split(s, "=")[1]); + } + } else if (field.isAnnotationPresent(ExcelEnumFormat.class)) { + // 否则如果指定了@ExcelEnumFormat,则使用枚举的逻辑 + ExcelEnumFormat format = field.getDeclaredAnnotation(ExcelEnumFormat.class); + List values = EnumUtil.getFieldValues(format.enumClass(), format.textField()); + options = StreamUtils.toList(values, String::valueOf); + } + if (ObjectUtil.isNotEmpty(options)) { + // 仅当下拉可选项不为空时执行 + if (options.size() > 20) { + // 这里限制如果可选项大于20,则使用额外表形式 + dropDownWithSheet(helper, workbook, sheet, index, options); + } else { + // 否则使用固定值形式 + dropDownWithSimple(helper, sheet, index, options); + } + } + } + if (CollUtil.isEmpty(dropDownOptions)) { + return; + } + dropDownOptions.forEach(everyOptions -> { + // 如果传递了下拉框选择器参数 + if (!everyOptions.getNextOptions().isEmpty()) { + // 当二级选项不为空时,使用额外关联表的形式 + dropDownLinkedOptions(helper, workbook, sheet, everyOptions); + } else if (everyOptions.getOptions().size() > 10) { + // 当一级选项参数个数大于10,使用额外表的形式 + dropDownWithSheet(helper, workbook, sheet, everyOptions.getIndex(), everyOptions.getOptions()); + } else { + // 否则使用默认形式 + dropDownWithSimple(helper, sheet, everyOptions.getIndex(), everyOptions.getOptions()); + } + }); + } + + /** + *

简单下拉框

+ * 直接将可选项拼接为指定列的数据校验值 + * + * @param celIndex 列index + * @param value 下拉选可选值 + */ + private void dropDownWithSimple(DataValidationHelper helper, Sheet sheet, Integer celIndex, List value) { + if (ObjectUtil.isEmpty(value)) { + return; + } + this.markOptionsToSheet(helper, sheet, celIndex, helper.createExplicitListConstraint(ArrayUtil.toArray(value, String.class))); + } + + /** + *

额外表格形式的级联下拉框

+ * + * @param options 额外表格形式存储的下拉可选项 + */ + private void dropDownLinkedOptions(DataValidationHelper helper, Workbook workbook, Sheet sheet, DropDownOptions options) { + String linkedOptionsSheetName = String.format("%s_%d", LINKED_OPTIONS_SHEET_NAME, currentLinkedOptionsSheetIndex); + // 创建联动下拉数据表 + Sheet linkedOptionsDataSheet = workbook.createSheet(WorkbookUtil.createSafeSheetName(linkedOptionsSheetName)); + // 将下拉表隐藏 + workbook.setSheetHidden(workbook.getSheetIndex(linkedOptionsDataSheet), true); + // 选项数据 + List firstOptions = options.getOptions(); + Map> secoundOptionsMap = options.getNextOptions(); + + // 采用按行填充数据的方式,避免EasyExcel出现数据无法写入的问题 + // Attempting to write a row in the range that is already written to disk + + // 使用ArrayList记载数据,防止乱序 + List columnNames = new ArrayList<>(); + // 写入第一行,即第一级的数据 + Row firstRow = linkedOptionsDataSheet.createRow(0); + for (int columnIndex = 0; columnIndex < firstOptions.size(); columnIndex++) { + String columnName = firstOptions.get(columnIndex); + firstRow.createCell(columnIndex) + .setCellValue(columnName); + columnNames.add(columnName); + } + + // 创建名称管理器 + Name name = workbook.createName(); + // 设置名称管理器的别名 + name.setNameName(linkedOptionsSheetName); + // 以横向第一行创建一级下拉拼接引用位置 + String firstOptionsFunction = String.format("%s!$%s$1:$%s$1", + linkedOptionsSheetName, + getExcelColumnName(0), + getExcelColumnName(firstOptions.size()) + ); + // 设置名称管理器的引用位置 + name.setRefersToFormula(firstOptionsFunction); + // 设置数据校验为序列模式,引用的是名称管理器中的别名 + this.markOptionsToSheet(helper, sheet, options.getIndex(), helper.createFormulaListConstraint(linkedOptionsSheetName)); + + // 创建二级选项的名称管理器 + for (int columIndex = 0; columIndex < columnNames.size(); columIndex++) { + // 列名 + String firstOptionsColumnName = getExcelColumnName(columIndex); + // 对应的一级值 + String thisFirstOptionsValue = columnNames.get(columIndex); + + // 以该一级选项值创建子名称管理器 + Name sonName = workbook.createName(); + // 设置名称管理器的别名 + sonName.setNameName(thisFirstOptionsValue); + // 以第二行该列数据拼接引用位置 + String sonFunction = String.format("%s!$%s$2:$%s$%d", + linkedOptionsSheetName, + firstOptionsColumnName, + firstOptionsColumnName, + // 二级选项存在则设置为(选项个数+1)行,否则设置为2行 + Math.max(Optional.ofNullable(secoundOptionsMap.get(thisFirstOptionsValue)) + .orElseGet(ArrayList::new).size(), 1) + 1 + ); + // 设置名称管理器的引用位置 + sonName.setRefersToFormula(sonFunction); + // 数据验证为序列模式,引用到每一个主表中的二级选项位置 + // 创建子项的名称管理器,只是为了使得Excel可以识别到数据 + String mainSheetFirstOptionsColumnName = getExcelColumnName(options.getIndex()); + for (int i = 0; i < 100; i++) { + // 以一级选项对应的主体所在位置创建二级下拉 + String secondOptionsFunction = String.format("=INDIRECT(%s%d)", mainSheetFirstOptionsColumnName, i + 1); + // 二级只能主表每一行的每一列添加二级校验 + markLinkedOptionsToSheet(helper, sheet, i, options.getNextIndex(), helper.createFormulaListConstraint(secondOptionsFunction)); + } + } + + // 将二级数据处理为按行区分 + Map> columnValueMap = new HashMap<>(); + int currentRow = 1; + while (currentRow >= 0) { + boolean flag = false; + List rowData = new ArrayList<>(); + for (String columnName : columnNames) { + List data = secoundOptionsMap.get(columnName); + if (CollUtil.isEmpty(data)) { + // 添加空字符串填充位置 + rowData.add(" "); + continue; + } + // 取第一个 + String str = data.get(0); + rowData.add(str); + // 通过移除的方式避免重复 + data.remove(0); + // 设置可以继续 + flag = true; + } + columnValueMap.put(currentRow, rowData); + // 可以继续,则增加行数,否则置为负数跳出循环 + if (flag) { + currentRow++; + } else { + currentRow = -1; + } + } + + // 填充第二级选项数据 + columnValueMap.forEach((rowIndex, rowValues) -> { + Row row = linkedOptionsDataSheet.createRow(rowIndex); + for (int columnIndex = 0; columnIndex < rowValues.size(); columnIndex++) { + String rowValue = rowValues.get(columnIndex); + // 填充位置的部分不渲染 + if (StrUtil.isNotBlank(rowValue)) { + row.createCell(columnIndex) + .setCellValue(rowValue); + } + } + }); + + currentLinkedOptionsSheetIndex++; + } + + /** + *

额外表格形式的普通下拉框

+ * 由于下拉框可选值数量过多,为提升Excel打开效率,使用额外表格形式做下拉 + * + * @param celIndex 下拉选 + * @param value 下拉选可选值 + */ + private void dropDownWithSheet(DataValidationHelper helper, Workbook workbook, Sheet sheet, Integer celIndex, List value) { + // 创建下拉数据表 + Sheet simpleDataSheet = Optional.ofNullable(workbook.getSheet(WorkbookUtil.createSafeSheetName(OPTIONS_SHEET_NAME))) + .orElseGet(() -> workbook.createSheet(WorkbookUtil.createSafeSheetName(OPTIONS_SHEET_NAME))); + // 将下拉表隐藏 + workbook.setSheetHidden(workbook.getSheetIndex(simpleDataSheet), true); + // 完善纵向的一级选项数据表 + for (int i = 0; i < value.size(); i++) { + int finalI = i; + // 获取每一选项行,如果没有则创建 + Row row = Optional.ofNullable(simpleDataSheet.getRow(i)) + .orElseGet(() -> simpleDataSheet.createRow(finalI)); + // 获取本级选项对应的选项列,如果没有则创建 + Cell cell = Optional.ofNullable(row.getCell(currentOptionsColumnIndex)) + .orElseGet(() -> row.createCell(currentOptionsColumnIndex)); + // 设置值 + cell.setCellValue(value.get(i)); + } + + // 创建名称管理器 + Name name = workbook.createName(); + // 设置名称管理器的别名 + String nameName = String.format("%s_%d", OPTIONS_SHEET_NAME, celIndex); + name.setNameName(nameName); + // 以纵向第一列创建一级下拉拼接引用位置 + String function = String.format("%s!$%s$1:$%s$%d", + OPTIONS_SHEET_NAME, + getExcelColumnName(currentOptionsColumnIndex), + getExcelColumnName(currentOptionsColumnIndex), + value.size()); + // 设置名称管理器的引用位置 + name.setRefersToFormula(function); + // 设置数据校验为序列模式,引用的是名称管理器中的别名 + this.markOptionsToSheet(helper, sheet, celIndex, helper.createFormulaListConstraint(nameName)); + currentOptionsColumnIndex++; + } + + /** + * 挂载下拉的列,仅限一级选项 + */ + private void markOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer celIndex, + DataValidationConstraint constraint) { + // 设置数据有效性加载在哪个单元格上,四个参数分别是:起始行、终止行、起始列、终止列 + CellRangeAddressList addressList = new CellRangeAddressList(1, 1000, celIndex, celIndex); + markDataValidationToSheet(helper, sheet, constraint, addressList); + } + + /** + * 挂载下拉的列,仅限二级选项 + */ + private void markLinkedOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer rowIndex, + Integer celIndex, DataValidationConstraint constraint) { + // 设置数据有效性加载在哪个单元格上,四个参数分别是:起始行、终止行、起始列、终止列 + CellRangeAddressList addressList = new CellRangeAddressList(rowIndex, rowIndex, celIndex, celIndex); + markDataValidationToSheet(helper, sheet, constraint, addressList); + } + + /** + * 应用数据校验 + */ + private void markDataValidationToSheet(DataValidationHelper helper, Sheet sheet, + DataValidationConstraint constraint, CellRangeAddressList addressList) { + // 数据有效性对象 + DataValidation dataValidation = helper.createValidation(constraint, addressList); + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) { + //数据校验 + dataValidation.setSuppressDropDownArrow(true); + //错误提示 + dataValidation.setErrorStyle(DataValidation.ErrorStyle.STOP); + dataValidation.createErrorBox("提示", "此值与单元格定义数据不一致"); + dataValidation.setShowErrorBox(true); + //选定提示 + dataValidation.createPromptBox("填写说明:", "填写内容只能为下拉中数据,其他数据将导致导入失败"); + dataValidation.setShowPromptBox(true); + sheet.addValidationData(dataValidation); + } else { + dataValidation.setSuppressDropDownArrow(false); + } + sheet.addValidationData(dataValidation); + } + + /** + *

依据列index获取列名英文

+ * 依据列index转换为Excel中的列名英文 + *

例如第1列,index为0,解析出来为A列

+ * 第27列,index为26,解析为AA列 + *

第28列,index为27,解析为AB列

+ * + * @param columnIndex 列index + * @return 列index所在得英文名 + */ + private String getExcelColumnName(int columnIndex) { + // 26一循环的次数 + int columnCircleCount = columnIndex / 26; + // 26一循环内的位置 + int thisCircleColumnIndex = columnIndex % 26; + // 26一循环的次数大于0,则视为栏名至少两位 + String columnPrefix = columnCircleCount == 0 + ? StrUtil.EMPTY + : StrUtil.subWithLength(EXCEL_COLUMN_NAME, columnCircleCount - 1, 1); + // 从26一循环内取对应的栏位名 + String columnNext = StrUtil.subWithLength(EXCEL_COLUMN_NAME, thisCircleColumnIndex, 1); + // 将二者拼接即为最终的栏位名 + return columnPrefix + columnNext; + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java new file mode 100644 index 0000000..2d0340f --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java @@ -0,0 +1,14 @@ +package org.dromara.common.excel.core; + +import com.alibaba.excel.read.listener.ReadListener; + +/** + * Excel 导入监听 + * + * @author Lion Li + */ +public interface ExcelListener extends ReadListener { + + ExcelResult getExcelResult(); + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java new file mode 100644 index 0000000..0c2a418 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java @@ -0,0 +1,26 @@ +package org.dromara.common.excel.core; + +import java.util.List; + +/** + * excel返回对象 + * + * @author Lion Li + */ +public interface ExcelResult { + + /** + * 对象列表 + */ + List getList(); + + /** + * 错误列表 + */ + List getErrorList(); + + /** + * 导入回执 + */ + String getAnalysis(); +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java new file mode 100644 index 0000000..a2aa495 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java @@ -0,0 +1,135 @@ +package org.dromara.common.excel.handler; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.excel.metadata.data.DataFormatData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.util.StyleUtil; +import com.alibaba.excel.write.handler.CellWriteHandler; +import com.alibaba.excel.write.handler.SheetWriteHandler; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.metadata.style.WriteFont; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFRichTextString; +import org.dromara.common.core.utils.reflect.ReflectUtils; +import org.dromara.common.excel.annotation.ExcelNotation; +import org.dromara.common.excel.annotation.ExcelRequired; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; + +/** + * 批注、必填 + * + * @author guzhouyanyu + */ +public class DataWriteHandler implements SheetWriteHandler, CellWriteHandler { + + /** + * 批注 + */ + private final Map notationMap; + + /** + * 头列字体颜色 + */ + private final Map headColumnMap; + + + public DataWriteHandler(Class clazz) { + notationMap = getNotationMap(clazz); + headColumnMap = getRequiredMap(clazz); + } + + @Override + public void afterCellDispose(CellWriteHandlerContext context) { + if (CollUtil.isEmpty(notationMap) && CollUtil.isEmpty(headColumnMap)) { + return; + } + WriteCellData cellData = context.getFirstCellData(); + WriteCellStyle writeCellStyle = cellData.getOrCreateStyle(); + + DataFormatData dataFormatData = new DataFormatData(); + // 单元格设置为文本格式 + dataFormatData.setIndex((short) 49); + writeCellStyle.setDataFormatData(dataFormatData); + + if (context.getHead()) { + Cell cell = context.getCell(); + WriteSheetHolder writeSheetHolder = context.getWriteSheetHolder(); + Sheet sheet = writeSheetHolder.getSheet(); + Workbook workbook = writeSheetHolder.getSheet().getWorkbook(); + Drawing drawing = sheet.createDrawingPatriarch(); + // 设置标题字体样式 + WriteFont headWriteFont = new WriteFont(); + // 加粗 + headWriteFont.setBold(true); + if (CollUtil.isNotEmpty(headColumnMap) && headColumnMap.containsKey(cell.getColumnIndex())) { + // 设置字体颜色 + headWriteFont.setColor(headColumnMap.get(cell.getColumnIndex())); + } + writeCellStyle.setWriteFont(headWriteFont); + CellStyle cellStyle = StyleUtil.buildCellStyle(workbook, null, writeCellStyle); + cell.setCellStyle(cellStyle); + + if (CollUtil.isNotEmpty(notationMap) && notationMap.containsKey(cell.getColumnIndex())) { + // 批注内容 + String notationContext = notationMap.get(cell.getColumnIndex()); + // 创建绘图对象 + Comment comment = drawing.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), 0, (short) 5, 5)); + comment.setString(new XSSFRichTextString(notationContext)); + cell.setCellComment(comment); + } + } + } + + /** + * 获取必填列 + */ + private static Map getRequiredMap(Class clazz) { + Map requiredMap = new HashMap<>(); + Field[] fields = clazz.getDeclaredFields(); + // 检查 fields 数组是否为空 + if (fields.length == 0) { + return requiredMap; + } + Field[] filteredFields = ReflectUtils.getFields(clazz, field -> !"serialVersionUID".equals(field.getName())); + + for (int i = 0; i < filteredFields.length; i++) { + Field field = filteredFields[i]; + if (!field.isAnnotationPresent(ExcelRequired.class)) { + continue; + } + ExcelRequired excelRequired = field.getAnnotation(ExcelRequired.class); + int columnIndex = excelRequired.index() == -1 ? i : excelRequired.index(); + requiredMap.put(columnIndex, excelRequired.fontColor().getIndex()); + } + return requiredMap; + } + + /** + * 获取批注 + */ + private static Map getNotationMap(Class clazz) { + Map notationMap = new HashMap<>(); + Field[] fields = clazz.getDeclaredFields(); + // 检查 fields 数组是否为空 + if (fields.length == 0) { + return notationMap; + } + Field[] filteredFields = ReflectUtils.getFields(clazz, field -> !"serialVersionUID".equals(field.getName())); + for (int i = 0; i < filteredFields.length; i++) { + Field field = filteredFields[i]; + if (!field.isAnnotationPresent(ExcelNotation.class)) { + continue; + } + ExcelNotation excelNotation = field.getAnnotation(ExcelNotation.class); + int columnIndex = excelNotation.index() == -1 ? i : excelNotation.index(); + notationMap.put(columnIndex, excelNotation.value()); + } + return notationMap; + } +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java new file mode 100644 index 0000000..b22e6f9 --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java @@ -0,0 +1,439 @@ +package org.dromara.common.excel.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.resource.ClassPathResource; +import cn.hutool.core.util.IdUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.fill.FillConfig; +import com.alibaba.excel.write.metadata.fill.FillWrapper; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.excel.convert.ExcelBigNumberConvert; +import org.dromara.common.excel.core.*; +import org.dromara.common.excel.handler.DataWriteHandler; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * Excel相关处理 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ExcelUtil { + + /** + * 同步导入(适用于小数据量) + * + * @param is 输入流 + * @return 转换后集合 + */ + public static List importExcel(InputStream is, Class clazz) { + return EasyExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync(); + } + + + /** + * 使用校验监听器 异步导入 同步返回 + * + * @param is 输入流 + * @param clazz 对象类型 + * @param isValidate 是否 Validator 检验 默认为是 + * @return 转换后集合 + */ + public static ExcelResult importExcel(InputStream is, Class clazz, boolean isValidate) { + DefaultExcelListener listener = new DefaultExcelListener<>(isValidate); + EasyExcel.read(is, clazz, listener).sheet().doRead(); + return listener.getExcelResult(); + } + + /** + * 使用自定义监听器 异步导入 自定义返回 + * + * @param is 输入流 + * @param clazz 对象类型 + * @param listener 自定义监听器 + * @return 转换后集合 + */ + public static ExcelResult importExcel(InputStream is, Class clazz, ExcelListener listener) { + EasyExcel.read(is, clazz, listener).sheet().doRead(); + return listener.getExcelResult(); + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param response 响应体 + */ + public static void exportExcel(List list, String sheetName, Class clazz, HttpServletResponse response) { + try { + resetResponse(sheetName, response); + ServletOutputStream os = response.getOutputStream(); + exportExcel(list, sheetName, clazz, false, os, null); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param response 响应体 + * @param options 级联下拉选 + */ + public static void exportExcel(List list, String sheetName, Class clazz, HttpServletResponse response, List options) { + try { + resetResponse(sheetName, response); + ServletOutputStream os = response.getOutputStream(); + exportExcel(list, sheetName, clazz, false, os, options); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param merge 是否合并单元格 + * @param response 响应体 + */ + public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, HttpServletResponse response) { + try { + resetResponse(sheetName, response); + ServletOutputStream os = response.getOutputStream(); + exportExcel(list, sheetName, clazz, merge, os, null); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param merge 是否合并单元格 + * @param response 响应体 + * @param options 级联下拉选 + */ + public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, HttpServletResponse response, List options) { + try { + resetResponse(sheetName, response); + ServletOutputStream os = response.getOutputStream(); + exportExcel(list, sheetName, clazz, merge, os, options); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param os 输出流 + */ + public static void exportExcel(List list, String sheetName, Class clazz, OutputStream os) { + exportExcel(list, sheetName, clazz, false, os, null); + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param os 输出流 + * @param options 级联下拉选内容 + */ + public static void exportExcel(List list, String sheetName, Class clazz, OutputStream os, List options) { + exportExcel(list, sheetName, clazz, false, os, options); + } + + /** + * 导出excel + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param clazz 实体类 + * @param merge 是否合并单元格 + * @param os 输出流 + */ + public static void exportExcel(List list, String sheetName, Class clazz, boolean merge, + OutputStream os, List options) { + ExcelWriterSheetBuilder builder = EasyExcel.write(os, clazz) + .autoCloseStream(false) + // 自动适配 + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .registerWriteHandler(new DataWriteHandler(clazz)) + .sheet(sheetName); + if (merge) { + // 合并处理器 + builder.registerWriteHandler(new CellMergeStrategy(list, true)); + } + // 添加下拉框操作 + builder.registerWriteHandler(new ExcelDownHandler(options)); + builder.doWrite(list); + } + + /** + * 单表多数据模板导出 模板格式为 {.属性} + * + * @param filename 文件名 + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param response 响应体 + */ + public static void exportTemplate(List data, String filename, String templatePath, HttpServletResponse response) { + try { + resetResponse(filename, response); + ServletOutputStream os = response.getOutputStream(); + exportTemplate(data, templatePath, os); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 单表多数据模板导出 模板格式为 {.属性} + * + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param os 输出流 + */ + public static void exportTemplate(List data, String templatePath, OutputStream os) { + if (CollUtil.isEmpty(data)) { + throw new IllegalArgumentException("数据为空"); + } + ClassPathResource templateResource = new ClassPathResource(templatePath); + ExcelWriter excelWriter = EasyExcel.write(os) + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .registerWriteHandler(new DataWriteHandler(data.get(0).getClass())) + .build(); + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + // 单表多数据导出 模板格式为 {.属性} + for (T d : data) { + excelWriter.fill(d, writeSheet); + } + excelWriter.finish(); + } + + /** + * 多表多数据模板导出 模板格式为 {key.属性} + * + * @param filename 文件名 + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param response 响应体 + */ + public static void exportTemplateMultiList(Map data, String filename, String templatePath, HttpServletResponse response) { + try { + resetResponse(filename, response); + ServletOutputStream os = response.getOutputStream(); + exportTemplateMultiList(data, templatePath, os); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 多sheet模板导出 模板格式为 {key.属性} + * + * @param filename 文件名 + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param response 响应体 + */ + public static void exportTemplateMultiSheet(List> data, String filename, String templatePath, HttpServletResponse response) { + try { + resetResponse(filename, response); + ServletOutputStream os = response.getOutputStream(); + exportTemplateMultiSheet(data, templatePath, os); + } catch (IOException e) { + throw new RuntimeException("导出Excel异常"); + } + } + + /** + * 多表多数据模板导出 模板格式为 {key.属性} + * + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param os 输出流 + */ + public static void exportTemplateMultiList(Map data, String templatePath, OutputStream os) { + if (CollUtil.isEmpty(data)) { + throw new IllegalArgumentException("数据为空"); + } + ClassPathResource templateResource = new ClassPathResource(templatePath); + ExcelWriter excelWriter = EasyExcel.write(os) + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build(); + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + for (Map.Entry map : data.entrySet()) { + // 设置列表后续还有数据 + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + if (map.getValue() instanceof Collection) { + // 多表导出必须使用 FillWrapper + excelWriter.fill(new FillWrapper(map.getKey(), (Collection) map.getValue()), fillConfig, writeSheet); + } else { + excelWriter.fill(map.getValue(), writeSheet); + } + } + excelWriter.finish(); + } + + /** + * 多sheet模板导出 模板格式为 {key.属性} + * + * @param templatePath 模板路径 resource 目录下的路径包括模板文件名 + * 例如: excel/temp.xlsx + * 重点: 模板文件必须放置到启动类对应的 resource 目录下 + * @param data 模板需要的数据 + * @param os 输出流 + */ + public static void exportTemplateMultiSheet(List> data, String templatePath, OutputStream os) { + if (CollUtil.isEmpty(data)) { + throw new IllegalArgumentException("数据为空"); + } + ClassPathResource templateResource = new ClassPathResource(templatePath); + ExcelWriter excelWriter = EasyExcel.write(os) + .withTemplate(templateResource.getStream()) + .autoCloseStream(false) + // 大数值自动转换 防止失真 + .registerConverter(new ExcelBigNumberConvert()) + .build(); + for (int i = 0; i < data.size(); i++) { + WriteSheet writeSheet = EasyExcel.writerSheet(i).build(); + for (Map.Entry map : data.get(i).entrySet()) { + // 设置列表后续还有数据 + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + if (map.getValue() instanceof Collection) { + // 多表导出必须使用 FillWrapper + excelWriter.fill(new FillWrapper(map.getKey(), (Collection) map.getValue()), fillConfig, writeSheet); + } else { + excelWriter.fill(map.getValue(), writeSheet); + } + } + } + excelWriter.finish(); + } + + /** + * 重置响应体 + */ + private static void resetResponse(String sheetName, HttpServletResponse response) throws UnsupportedEncodingException { + String filename = encodingFilename(sheetName); + FileUtils.setAttachmentResponseHeader(response, filename); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); + } + + /** + * 解析导出值 0=男,1=女,2=未知 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String convertByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(StringUtils.SEPARATOR); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[0].equals(value)) { + propertyString.append(itemArray[1] + separator); + break; + } + } + } else { + if (itemArray[0].equals(propertyValue)) { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 反向解析值 男=0,女=1,未知=2 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(StringUtils.SEPARATOR); + for (String item : convertSource) { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) { + for (String value : propertyValue.split(separator)) { + if (itemArray[1].equals(value)) { + propertyString.append(itemArray[0] + separator); + break; + } + } + } else { + if (itemArray[1].equals(propertyValue)) { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 编码文件名 + */ + public static String encodingFilename(String filename) { + return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx"; + } + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ImageRotator.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ImageRotator.java new file mode 100644 index 0000000..e0f77ce --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ImageRotator.java @@ -0,0 +1,77 @@ +package org.dromara.common.excel.utils; + +import javax.imageio.ImageIO; +import java.awt.*; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +/** + * @author admin + */ +public class ImageRotator { + public static String rotate90DegreesCounterClockwise(String image, String path) { + // 读取原始图片 + BufferedImage originalImage = null; + try { + originalImage = ImageIO.read(new File(image)); + } catch (IOException e) { + throw new RuntimeException(e); + } + + // 创建一个旋转后的图片,宽度和高度交换 + BufferedImage rotatedImage = new BufferedImage(originalImage.getHeight(), originalImage.getWidth(), BufferedImage.TYPE_INT_ARGB); + + // 创建Graphics2D对象,用于绘制旋转后的图片 + Graphics2D g2d = rotatedImage.createGraphics(); + + // 逆时针旋转90度 + AffineTransform at = new AffineTransform(); + at.translate(originalImage.getHeight(), 0); + at.rotate(Math.toRadians(90)); + + g2d.setTransform(at); + g2d.drawImage(originalImage, 0, 0, null); + g2d.dispose(); + + String outPath = path + UUID.randomUUID() + ".png"; + + // 保存旋转后的图片 + try { + ImageIO.write(rotatedImage, "PNG", new File(outPath)); + } catch (IOException e) { + throw new RuntimeException(e); + } + return outPath; + } + + public static void main(String[] args) throws IOException { + String path = "G:\\download\\"; + // 读取原始图片 + BufferedImage originalImage = ImageIO.read(new File(path + "input.jpg")); + + // 创建一个旋转后的图片,宽度和高度交换 + BufferedImage rotatedImage = new BufferedImage(originalImage.getHeight(), originalImage.getWidth(), BufferedImage.TYPE_INT_ARGB); + + // 创建Graphics2D对象,用于绘制旋转后的图片 + Graphics2D g2d = rotatedImage.createGraphics(); + + // 逆时针旋转90度 + AffineTransform at = new AffineTransform(); + at.translate(originalImage.getHeight(), 0); + at.rotate(Math.toRadians(90)); + + g2d.setTransform(at); + g2d.drawImage(originalImage, 0, 0, null); + g2d.dispose(); + + // 保存旋转后的图片 + ImageIO.write(rotatedImage, "PNG", new File(path + "out.jpg")); + + System.out.println("图片旋转完成。"); + } + + +} diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/PdfUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/PdfUtil.java new file mode 100644 index 0000000..62f3e2c --- /dev/null +++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/PdfUtil.java @@ -0,0 +1,74 @@ +package org.dromara.common.excel.utils; + + +import com.aspose.words.Document; +import com.aspose.words.FontSettings; +import com.aspose.words.License; +import com.aspose.words.SaveFormat; + +import java.io.*; + +public class PdfUtil { + + + public static boolean getLicense(String licensePath) { + boolean result = false; + InputStream is = null; + try { + is = new FileInputStream(licensePath); + License aposeLic = new License(); + aposeLic.setLicense(is); + result = true; + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (is != null) { + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return result; + } + + public static void main(String[] args) { + String osName = System.getProperty("os.name"); + System.out.println(osName); + } + + public static boolean doc2pdf(String inPath, String outPath, String licensePath) { + if (!getLicense(licensePath)) { // 验证License 若不验证则转化出的pdf文档会有水印产生 + return false; + } + FileOutputStream os = null; + try { + long old = System.currentTimeMillis(); + File file = new File(outPath); // 新建一个空白pdf文档 + os = new FileOutputStream(file); + Document doc = new Document(inPath); // Address是将要被转化的word文档 + String osName = System.getProperty("os.name"); + if (osName != null && osName.trim().toLowerCase().contains("linux")) { + FontSettings.setFontsFolder("/usr/share/fonts/chinese" + File.separator, true);//此处处理乱码和小方块 + } + doc.save(os, SaveFormat.PDF);// 全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, + // EPUB, XPS, SWF 相互转换 + long now = System.currentTimeMillis(); + System.out.println("pdf转换成功,共耗时:" + ((now - old) / 1000.0) + "秒"); // 转化用时 + } catch (Exception e) { + e.printStackTrace(); + return false; + } finally { + if (os != null) { + try { + os.flush(); + os.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return true; + } +} diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml new file mode 100644 index 0000000..64418b4 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml @@ -0,0 +1,41 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-idempotent + + + ruoyi-common-idempotent 幂等功能 + + + + + org.dromara + ruoyi-common-json + + + + org.dromara + ruoyi-common-redis + + + + cn.hutool + hutool-crypto + + + + cn.dev33 + sa-token-core + + + + + diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java new file mode 100644 index 0000000..42ae802 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java @@ -0,0 +1,29 @@ +package org.dromara.common.idempotent.annotation; + +import java.lang.annotation.*; +import java.util.concurrent.TimeUnit; + +/** + * 自定义注解防止表单重复提交 + * + * @author Lion Li + */ +@Inherited +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RepeatSubmit { + + /** + * 间隔时间(ms),小于此时间视为重复提交 + */ + int interval() default 5000; + + TimeUnit timeUnit() default TimeUnit.MILLISECONDS; + + /** + * 提示消息 支持国际化 格式为 {code} + */ + String message() default "{repeat.submit.message}"; + +} diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java new file mode 100644 index 0000000..5a27e91 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java @@ -0,0 +1,146 @@ +package org.dromara.common.idempotent.aspectj; + +import cn.dev33.satoken.SaManager; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.crypto.SecureUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.dromara.common.core.constant.GlobalConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MessageUtils; +import org.dromara.common.core.utils.ServletUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; + +import java.time.Duration; +import java.util.Collection; +import java.util.Map; +import java.util.StringJoiner; + +/** + * 防止重复提交(参考美团GTIS防重系统) + * + * @author Lion Li + */ +@Aspect +public class RepeatSubmitAspect { + + private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); + + @Before("@annotation(repeatSubmit)") + public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { + // 如果注解不为0 则使用注解数值 + long interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval()); + + if (interval < 1000) { + throw new ServiceException("重复提交间隔时间不能小于'1'秒"); + } + HttpServletRequest request = ServletUtils.getRequest(); + String nowParams = argsArrayToString(point.getArgs()); + + // 请求地址(作为存放cache的key值) + String url = request.getRequestURI(); + + // 唯一值(没有消息头则使用请求地址) + String submitKey = StringUtils.trimToEmpty(request.getHeader(SaManager.getConfig().getTokenName())); + + submitKey = SecureUtil.md5(submitKey + ":" + nowParams); + // 唯一标识(指定key + url + 消息头) + String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey; + if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) { + KEY_CACHE.set(cacheRepeatKey); + } else { + String message = repeatSubmit.message(); + if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) { + message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1)); + } + throw new ServiceException(message); + } + } + + /** + * 处理完请求后执行 + * + * @param joinPoint 切点 + */ + @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult") + public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) { + if (jsonResult instanceof R r) { + try { + // 成功则不删除redis数据 保证在有效时间内无法重复提交 + if (r.getCode() == R.SUCCESS) { + return; + } + RedisUtils.deleteObject(KEY_CACHE.get()); + } finally { + KEY_CACHE.remove(); + } + } + } + + /** + * 拦截异常操作 + * + * @param joinPoint 切点 + * @param e 异常 + */ + @AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e") + public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) { + RedisUtils.deleteObject(KEY_CACHE.get()); + KEY_CACHE.remove(); + } + + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray) { + StringJoiner params = new StringJoiner(" "); + if (ArrayUtil.isEmpty(paramsArray)) { + return params.toString(); + } + for (Object o : paramsArray) { + if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { + params.add(JsonUtils.toJsonString(o)); + } + } + return params.toString(); + } + + /** + * 判断是否需要过滤的对象。 + * + * @param o 对象信息。 + * @return 如果是需要过滤的对象,则返回true;否则返回false。 + */ + @SuppressWarnings("rawtypes") + public boolean isFilterObject(final Object o) { + Class clazz = o.getClass(); + if (clazz.isArray()) { + return MultipartFile.class.isAssignableFrom(clazz.getComponentType()); + } else if (Collection.class.isAssignableFrom(clazz)) { + Collection collection = (Collection) o; + for (Object value : collection) { + return value instanceof MultipartFile; + } + } else if (Map.class.isAssignableFrom(clazz)) { + Map map = (Map) o; + for (Object value : map.values()) { + return value instanceof MultipartFile; + } + } + return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse + || o instanceof BindingResult; + } + +} diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java new file mode 100644 index 0000000..fcb9d03 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java @@ -0,0 +1,21 @@ +package org.dromara.common.idempotent.config; + +import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConfiguration; + +/** + * 幂等功能配置 + * + * @author Lion Li + */ +@AutoConfiguration(after = RedisConfiguration.class) +public class IdempotentConfig { + + @Bean + public RepeatSubmitAspect repeatSubmitAspect() { + return new RepeatSubmitAspect(); + } + +} diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f2fa958 --- /dev/null +++ b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.idempotent.config.IdempotentConfig diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml new file mode 100644 index 0000000..3a4a0cb --- /dev/null +++ b/ruoyi-common/ruoyi-common-job/pom.xml @@ -0,0 +1,46 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-job + + + ruoyi-common-job 定时任务 + + + + + + org.springframework.boot + spring-boot-autoconfigure + + + + + com.aizuda + snail-job-client-starter + + + com.aizuda + snail-job-client-job-core + + + + org.projectlombok + lombok + + + + org.dromara + ruoyi-common-core + + + + diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java new file mode 100644 index 0000000..cba3753 --- /dev/null +++ b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java @@ -0,0 +1,37 @@ +package org.dromara.common.job.config; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.ILoggingEvent; +import com.aizuda.snailjob.client.common.appender.SnailLogbackAppender; +import com.aizuda.snailjob.client.common.event.SnailClientStartingEvent; +import com.aizuda.snailjob.client.starter.EnableSnailJob; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + * 启动定时任务 + * + * @author opensnail + * @date 2024-05-17 + */ +@AutoConfiguration +@ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true") +@EnableScheduling +@EnableSnailJob +public class SnailJobConfig { + + @EventListener(SnailClientStartingEvent.class) + public void onStarting(SnailClientStartingEvent event) { + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + SnailLogbackAppender ca = new SnailLogbackAppender<>(); + ca.setName("snail_log_appender"); + ca.start(); + Logger rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME); + rootLogger.addAppender(ca); + } + +} diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3aa1881 --- /dev/null +++ b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.job.config.SnailJobConfig diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/ruoyi-common/ruoyi-common-json/pom.xml new file mode 100644 index 0000000..870df5c --- /dev/null +++ b/ruoyi-common/ruoyi-common-json/pom.xml @@ -0,0 +1,37 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-json + + + ruoyi-common-json 序列化模块 + + + + + org.dromara + ruoyi-common-core + + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java new file mode 100644 index 0000000..36400bc --- /dev/null +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java @@ -0,0 +1,47 @@ +package org.dromara.common.json.config; + +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.json.handler.BigNumberSerializer; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.context.annotation.Bean; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.TimeZone; + +/** + * jackson 配置 + * + * @author Lion Li + */ +@Slf4j +@AutoConfiguration(before = JacksonAutoConfiguration.class) +public class JacksonConfig { + + @Bean + public Jackson2ObjectMapperBuilderCustomizer customizer() { + return builder -> { + // 全局配置序列化返回 JSON 处理 + JavaTimeModule javaTimeModule = new JavaTimeModule(); + javaTimeModule.addSerializer(Long.class, BigNumberSerializer.INSTANCE); + javaTimeModule.addSerializer(Long.TYPE, BigNumberSerializer.INSTANCE); + javaTimeModule.addSerializer(BigInteger.class, BigNumberSerializer.INSTANCE); + javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter)); + javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter)); + builder.modules(javaTimeModule); + builder.timeZone(TimeZone.getDefault()); + log.info("初始化 jackson 配置"); + }; + } + +} diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java new file mode 100644 index 0000000..8752353 --- /dev/null +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java @@ -0,0 +1,42 @@ +package org.dromara.common.json.handler; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; +import com.fasterxml.jackson.databind.ser.std.NumberSerializer; + +import java.io.IOException; + +/** + * 超出 JS 最大最小值 处理 + * + * @author Lion Li + */ +@JacksonStdImpl +public class BigNumberSerializer extends NumberSerializer { + + /** + * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来 + */ + private static final long MAX_SAFE_INTEGER = 9007199254740991L; + private static final long MIN_SAFE_INTEGER = -9007199254740991L; + + /** + * 提供实例 + */ + public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class); + + public BigNumberSerializer(Class rawType) { + super(rawType); + } + + @Override + public void serialize(Number value, JsonGenerator gen, SerializerProvider provider) throws IOException { + // 超出范围 序列化为字符串 + if (value.longValue() > MIN_SAFE_INTEGER && value.longValue() < MAX_SAFE_INTEGER) { + super.serialize(value, gen, provider); + } else { + gen.writeString(value.toString()); + } + } +} diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java new file mode 100644 index 0000000..65c2faa --- /dev/null +++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java @@ -0,0 +1,170 @@ +package org.dromara.common.json.utils; + +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.exc.MismatchedInputException; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * JSON 工具类 + * + * @author 芋道源码 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class JsonUtils { + + private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class); + + public static ObjectMapper getObjectMapper() { + return OBJECT_MAPPER; + } + + /** + * 将对象转换为JSON格式的字符串 + * + * @param object 要转换的对象 + * @return JSON格式的字符串,如果对象为null,则返回null + * @throws RuntimeException 如果转换过程中发生JSON处理异常,则抛出运行时异常 + */ + public static String toJsonString(Object object) { + if (ObjectUtil.isNull(object)) { + return null; + } + try { + return OBJECT_MAPPER.writeValueAsString(object); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + /** + * 将JSON格式的字符串转换为指定类型的对象 + * + * @param text JSON格式的字符串 + * @param clazz 要转换的目标对象类型 + * @param 目标对象的泛型类型 + * @return 转换后的对象,如果字符串为空则返回null + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static T parseObject(String text, Class clazz) { + if (StringUtils.isEmpty(text)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(text, clazz); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 将字节数组转换为指定类型的对象 + * + * @param bytes 字节数组 + * @param clazz 要转换的目标对象类型 + * @param 目标对象的泛型类型 + * @return 转换后的对象,如果字节数组为空则返回null + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static T parseObject(byte[] bytes, Class clazz) { + if (ArrayUtil.isEmpty(bytes)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(bytes, clazz); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 将JSON格式的字符串转换为指定类型的对象,支持复杂类型 + * + * @param text JSON格式的字符串 + * @param typeReference 指定类型的TypeReference对象 + * @param 目标对象的泛型类型 + * @return 转换后的对象,如果字符串为空则返回null + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static T parseObject(String text, TypeReference typeReference) { + if (StringUtils.isBlank(text)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(text, typeReference); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 将JSON格式的字符串转换为Dict对象 + * + * @param text JSON格式的字符串 + * @return 转换后的Dict对象,如果字符串为空或者不是JSON格式则返回null + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static Dict parseMap(String text) { + if (StringUtils.isBlank(text)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class)); + } catch (MismatchedInputException e) { + // 类型不匹配说明不是json + return null; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 将JSON格式的字符串转换为Dict对象的列表 + * + * @param text JSON格式的字符串 + * @return 转换后的Dict对象的列表,如果字符串为空则返回null + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static List parseArrayMap(String text) { + if (StringUtils.isBlank(text)) { + return null; + } + try { + return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * 将JSON格式的字符串转换为指定类型对象的列表 + * + * @param text JSON格式的字符串 + * @param clazz 要转换的目标对象类型 + * @param 目标对象的泛型类型 + * @return 转换后的对象的列表,如果字符串为空则返回空列表 + * @throws RuntimeException 如果转换过程中发生IO异常,则抛出运行时异常 + */ + public static List parseArray(String text, Class clazz) { + if (StringUtils.isEmpty(text)) { + return new ArrayList<>(); + } + try { + return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, clazz)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1625397 --- /dev/null +++ b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.json.config.JacksonConfig diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml new file mode 100644 index 0000000..1e2b33b --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -0,0 +1,32 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-log + + + ruoyi-common-log 日志记录 + + + + + + org.dromara + ruoyi-common-satoken + + + + org.dromara + ruoyi-common-json + + + + + diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java new file mode 100644 index 0000000..2dced97 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java @@ -0,0 +1,48 @@ +package org.dromara.common.log.annotation; + +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.log.enums.OperatorType; + +import java.lang.annotation.*; + +/** + * 自定义操作日志记录注解 + * + * @author ruoyi + */ +@Target({ElementType.PARAMETER, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Log { + /** + * 模块 + */ + String title() default ""; + + /** + * 功能 + */ + BusinessType businessType() default BusinessType.OTHER; + + /** + * 操作人类别 + */ + OperatorType operatorType() default OperatorType.MANAGE; + + /** + * 是否保存请求的参数 + */ + boolean isSaveRequestData() default true; + + /** + * 是否保存响应的参数 + */ + boolean isSaveResponseData() default true; + + + /** + * 排除指定的请求参数 + */ + String[] excludeParamNames() default {}; + +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java new file mode 100644 index 0000000..8ab2719 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java @@ -0,0 +1,219 @@ +package org.dromara.common.log.aspect; + +import cn.hutool.core.lang.Dict; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.time.StopWatch; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.utils.ServletUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessStatus; +import org.dromara.common.log.event.OperLogEvent; +import org.dromara.common.satoken.utils.LoginHelper; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.http.HttpMethod; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Collection; +import java.util.Map; +import java.util.StringJoiner; + +/** + * 操作日志记录处理 + * + * @author Lion Li + */ +@Slf4j +@Aspect +@AutoConfiguration +public class LogAspect { + + /** + * 排除敏感属性字段 + */ + public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; + + + /** + * 计时 key + */ + private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); + + /** + * 处理请求前执行 + */ + @Before(value = "@annotation(controllerLog)") + public void doBefore(JoinPoint joinPoint, Log controllerLog) { + StopWatch stopWatch = new StopWatch(); + KEY_CACHE.set(stopWatch); + stopWatch.start(); + } + + /** + * 处理完请求后执行 + * + * @param joinPoint 切点 + */ + @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") + public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) { + handleLog(joinPoint, controllerLog, null, jsonResult); + } + + /** + * 拦截异常操作 + * + * @param joinPoint 切点 + * @param e 异常 + */ + @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") + public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) { + handleLog(joinPoint, controllerLog, e, null); + } + + protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { + try { + + // *========数据库日志=========*// + OperLogEvent operLog = new OperLogEvent(); + operLog.setTenantId(LoginHelper.getTenantId()); + operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); + // 请求的地址 + String ip = ServletUtils.getClientIP(); + operLog.setOperIp(ip); + operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); + LoginUser loginUser = LoginHelper.getLoginUser(); + operLog.setOperName(loginUser.getUsername()); + operLog.setDeptName(loginUser.getDeptName()); + + if (e != null) { + operLog.setStatus(BusinessStatus.FAIL.ordinal()); + operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 3800)); + } + // 设置方法名称 + String className = joinPoint.getTarget().getClass().getName(); + String methodName = joinPoint.getSignature().getName(); + operLog.setMethod(className + "." + methodName + "()"); + // 设置请求方式 + operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); + // 处理设置注解上的参数 + getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); + // 设置消耗时间 + StopWatch stopWatch = KEY_CACHE.get(); + stopWatch.stop(); + operLog.setCostTime(stopWatch.getDuration().toMillis()); + // 发布事件保存数据库 + SpringUtils.context().publishEvent(operLog); + } catch (Exception exp) { + // 记录本地异常日志 + log.error("异常信息:{}", exp.getMessage()); + } finally { + KEY_CACHE.remove(); + } + } + + /** + * 获取注解中对方法的描述信息 用于Controller层注解 + * + * @param log 日志 + * @param operLog 操作日志 + * @throws Exception + */ + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) throws Exception { + // 设置action动作 + operLog.setBusinessType(log.businessType().ordinal()); + // 设置标题 + operLog.setTitle(log.title()); + // 设置操作人类别 + operLog.setOperatorType(log.operatorType().ordinal()); + // 是否需要保存request,参数和值 + if (log.isSaveRequestData()) { + // 获取参数的信息,传入到数据库中。 + setRequestValue(joinPoint, operLog, log.excludeParamNames()); + } + // 是否需要保存response,参数和值 + if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) { + operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 3800)); + } + } + + /** + * 获取请求的参数,放到log中 + * + * @param operLog 操作日志 + * @throws Exception 异常 + */ + private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception { + Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); + String requestMethod = operLog.getRequestMethod(); + if (MapUtil.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name())) { + String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); + operLog.setOperParam(StringUtils.substring(params, 0, 3800)); + } else { + MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES); + MapUtil.removeAny(paramsMap, excludeParamNames); + operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 3800)); + } + } + + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) { + StringJoiner params = new StringJoiner(" "); + if (ArrayUtil.isEmpty(paramsArray)) { + return params.toString(); + } + for (Object o : paramsArray) { + if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) { + String str = JsonUtils.toJsonString(o); + Dict dict = JsonUtils.parseMap(str); + if (MapUtil.isNotEmpty(dict)) { + MapUtil.removeAny(dict, EXCLUDE_PROPERTIES); + MapUtil.removeAny(dict, excludeParamNames); + str = JsonUtils.toJsonString(dict); + } + params.add(str); + } + } + return params.toString(); + } + + /** + * 判断是否需要过滤的对象。 + * + * @param o 对象信息。 + * @return 如果是需要过滤的对象,则返回true;否则返回false。 + */ + @SuppressWarnings("rawtypes") + public boolean isFilterObject(final Object o) { + Class clazz = o.getClass(); + if (clazz.isArray()) { + return MultipartFile.class.isAssignableFrom(clazz.getComponentType()); + } else if (Collection.class.isAssignableFrom(clazz)) { + Collection collection = (Collection) o; + for (Object value : collection) { + return value instanceof MultipartFile; + } + } else if (Map.class.isAssignableFrom(clazz)) { + Map map = (Map) o; + for (Object value : map.values()) { + return value instanceof MultipartFile; + } + } + return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse + || o instanceof BindingResult; + } +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java new file mode 100644 index 0000000..d303dc3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java @@ -0,0 +1,18 @@ +package org.dromara.common.log.enums; + +/** + * 操作状态 + * + * @author ruoyi + */ +public enum BusinessStatus { + /** + * 成功 + */ + SUCCESS, + + /** + * 失败 + */ + FAIL, +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java new file mode 100644 index 0000000..2d25ebb --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java @@ -0,0 +1,58 @@ +package org.dromara.common.log.enums; + +/** + * 业务操作类型 + * + * @author ruoyi + */ +public enum BusinessType { + /** + * 其它 + */ + OTHER, + + /** + * 新增 + */ + INSERT, + + /** + * 修改 + */ + UPDATE, + + /** + * 删除 + */ + DELETE, + + /** + * 授权 + */ + GRANT, + + /** + * 导出 + */ + EXPORT, + + /** + * 导入 + */ + IMPORT, + + /** + * 强退 + */ + FORCE, + + /** + * 生成代码 + */ + GENCODE, + + /** + * 清空数据 + */ + CLEAN, +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java new file mode 100644 index 0000000..de9328b --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java @@ -0,0 +1,23 @@ +package org.dromara.common.log.enums; + +/** + * 操作人类别 + * + * @author ruoyi + */ +public enum OperatorType { + /** + * 其它 + */ + OTHER, + + /** + * 后台用户 + */ + MANAGE, + + /** + * 手机端用户 + */ + MOBILE +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java new file mode 100644 index 0000000..ed4a4db --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java @@ -0,0 +1,51 @@ +package org.dromara.common.log.event; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 登录事件 + * + * @author Lion Li + */ + +@Data +public class LogininforEvent implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 用户账号 + */ + private String username; + + /** + * 登录状态 0成功 1失败 + */ + private String status; + + /** + * 提示消息 + */ + private String message; + + /** + * 请求体 + */ + private HttpServletRequest request; + + /** + * 其他参数 + */ + private Object[] args; + +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java new file mode 100644 index 0000000..0386192 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java @@ -0,0 +1,115 @@ +package org.dromara.common.log.event; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 操作日志事件 + * + * @author Lion Li + */ + +@Data +public class OperLogEvent implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 日志主键 + */ + private Long operId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 操作模块 + */ + private String title; + + /** + * 业务类型(0其它 1新增 2修改 3删除) + */ + private Integer businessType; + + /** + * 业务类型数组 + */ + private Integer[] businessTypes; + + /** + * 请求方法 + */ + private String method; + + /** + * 请求方式 + */ + private String requestMethod; + + /** + * 操作类别(0其它 1后台用户 2手机端用户) + */ + private Integer operatorType; + + /** + * 操作人员 + */ + private String operName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 请求url + */ + private String operUrl; + + /** + * 操作地址 + */ + private String operIp; + + /** + * 操作地点 + */ + private String operLocation; + + /** + * 请求参数 + */ + private String operParam; + + /** + * 返回参数 + */ + private String jsonResult; + + /** + * 操作状态(0正常 1异常) + */ + private Integer status; + + /** + * 错误消息 + */ + private String errorMsg; + + /** + * 操作时间 + */ + private Date operTime; + + /** + * 消耗时间 + */ + private Long costTime; +} diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6893020 --- /dev/null +++ b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/ruoyi-common/ruoyi-common-mail/pom.xml new file mode 100644 index 0000000..c0e1b2e --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/pom.xml @@ -0,0 +1,34 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-mail + + + ruoyi-common-mail 邮件模块 + + + + + org.dromara + ruoyi-common-core + + + + jakarta.mail + jakarta.mail-api + + + org.eclipse.angus + jakarta.mail + + + + diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java new file mode 100644 index 0000000..0ea3007 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java @@ -0,0 +1,37 @@ +package org.dromara.common.mail.config; + +import cn.hutool.extra.mail.MailAccount; +import org.dromara.common.mail.config.properties.MailProperties; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; + +/** + * JavaMail 配置 + * + * @author Michelle.Chung + */ +@AutoConfiguration +@EnableConfigurationProperties(MailProperties.class) +public class MailConfig { + + @Bean + @ConditionalOnProperty(value = "mail.enabled", havingValue = "true") + public MailAccount mailAccount(MailProperties mailProperties) { + MailAccount account = new MailAccount(); + account.setHost(mailProperties.getHost()); + account.setPort(mailProperties.getPort()); + account.setAuth(mailProperties.getAuth()); + account.setFrom(mailProperties.getFrom()); + account.setUser(mailProperties.getUser()); + account.setPass(mailProperties.getPass()); + account.setSocketFactoryPort(mailProperties.getPort()); + account.setStarttlsEnable(mailProperties.getStarttlsEnable()); + account.setSslEnable(mailProperties.getSslEnable()); + account.setTimeout(mailProperties.getTimeout()); + account.setConnectionTimeout(mailProperties.getConnectionTimeout()); + return account; + } + +} diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java new file mode 100644 index 0000000..e44aa3d --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java @@ -0,0 +1,75 @@ +package org.dromara.common.mail.config.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * JavaMail 配置属性 + * + * @author Michelle.Chung + */ +@Data +@ConfigurationProperties(prefix = "mail") +public class MailProperties { + + /** + * 过滤开关 + */ + private Boolean enabled; + + /** + * SMTP服务器域名 + */ + private String host; + + /** + * SMTP服务端口 + */ + private Integer port; + + /** + * 是否需要用户名密码验证 + */ + private Boolean auth; + + /** + * 用户名 + */ + private String user; + + /** + * 密码 + */ + private String pass; + + /** + * 发送方,遵循RFC-822标准
+ * 发件人可以是以下形式: + * + *
+     * 1. user@xxx.xx
+     * 2.  name <user@xxx.xx>
+     * 
+ */ + private String from; + + /** + * 使用 STARTTLS安全连接,STARTTLS是对纯文本通信协议的扩展。它将纯文本连接升级为加密连接(TLS或SSL), 而不是使用一个单独的加密通信端口。 + */ + private Boolean starttlsEnable; + + /** + * 使用 SSL安全连接 + */ + private Boolean sslEnable; + + /** + * SMTP超时时长,单位毫秒,缺省值不超时 + */ + private Long timeout; + + /** + * Socket连接超时值,单位毫秒,缺省值不超时 + */ + private Long connectionTimeout; +} diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java new file mode 100644 index 0000000..8fa3a8a --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java @@ -0,0 +1,469 @@ +package org.dromara.common.mail.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.CharUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.mail.JakartaMail; +import cn.hutool.extra.mail.JakartaUserPassAuthenticator; +import cn.hutool.extra.mail.MailAccount; +import jakarta.mail.Authenticator; +import jakarta.mail.Session; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; + +import java.io.File; +import java.io.InputStream; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +/** + * 邮件工具类 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class MailUtils { + + private static final MailAccount ACCOUNT = SpringUtils.getBean(MailAccount.class); + + /** + * 获取邮件发送实例 + */ + public static MailAccount getMailAccount() { + return ACCOUNT; + } + + /** + * 获取邮件发送实例 (自定义发送人以及授权码) + * + * @param user 发送人 + * @param pass 授权码 + */ + public static MailAccount getMailAccount(String from, String user, String pass) { + ACCOUNT.setFrom(StringUtils.blankToDefault(from, ACCOUNT.getFrom())); + ACCOUNT.setUser(StringUtils.blankToDefault(user, ACCOUNT.getUser())); + ACCOUNT.setPass(StringUtils.blankToDefault(pass, ACCOUNT.getPass())); + return ACCOUNT; + } + + /** + * 使用配置文件中设置的账户发送文本邮件,发送给单个或多个收件人
+ * 多个收件人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人 + * @param subject 标题 + * @param content 正文 + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String sendText(String to, String subject, String content, File... files) { + return send(to, subject, content, false, files); + } + + /** + * 使用配置文件中设置的账户发送HTML邮件,发送给单个或多个收件人
+ * 多个收件人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人 + * @param subject 标题 + * @param content 正文 + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String sendHtml(String to, String subject, String content, File... files) { + return send(to, subject, content, true, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送单个或多个收件人
+ * 多个收件人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + */ + public static String send(String to, String subject, String content, boolean isHtml, File... files) { + return send(splitAddress(to), subject, content, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送单个或多个收件人
+ * 多个收件人、抄送人、密送人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param cc 抄送人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param bcc 密送人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + * @since 4.0.3 + */ + public static String send(String to, String cc, String bcc, String subject, String content, boolean isHtml, File... files) { + return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送文本邮件,发送给多人 + * + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param files 附件列表 + * @return message-id + */ + public static String sendText(Collection tos, String subject, String content, File... files) { + return send(tos, subject, content, false, files); + } + + /** + * 使用配置文件中设置的账户发送HTML邮件,发送给多人 + * + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String sendHtml(Collection tos, String subject, String content, File... files) { + return send(tos, subject, content, true, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送给多人 + * + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + */ + public static String send(Collection tos, String subject, String content, boolean isHtml, File... files) { + return send(tos, null, null, subject, content, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送给多人 + * + * @param tos 收件人列表 + * @param ccs 抄送人列表,可以为null或空 + * @param bccs 密送人列表,可以为null或空 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + * @since 4.0.3 + */ + public static String send(Collection tos, Collection ccs, Collection bccs, String subject, String content, boolean isHtml, File... files) { + return send(getMailAccount(), true, tos, ccs, bccs, subject, content, null, isHtml, files); + } + + // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件认证对象 + * @param to 收件人,多个收件人逗号或者分号隔开 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String send(MailAccount mailAccount, String to, String subject, String content, boolean isHtml, File... files) { + return send(mailAccount, splitAddress(to), subject, content, isHtml, files); + } + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件帐户信息 + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + */ + public static String send(MailAccount mailAccount, Collection tos, String subject, String content, boolean isHtml, File... files) { + return send(mailAccount, tos, null, null, subject, content, isHtml, files); + } + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件帐户信息 + * @param tos 收件人列表 + * @param ccs 抄送人列表,可以为null或空 + * @param bccs 密送人列表,可以为null或空 + * @param subject 标题 + * @param content 正文 + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 4.0.3 + */ + public static String send(MailAccount mailAccount, Collection tos, Collection ccs, Collection bccs, String subject, String content, boolean isHtml, File... files) { + return send(mailAccount, false, tos, ccs, bccs, subject, content, null, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送HTML邮件,发送给单个或多个收件人
+ * 多个收件人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String sendHtml(String to, String subject, String content, Map imageMap, File... files) { + return send(to, subject, content, imageMap, true, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送单个或多个收件人
+ * 多个收件人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + */ + public static String send(String to, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(splitAddress(to), subject, content, imageMap, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送单个或多个收件人
+ * 多个收件人、抄送人、密送人可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * + * @param to 收件人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param cc 抄送人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param bcc 密送人,可以使用逗号“,”分隔,也可以通过分号“;”分隔 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + * @since 4.0.3 + */ + public static String send(String to, String cc, String bcc, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, imageMap, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送HTML邮件,发送给多人 + * + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String sendHtml(Collection tos, String subject, String content, Map imageMap, File... files) { + return send(tos, subject, content, imageMap, true, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送给多人 + * + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + */ + public static String send(Collection tos, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(tos, null, null, subject, content, imageMap, isHtml, files); + } + + /** + * 使用配置文件中设置的账户发送邮件,发送给多人 + * + * @param tos 收件人列表 + * @param ccs 抄送人列表,可以为null或空 + * @param bccs 密送人列表,可以为null或空 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML + * @param files 附件列表 + * @return message-id + * @since 4.0.3 + */ + public static String send(Collection tos, Collection ccs, Collection bccs, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(getMailAccount(), true, tos, ccs, bccs, subject, content, imageMap, isHtml, files); + } + + // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件认证对象 + * @param to 收件人,多个收件人逗号或者分号隔开 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 3.2.0 + */ + public static String send(MailAccount mailAccount, String to, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(mailAccount, splitAddress(to), subject, content, imageMap, isHtml, files); + } + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件帐户信息 + * @param tos 收件人列表 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 4.6.3 + */ + public static String send(MailAccount mailAccount, Collection tos, String subject, String content, Map imageMap, boolean isHtml, File... files) { + return send(mailAccount, tos, null, null, subject, content, imageMap, isHtml, files); + } + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件帐户信息 + * @param tos 收件人列表 + * @param ccs 抄送人列表,可以为null或空 + * @param bccs 密送人列表,可以为null或空 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:$IMAGE_PLACEHOLDER + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 4.6.3 + */ + public static String send(MailAccount mailAccount, Collection tos, Collection ccs, Collection bccs, String subject, String content, Map imageMap, + boolean isHtml, File... files) { + return send(mailAccount, false, tos, ccs, bccs, subject, content, imageMap, isHtml, files); + } + + /** + * 根据配置文件,获取邮件客户端会话 + * + * @param mailAccount 邮件账户配置 + * @param isSingleton 是否单例(全局共享会话) + * @return {@link Session} + * @since 5.5.7 + */ + public static Session getSession(MailAccount mailAccount, boolean isSingleton) { + Authenticator authenticator = null; + if (mailAccount.isAuth()) { + authenticator = new JakartaUserPassAuthenticator(mailAccount.getUser(), mailAccount.getPass()); + } + + return isSingleton ? Session.getDefaultInstance(mailAccount.getSmtpProps(), authenticator) + : Session.getInstance(mailAccount.getSmtpProps(), authenticator); + } + + // ------------------------------------------------------------------------------------------------------------------------ Private method start + + /** + * 发送邮件给多人 + * + * @param mailAccount 邮件帐户信息 + * @param useGlobalSession 是否全局共享Session + * @param tos 收件人列表 + * @param ccs 抄送人列表,可以为null或空 + * @param bccs 密送人列表,可以为null或空 + * @param subject 标题 + * @param content 正文 + * @param imageMap 图片与占位符,占位符格式为cid:${cid} + * @param isHtml 是否为HTML格式 + * @param files 附件列表 + * @return message-id + * @since 4.6.3 + */ + private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection tos, Collection ccs, Collection bccs, String subject, String content, + Map imageMap, boolean isHtml, File... files) { + final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession); + + // 可选抄送人 + if (CollUtil.isNotEmpty(ccs)) { + mail.setCcs(ccs.toArray(new String[0])); + } + // 可选密送人 + if (CollUtil.isNotEmpty(bccs)) { + mail.setBccs(bccs.toArray(new String[0])); + } + + mail.setTos(tos.toArray(new String[0])); + mail.setTitle(subject); + mail.setContent(content); + mail.setHtml(isHtml); + mail.setFiles(files); + + // 图片 + if (MapUtil.isNotEmpty(imageMap)) { + for (Entry entry : imageMap.entrySet()) { + mail.addImage(entry.getKey(), entry.getValue()); + // 关闭流 + IoUtil.close(entry.getValue()); + } + } + + return mail.send(); + } + + /** + * 将多个联系人转为列表,分隔符为逗号或者分号 + * + * @param addresses 多个联系人,如果为空返回null + * @return 联系人列表 + */ + private static List splitAddress(String addresses) { + if (StrUtil.isBlank(addresses)) { + return null; + } + + List result; + if (StrUtil.contains(addresses, CharUtil.COMMA)) { + result = StrUtil.splitTrim(addresses, CharUtil.COMMA); + } else if (StrUtil.contains(addresses, ';')) { + result = StrUtil.splitTrim(addresses, ';'); + } else { + result = CollUtil.newArrayList(addresses); + } + return result; + } + // ------------------------------------------------------------------------------------------------------------------------ Private method end +} diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..ef0cf11 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.mail.config.MailConfig diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml new file mode 100644 index 0000000..d79ba28 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -0,0 +1,52 @@ + + + + org.dromara + ruoyi-common + ${revision} + + 4.0.0 + + ruoyi-common-mybatis + + + ruoyi-common-mybatis 数据库服务 + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-satoken + + + + + com.baomidou + dynamic-datasource-spring-boot3-starter + + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + + com.baomidou + mybatis-plus-jsqlparser + + + + + p6spy + p6spy + + + + diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java new file mode 100644 index 0000000..2879b9d --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java @@ -0,0 +1,40 @@ +package org.dromara.common.mybatis.annotation; + +import java.lang.annotation.*; + +/** + * 数据权限注解,用于标记数据权限的占位符关键字和替换值 + *

+ * 一个注解只能对应一个模板 + *

+ * + * @author Lion Li + * @version 3.5.0 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataColumn { + + /** + * 数据权限模板的占位符关键字,默认为 "deptName" + * + * @return 占位符关键字数组 + */ + String[] key() default "deptName"; + + /** + * 数据权限模板的占位符替换值,默认为 "dept_id" + * + * @return 占位符替换值数组 + */ + String[] value() default "dept_id"; + + /** + * 权限标识符 用于通过菜单权限标识符来获取数据权限 + * 拥有此标识符的角色 将不会拼接此角色的数据过滤sql + * + * @return 权限标识符 + */ + String permission() default ""; +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java new file mode 100644 index 0000000..f5f22d5 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java @@ -0,0 +1,30 @@ +package org.dromara.common.mybatis.annotation; + +import java.lang.annotation.*; + +/** + * 数据权限组注解,用于标记数据权限配置数组 + * + * @author Lion Li + * @version 3.5.0 + */ +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataPermission { + + /** + * 数据权限配置数组,用于指定数据权限的占位符关键字和替换值 + * + * @return 数据权限配置数组 + */ + DataColumn[] value(); + + /** + * 权限拼接标识符(用于指定连接语句的sql符号) + * 如不填 默认 select 用 OR 其他语句用 AND + * 内容 OR 或者 AND + */ + String joinStr() default ""; + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java new file mode 100644 index 0000000..1c83cc3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java @@ -0,0 +1,50 @@ +package org.dromara.common.mybatis.aspect; + +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.helper.DataPermissionHelper; + +/** + * 数据权限处理 + * + * @author Lion Li + */ +@Slf4j +@Aspect +public class DataPermissionAspect { + + /** + * 处理请求前执行 + */ + @Before(value = "@annotation(dataPermission)") + public void doBefore(JoinPoint joinPoint, DataPermission dataPermission) { + DataPermissionHelper.setPermission(dataPermission); + } + + /** + * 处理完请求后执行 + * + * @param joinPoint 切点 + */ + @AfterReturning(pointcut = "@annotation(dataPermission)") + public void doAfterReturning(JoinPoint joinPoint, DataPermission dataPermission) { + DataPermissionHelper.removePermission(); + } + + /** + * 拦截异常操作 + * + * @param joinPoint 切点 + * @param e 异常 + */ + @AfterThrowing(value = "@annotation(dataPermission)", throwing = "e") + public void doAfterThrowing(JoinPoint joinPoint, DataPermission dataPermission, Exception e) { + DataPermissionHelper.removePermission(); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java new file mode 100644 index 0000000..00c2691 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java @@ -0,0 +1,138 @@ +package org.dromara.common.mybatis.config; + +import cn.hutool.core.net.NetUtil; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler; +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor; +import org.dromara.common.core.factory.YmlPropertySourceFactory; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.mybatis.aspect.DataPermissionAspect; +import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler; +import org.dromara.common.mybatis.handler.MybatisExceptionHandler; +import org.dromara.common.mybatis.handler.PlusPostInitTableInfoHandler; +import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.BeansException; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.PropertySource; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * mybatis-plus配置类(下方注释有插件介绍) + * + * @author Lion Li + */ +@EnableTransactionManagement(proxyTargetClass = true) +@MapperScan("${mybatis-plus.mapperPackage}") +@PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class) +public class MybatisPlusConfig { + + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 多租户插件 必须放到第一位 + try { + TenantLineInnerInterceptor tenant = SpringUtils.getBean(TenantLineInnerInterceptor.class); + interceptor.addInnerInterceptor(tenant); + } catch (BeansException ignore) { + } + // 数据权限处理 + interceptor.addInnerInterceptor(dataPermissionInterceptor()); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + return interceptor; + } + + /** + * 数据权限拦截器 + */ + public PlusDataPermissionInterceptor dataPermissionInterceptor() { + return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage")); + } + + /** + * 数据权限切面处理器 + */ + @Bean + public DataPermissionAspect dataPermissionAspect() { + return new DataPermissionAspect(); + } + + /** + * 分页插件,自动识别数据库类型 + */ + public PaginationInnerInterceptor paginationInnerInterceptor() { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 分页合理化 + paginationInnerInterceptor.setOverflow(true); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 元对象字段填充控制器 + */ + @Bean + public MetaObjectHandler metaObjectHandler() { + return new InjectionMetaObjectHandler(); + } + + /** + * 使用网卡信息绑定雪花生成器 + * 防止集群雪花ID重复 + */ + @Bean + public IdentifierGenerator idGenerator() { + return new DefaultIdentifierGenerator(NetUtil.getLocalhost()); + } + + /** + * 异常处理器 + */ + @Bean + public MybatisExceptionHandler mybatisExceptionHandler() { + return new MybatisExceptionHandler(); + } + + /** + * 初始化表对象处理器 + */ + @Bean + public PostInitTableInfoHandler postInitTableInfoHandler() { + return new PlusPostInitTableInfoHandler(); + } + + /** + * PaginationInnerInterceptor 分页插件,自动识别数据库类型 + * https://baomidou.com/pages/97710a/ + * OptimisticLockerInnerInterceptor 乐观锁插件 + * https://baomidou.com/pages/0d93c0/ + * MetaObjectHandler 元对象字段填充控制器 + * https://baomidou.com/pages/4c6bcf/ + * ISqlInjector sql注入器 + * https://baomidou.com/pages/42ea4a/ + * BlockAttackInnerInterceptor 如果是对全表的删除或更新操作,就会终止该操作 + * https://baomidou.com/pages/f9a237/ + * IllegalSQLInnerInterceptor sql性能规范插件(垃圾SQL拦截) + * IdentifierGenerator 自定义主键策略 + * https://baomidou.com/pages/568eb2/ + * TenantLineInnerInterceptor 多租户插件 + * https://baomidou.com/pages/aef2f2/ + * DynamicTableNameInnerInterceptor 动态表名插件 + * https://baomidou.com/pages/2a45ff/ + */ + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java new file mode 100644 index 0000000..13a7941 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -0,0 +1,70 @@ +package org.dromara.common.mybatis.core.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * Entity基类 + * + * @author Lion Li + */ +@Data +public class BaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 搜索值 + */ + @JsonIgnore + @TableField(exist = false) + private String searchValue; + + /** + * 创建部门 + */ + @TableField(fill = FieldFill.INSERT) + private Long createDept; + + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private Long createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java new file mode 100644 index 0000000..24557ed --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java @@ -0,0 +1,334 @@ +package org.dromara.common.mybatis.core.mapper; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import org.apache.ibatis.logging.Log; +import org.apache.ibatis.logging.LogFactory; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +/** + * 自定义 Mapper 接口, 实现 自定义扩展 + * + * @param table 泛型 + * @param vo 泛型 + * @author Lion Li + * @since 2021-05-13 + */ +@SuppressWarnings("unchecked") +public interface BaseMapperPlus extends BaseMapper { + + Log log = LogFactory.getLog(BaseMapperPlus.class); + + /** + * 获取当前实例对象关联的泛型类型 V 的 Class 对象 + * + * @return 返回当前实例对象关联的泛型类型 V 的 Class 对象 + */ + default Class currentVoClass() { + return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[1]; + } + + /** + * 获取当前实例对象关联的泛型类型 T 的 Class 对象 + * + * @return 返回当前实例对象关联的泛型类型 T 的 Class 对象 + */ + default Class currentModelClass() { + return (Class) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[0]; + } + + /** + * 使用默认的查询条件查询并返回结果列表 + * + * @return 返回查询结果的列表 + */ + default List selectList() { + return this.selectList(new QueryWrapper<>()); + } + + /** + * 批量插入实体对象集合 + * + * @param entityList 实体对象集合 + * @return 插入操作是否成功的布尔值 + */ + default boolean insertBatch(Collection entityList) { + return Db.saveBatch(entityList); + } + + /** + * 批量根据ID更新实体对象集合 + * + * @param entityList 实体对象集合 + * @return 更新操作是否成功的布尔值 + */ + default boolean updateBatchById(Collection entityList) { + return Db.updateBatchById(entityList); + } + + /** + * 批量插入或更新实体对象集合 + * + * @param entityList 实体对象集合 + * @return 插入或更新操作是否成功的布尔值 + */ + default boolean insertOrUpdateBatch(Collection entityList) { + return Db.saveOrUpdateBatch(entityList); + } + + /** + * 批量插入实体对象集合并指定批处理大小 + * + * @param entityList 实体对象集合 + * @param batchSize 批处理大小 + * @return 插入操作是否成功的布尔值 + */ + default boolean insertBatch(Collection entityList, int batchSize) { + return Db.saveBatch(entityList, batchSize); + } + + /** + * 批量根据ID更新实体对象集合并指定批处理大小 + * + * @param entityList 实体对象集合 + * @param batchSize 批处理大小 + * @return 更新操作是否成功的布尔值 + */ + default boolean updateBatchById(Collection entityList, int batchSize) { + return Db.updateBatchById(entityList, batchSize); + } + + /** + * 批量插入或更新实体对象集合并指定批处理大小 + * + * @param entityList 实体对象集合 + * @param batchSize 批处理大小 + * @return 插入或更新操作是否成功的布尔值 + */ + default boolean insertOrUpdateBatch(Collection entityList, int batchSize) { + return Db.saveOrUpdateBatch(entityList, batchSize); + } + + /** + * 根据ID查询单个VO对象 + * + * @param id 主键ID + * @return 查询到的单个VO对象 + */ + default V selectVoById(Serializable id) { + return selectVoById(id, this.currentVoClass()); + } + + /** + * 根据ID查询单个VO对象并将其转换为指定的VO类 + * + * @param id 主键ID + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @return 查询到的单个VO对象,经过转换为指定的VO类后返回 + */ + default C selectVoById(Serializable id, Class voClass) { + T obj = this.selectById(id); + if (ObjectUtil.isNull(obj)) { + return null; + } + return MapstructUtils.convert(obj, voClass); + } + + /** + * 根据ID集合批量查询VO对象列表 + * + * @param idList 主键ID集合 + * @return 查询到的VO对象列表 + */ + default List selectVoByIds(Collection idList) { + return selectVoByIds(idList, this.currentVoClass()); + } + + /** + * 根据ID集合批量查询实体对象列表,并将其转换为指定的VO对象列表 + * + * @param idList 主键ID集合 + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @return 查询到的VO对象列表,经过转换为指定的VO类后返回 + */ + default List selectVoByIds(Collection idList, Class voClass) { + List list = this.selectByIds(idList); + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + return MapstructUtils.convert(list, voClass); + } + + /** + * 根据查询条件Map查询VO对象列表 + * + * @param map 查询条件Map + * @return 查询到的VO对象列表 + */ + default List selectVoByMap(Map map) { + return selectVoByMap(map, this.currentVoClass()); + } + + /** + * 根据查询条件Map查询实体对象列表,并将其转换为指定的VO对象列表 + * + * @param map 查询条件Map + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @return 查询到的VO对象列表,经过转换为指定的VO类后返回 + */ + default List selectVoByMap(Map map, Class voClass) { + List list = this.selectByMap(map); + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + return MapstructUtils.convert(list, voClass); + } + + /** + * 根据条件查询单个VO对象 + * + * @param wrapper 查询条件Wrapper + * @return 查询到的单个VO对象 + */ + default V selectVoOne(Wrapper wrapper) { + return selectVoOne(wrapper, this.currentVoClass()); + } + + /** + * 根据条件查询单个VO对象,并根据需要决定是否抛出异常 + * + * @param wrapper 查询条件Wrapper + * @param throwEx 是否抛出异常的标志 + * @return 查询到的单个VO对象 + */ + default V selectVoOne(Wrapper wrapper, boolean throwEx) { + return selectVoOne(wrapper, this.currentVoClass(), throwEx); + } + + /** + * 根据条件查询单个VO对象,并指定返回的VO对象的类型 + * + * @param wrapper 查询条件Wrapper + * @param voClass 返回的VO对象的Class对象 + * @param 返回的VO对象的类型 + * @return 查询到的单个VO对象,经过类型转换为指定的VO类后返回 + */ + default C selectVoOne(Wrapper wrapper, Class voClass) { + return selectVoOne(wrapper, voClass, true); + } + + /** + * 根据条件查询单个实体对象,并将其转换为指定的VO对象 + * + * @param wrapper 查询条件Wrapper + * @param voClass 要转换的VO类的Class对象 + * @param throwEx 是否抛出异常的标志 + * @param VO类的类型 + * @return 查询到的单个VO对象,经过转换为指定的VO类后返回 + */ + default C selectVoOne(Wrapper wrapper, Class voClass, boolean throwEx) { + T obj = this.selectOne(wrapper, throwEx); + if (ObjectUtil.isNull(obj)) { + return null; + } + return MapstructUtils.convert(obj, voClass); + } + + /** + * 查询所有VO对象列表 + * + * @return 查询到的VO对象列表 + */ + default List selectVoList() { + return selectVoList(new QueryWrapper<>(), this.currentVoClass()); + } + + /** + * 根据条件查询VO对象列表 + * + * @param wrapper 查询条件Wrapper + * @return 查询到的VO对象列表 + */ + default List selectVoList(Wrapper wrapper) { + return selectVoList(wrapper, this.currentVoClass()); + } + + /** + * 根据条件查询实体对象列表,并将其转换为指定的VO对象列表 + * + * @param wrapper 查询条件Wrapper + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @return 查询到的VO对象列表,经过转换为指定的VO类后返回 + */ + default List selectVoList(Wrapper wrapper, Class voClass) { + List list = this.selectList(wrapper); + if (CollUtil.isEmpty(list)) { + return CollUtil.newArrayList(); + } + return MapstructUtils.convert(list, voClass); + } + + /** + * 根据条件分页查询VO对象列表 + * + * @param page 分页信息 + * @param wrapper 查询条件Wrapper + * @return 查询到的VO对象分页列表 + */ + default

> P selectVoPage(IPage page, Wrapper wrapper) { + return selectVoPage(page, wrapper, this.currentVoClass()); + } + + /** + * 根据条件分页查询实体对象列表,并将其转换为指定的VO对象分页列表 + * + * @param page 分页信息 + * @param wrapper 查询条件Wrapper + * @param voClass 要转换的VO类的Class对象 + * @param VO类的类型 + * @param

VO对象分页列表的类型 + * @return 查询到的VO对象分页列表,经过转换为指定的VO类后返回 + */ + default > P selectVoPage(IPage page, Wrapper wrapper, Class voClass) { + // 根据条件分页查询实体对象列表 + List list = this.selectList(page, wrapper); + // 创建一个新的VO对象分页列表,并设置分页信息 + IPage voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + if (CollUtil.isEmpty(list)) { + return (P) voPage; + } + voPage.setRecords(MapstructUtils.convert(list, voClass)); + return (P) voPage; + } + + /** + * 根据条件查询符合条件的对象,并将其转换为指定类型的对象列表 + * + * @param wrapper 查询条件Wrapper + * @param mapper 转换函数,用于将查询到的对象转换为指定类型的对象 + * @param 要转换的对象的类型 + * @return 查询到的符合条件的对象列表,经过转换为指定类型的对象后返回 + */ + default List selectObjs(Wrapper wrapper, Function mapper) { + return StreamUtils.toList(this.selectObjs(wrapper), mapper); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java new file mode 100644 index 0000000..554c544 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java @@ -0,0 +1,132 @@ +package org.dromara.common.mybatis.core.page; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.sql.SqlUtil; + +import java.io.Serial; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * 分页查询实体类 + * + * @author Lion Li + */ +@Data +public class PageQuery implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 分页大小 + */ + private Integer pageSize; + + /** + * 当前页数 + */ + private Integer pageNum; + + /** + * 排序列 + */ + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + private String isAsc; + + /** + * 当前记录起始索引 默认值 + */ + public static final int DEFAULT_PAGE_NUM = 1; + + /** + * 每页显示记录数 默认值 默认查全部 + */ + public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; + + + // 默认构造函数 + public PageQuery() { + } + + /** + * 构建分页对象 + */ + public Page build() { + Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM); + Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE); + if (pageNum <= 0) { + pageNum = DEFAULT_PAGE_NUM; + } + Page page = new Page<>(pageNum, pageSize); + List orderItems = buildOrderItem(); + if (CollUtil.isNotEmpty(orderItems)) { + page.addOrder(orderItems); + } + return page; + } + + /** + * 构建排序 + * + * 支持的用法如下: + * {isAsc:"asc",orderByColumn:"id"} order by id asc + * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc + * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc + * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc + */ + private List buildOrderItem() { + if (StringUtils.isBlank(orderByColumn) || StringUtils.isBlank(isAsc)) { + return null; + } + String orderBy = SqlUtil.escapeOrderBySql(orderByColumn); + orderBy = StringUtils.toUnderScoreCase(orderBy); + + // 兼容前端排序类型 + isAsc = StringUtils.replaceEach(isAsc, new String[]{"ascending", "descending"}, new String[]{"asc", "desc"}); + + String[] orderByArr = orderBy.split(StringUtils.SEPARATOR); + String[] isAscArr = isAsc.split(StringUtils.SEPARATOR); + if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) { + throw new ServiceException("排序参数有误"); + } + + List list = new ArrayList<>(); + // 每个字段各自排序 + for (int i = 0; i < orderByArr.length; i++) { + String orderByStr = orderByArr[i]; + String isAscStr = isAscArr.length == 1 ? isAscArr[0] : isAscArr[i]; + if ("asc".equals(isAscStr)) { + list.add(OrderItem.asc(orderByStr)); + } else if ("desc".equals(isAscStr)) { + list.add(OrderItem.desc(orderByStr)); + } else { + throw new ServiceException("排序参数有误"); + } + } + return list; + } + + @JsonIgnore + public Integer getFirstNum() { + return (pageNum - 1) * pageSize; + } + + public PageQuery(Integer pageSize, Integer pageNum) { + this.pageSize = pageSize; + this.pageNum = pageNum; + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java new file mode 100644 index 0000000..370f479 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java @@ -0,0 +1,91 @@ +package org.dromara.common.mybatis.core.page; + +import cn.hutool.http.HttpStatus; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 表格分页数据对象 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class TableDataInfo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总记录数 + */ + private long total; + + /** + * 列表数据 + */ + private List rows; + + /** + * 消息状态码 + */ + private int code; + + /** + * 消息内容 + */ + private String msg; + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public TableDataInfo(List list, long total) { + this.rows = list; + this.total = total; + this.code = HttpStatus.HTTP_OK; + this.msg = "查询成功"; + } + + /** + * 根据分页对象构建表格分页数据对象 + */ + public static TableDataInfo build(IPage page) { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + rspData.setRows(page.getRecords()); + rspData.setTotal(page.getTotal()); + return rspData; + } + + /** + * 根据数据列表构建表格分页数据对象 + */ + public static TableDataInfo build(List list) { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + rspData.setRows(list); + rspData.setTotal(list.size()); + return rspData; + } + + /** + * 构建表格分页数据对象 + */ + public static TableDataInfo build() { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + return rspData; + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java new file mode 100644 index 0000000..5084424 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java @@ -0,0 +1,58 @@ +package org.dromara.common.mybatis.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.utils.StringUtils; + +/** + * 数据库类型 + * + * @author Lion Li + */ +@Getter +@AllArgsConstructor +public enum DataBaseType { + + /** + * MySQL + */ + MY_SQL("MySQL"), + + /** + * Oracle + */ + ORACLE("Oracle"), + + /** + * PostgreSQL + */ + POSTGRE_SQL("PostgreSQL"), + + /** + * SQL Server + */ + SQL_SERVER("Microsoft SQL Server"); + + /** + * 数据库类型 + */ + private final String type; + + /** + * 根据数据库产品名称查找对应的数据库类型 + * + * @param databaseProductName 数据库产品名称 + * @return 对应的数据库类型枚举值,如果未找到则返回 null + */ + public static DataBaseType find(String databaseProductName) { + if (StringUtils.isBlank(databaseProductName)) { + return null; + } + for (DataBaseType type : values()) { + if (type.getType().equals(databaseProductName)) { + return type; + } + } + return null; + } +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java new file mode 100644 index 0000000..02a5f48 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java @@ -0,0 +1,87 @@ +package org.dromara.common.mybatis.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.helper.DataPermissionHelper; + +/** + * 数据权限类型枚举 + *

+ * 支持使用 SpEL 模板表达式定义 SQL 查询条件 + * 内置数据: + * - {@code user}: 当前登录用户信息,参考 {@link LoginUser} + * 内置服务: + * - {@code sdss}: 系统数据权限服务,参考 ISysDataScopeService + * 如需扩展数据,可以通过 {@link DataPermissionHelper} 进行操作 + * 如需扩展服务,可以通过 ISysDataScopeService 自行编写 + *

+ * + * @author Lion Li + * @version 3.5.0 + */ +@Getter +@AllArgsConstructor +public enum DataScopeType { + + /** + * 全部数据权限 + */ + ALL("1", "", ""), + + /** + * 自定数据权限 + */ + CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", " 1 = 0 "), + + /** + * 部门数据权限 + */ + DEPT("3", " #{#deptName} = #{#user.deptId} ", " 1 = 0 "), + + /** + * 部门及以下数据权限 + */ + DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", " 1 = 0 "), + + /** + * 仅本人数据权限 + */ + SELF("5", " #{#userName} = #{#user.userId} ", " 1 = 0 "), + + /** + * 部门及以下或本人数据权限 + */ + DEPT_AND_CHILD_OR_SELF("6", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} ) OR #{#userName} = #{#user.userId} ", " 1 = 0 "); + + private final String code; + + /** + * SpEL 模板表达式,用于构建 SQL 查询条件 + */ + private final String sqlTemplate; + + /** + * 如果不满足 {@code sqlTemplate} 的条件,则使用此默认 SQL 表达式 + */ + private final String elseSql; + + /** + * 根据枚举代码查找对应的枚举值 + * + * @param code 枚举代码 + * @return 对应的枚举值,如果未找到则返回 null + */ + public static DataScopeType findCode(String code) { + if (StringUtils.isBlank(code)) { + return null; + } + for (DataScopeType type : values()) { + if (type.getCode().equals(code)) { + return type; + } + } + return null; + } +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java new file mode 100644 index 0000000..fec2579 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -0,0 +1,102 @@ +package org.dromara.common.mybatis.handler; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpStatus; +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.satoken.utils.LoginHelper; + +import java.util.Date; + +/** + * MP注入处理器 + * + * @author Lion Li + * @date 2021/4/25 + */ +@Slf4j +public class InjectionMetaObjectHandler implements MetaObjectHandler { + + /** + * 插入填充方法,用于在插入数据时自动填充实体对象中的创建时间、更新时间、创建人、更新人等信息 + * + * @param metaObject 元对象,用于获取原始对象并进行填充 + */ + @Override + public void insertFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { + // 获取当前时间作为创建时间和更新时间,如果创建时间不为空,则使用创建时间,否则使用当前时间 + Date current = ObjectUtils.notNull(baseEntity.getCreateTime(), new Date()); + baseEntity.setCreateTime(current); + baseEntity.setUpdateTime(current); + + // 如果创建人为空,则填充当前登录用户的信息 + if (ObjectUtil.isNull(baseEntity.getCreateBy())) { + LoginUser loginUser = getLoginUser(); + if (ObjectUtil.isNotNull(loginUser)) { + Long userId = loginUser.getUserId(); + // 填充创建人、更新人和创建部门信息 + baseEntity.setCreateBy(userId); + baseEntity.setUpdateBy(userId); + baseEntity.setCreateDept(ObjectUtils.notNull(baseEntity.getCreateDept(), loginUser.getDeptId())); + } + } + } else { + Date date = new Date(); + this.strictInsertFill(metaObject, "createTime", Date.class, date); + this.strictInsertFill(metaObject, "updateTime", Date.class, date); + } + } catch (Exception e) { + throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); + } + } + + /** + * 更新填充方法,用于在更新数据时自动填充实体对象中的更新时间和更新人信息 + * + * @param metaObject 元对象,用于获取原始对象并进行填充 + */ + @Override + public void updateFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { + // 获取当前时间作为更新时间,无论原始对象中的更新时间是否为空都填充 + Date current = new Date(); + baseEntity.setUpdateTime(current); + + // 获取当前登录用户的ID,并填充更新人信息 + Long userId = LoginHelper.getUserId(); + if (ObjectUtil.isNotNull(userId)) { + baseEntity.setUpdateBy(userId); + } + } else { + this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date()); + } + } catch (Exception e) { + throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); + } + } + + /** + * 获取当前登录用户信息 + * + * @return 当前登录用户的信息,如果用户未登录则返回 null + */ + private LoginUser getLoginUser() { + LoginUser loginUser; + try { + loginUser = LoginHelper.getLoginUser(); + } catch (Exception e) { + log.warn("自动注入警告 => 用户未登录"); + return null; + } + return loginUser; + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java new file mode 100644 index 0000000..518d52d --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java @@ -0,0 +1,46 @@ +package org.dromara.common.mybatis.handler; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.StringUtils; +import org.mybatis.spring.MyBatisSystemException; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * Mybatis异常处理器 + * + * @author Lion Li + */ +@Slf4j +@RestControllerAdvice +public class MybatisExceptionHandler { + + /** + * 主键或UNIQUE索引,数据重复异常 + */ + @ExceptionHandler(DuplicateKeyException.class) + public R handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage()); + return R.fail("数据库中已存在该记录,请联系管理员确认"); + } + + /** + * Mybatis系统异常 通用处理 + */ + @ExceptionHandler(MyBatisSystemException.class) + public R handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) { + String requestURI = request.getRequestURI(); + String message = e.getMessage(); + if (StringUtils.contains("CannotFindDataSourceException", message)) { + log.error("请求地址'{}', 未找到数据源", requestURI); + return R.fail("未找到数据源,请联系管理员确认"); + } + log.error("请求地址'{}', Mybatis系统异常", requestURI, e); + return R.fail(message); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java new file mode 100644 index 0000000..a354707 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -0,0 +1,332 @@ +package org.dromara.common.mybatis.handler; + +import cn.hutool.core.annotation.AnnotationUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; +import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList; +import net.sf.jsqlparser.parser.CCJSqlParserUtil; +import org.apache.ibatis.io.Resources; +import org.dromara.common.core.domain.dto.RoleDTO; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.enums.DataScopeType; +import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.satoken.utils.LoginHelper; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.expression.BeanFactoryResolver; +import org.springframework.core.io.Resource; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.core.type.ClassMetadata; +import org.springframework.core.type.classreading.CachingMetadataReaderFactory; +import org.springframework.expression.*; +import org.springframework.expression.common.TemplateParserContext; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.util.ClassUtils; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; + +/** + * 数据权限过滤 + * + * @author Lion Li + * @version 3.5.0 + */ +@Slf4j +public class PlusDataPermissionHandler { + + /** + * 类名称与注解的映射关系缓存(由于aop无法拦截mybatis接口类上的注解 只能通过启动预扫描的方式进行) + */ + private final Map dataPermissionCacheMap = new ConcurrentHashMap<>(); + + /** + * spel 解析器 + */ + private final ExpressionParser parser = new SpelExpressionParser(); + private final ParserContext parserContext = new TemplateParserContext(); + /** + * bean解析器 用于处理 spel 表达式中对 bean 的调用 + */ + private final BeanResolver beanResolver = new BeanFactoryResolver(SpringUtils.getBeanFactory()); + + /** + * 构造方法,扫描指定包下的 Mapper 类并初始化缓存 + * + * @param mapperPackage Mapper 类所在的包路径 + */ + public PlusDataPermissionHandler(String mapperPackage) { + scanMapperClasses(mapperPackage); + } + + /** + * 获取数据过滤条件的 SQL 片段 + * + * @param where 原始的查询条件表达式 + * @param mappedStatementId Mapper 方法的 ID + * @param isSelect 是否为查询语句 + * @return 数据过滤条件的 SQL 片段 + */ + public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) { + try { + // 获取数据权限配置 + DataPermission dataPermission = getDataPermission(mappedStatementId); + // 获取当前登录用户信息 + LoginUser currentUser = DataPermissionHelper.getVariable("user"); + if (ObjectUtil.isNull(currentUser)) { + currentUser = LoginHelper.getLoginUser(); + DataPermissionHelper.setVariable("user", currentUser); + } + // 如果是超级管理员或租户管理员,则不过滤数据 + if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) { + return where; + } + // 构造数据过滤条件的 SQL 片段 + String dataFilterSql = buildDataFilter(dataPermission, isSelect); + if (StringUtils.isBlank(dataFilterSql)) { + return where; + } + Expression expression = CCJSqlParserUtil.parseExpression(dataFilterSql); + // 数据权限使用单独的括号 防止与其他条件冲突 + ParenthesedExpressionList parenthesis = new ParenthesedExpressionList<>(expression); + if (ObjectUtil.isNotNull(where)) { + return new AndExpression(where, parenthesis); + } else { + return parenthesis; + } + } catch (JSQLParserException e) { + throw new ServiceException("数据权限解析异常 => " + e.getMessage()); + } finally { + DataPermissionHelper.removePermission(); + } + } + + /** + * 构建数据过滤条件的 SQL 语句 + * + * @param dataPermission 数据权限注解 + * @param isSelect 标志当前操作是否为查询操作,查询操作和更新或删除操作在处理过滤条件时会有不同的处理方式 + * @return 构建的数据过滤条件的 SQL 语句 + * @throws ServiceException 如果角色的数据范围异常或者 key 与 value 的长度不匹配,则抛出 ServiceException 异常 + */ + private String buildDataFilter(DataPermission dataPermission, boolean isSelect) { + // 更新或删除需满足所有条件 + String joinStr = isSelect ? " OR " : " AND "; + if (StringUtils.isNotBlank(dataPermission.joinStr())) { + joinStr = " " + dataPermission.joinStr() + " "; + } + LoginUser user = DataPermissionHelper.getVariable("user"); + Object defaultValue = "-1"; + NullSafeStandardEvaluationContext context = new NullSafeStandardEvaluationContext(defaultValue); + context.addPropertyAccessor(new NullSafePropertyAccessor(context.getPropertyAccessors().get(0), defaultValue)); + context.setBeanResolver(beanResolver); + DataPermissionHelper.getContext().forEach(context::setVariable); + Set conditions = new HashSet<>(); + // 优先设置变量 + List keys = new ArrayList<>(); + Map ignoreMap = new HashMap<>(); + for (DataColumn dataColumn : dataPermission.value()) { + if (dataColumn.key().length != dataColumn.value().length) { + throw new ServiceException("角色数据范围异常 => key与value长度不匹配"); + } + // 包含权限标识符 这直接跳过 + if (StringUtils.isNotBlank(dataColumn.permission()) && + CollUtil.contains(user.getMenuPermission(), dataColumn.permission()) + ) { + ignoreMap.put(dataColumn, Boolean.TRUE); + continue; + } + // 设置注解变量 key 为表达式变量 value 为变量值 + for (int i = 0; i < dataColumn.key().length; i++) { + context.setVariable(dataColumn.key()[i], dataColumn.value()[i]); + } + keys.addAll(Arrays.stream(dataColumn.key()).map(key -> "#" + key).toList()); + } + + for (RoleDTO role : user.getRoles()) { + user.setRoleId(role.getRoleId()); + // 获取角色权限泛型 + DataScopeType type = DataScopeType.findCode(role.getDataScope()); + if (ObjectUtil.isNull(type)) { + throw new ServiceException("角色数据范围异常 => " + role.getDataScope()); + } + // 全部数据权限直接返回 + if (type == DataScopeType.ALL) { + return StringUtils.EMPTY; + } + boolean isSuccess = false; + for (DataColumn dataColumn : dataPermission.value()) { + // 包含权限标识符 这直接跳过 + if (ignoreMap.containsKey(dataColumn)) { + // 修复多角色与权限标识符共用问题 https://gitee.com/dromara/RuoYi-Vue-Plus/issues/IB4CS4 + conditions.add(joinStr + " 1 = 1 "); + isSuccess = true; + continue; + } + // 不包含 key 变量 则不处理 + if (!StringUtils.containsAny(type.getSqlTemplate(), keys.toArray(String[]::new))) { + continue; + } + // 当前注解不满足模板 不处理 + if (!StringUtils.containsAny(type.getSqlTemplate(), dataColumn.key())) { + continue; + } + // 忽略数据权限 防止spel表达式内有其他sql查询导致死循环调用 + String sql = DataPermissionHelper.ignore(() -> + parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class) + ); + // 解析sql模板并填充 + conditions.add(joinStr + sql); + isSuccess = true; + } + // 未处理成功则填充兜底方案 + if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) { + conditions.add(joinStr + type.getElseSql()); + } + } + + if (CollUtil.isNotEmpty(conditions)) { + String sql = StreamUtils.join(conditions, Function.identity(), ""); + return sql.substring(joinStr.length()); + } + return StringUtils.EMPTY; + } + + /** + * 扫描指定包下的 Mapper 类,并查找其中带有特定注解的方法或类 + * + * @param mapperPackage Mapper 类所在的包路径 + */ + private void scanMapperClasses(String mapperPackage) { + // 创建资源解析器和元数据读取工厂 + PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory(); + // 将 Mapper 包路径按分隔符拆分为数组 + String[] packagePatternArray = StringUtils.splitPreserveAllTokens(mapperPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS); + String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX; + try { + for (String packagePattern : packagePatternArray) { + // 将包路径转换为资源路径 + String path = ClassUtils.convertClassNameToResourcePath(packagePattern); + // 获取指定路径下的所有 .class 文件资源 + Resource[] resources = resolver.getResources(classpath + path + "/*.class"); + for (Resource resource : resources) { + // 获取资源的类元数据 + ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata(); + // 获取资源对应的类对象 + Class clazz = Resources.classForName(classMetadata.getClassName()); + // 查找类中的特定注解 + if (AnnotationUtil.hasAnnotation(clazz, DataPermission.class)) { + DataPermission dataPermission = AnnotationUtil.getAnnotation(clazz, DataPermission.class); + dataPermissionCacheMap.put(clazz.getName(), dataPermission); + } + } + } + } catch (Exception e) { + log.error("初始化数据安全缓存时出错:{}", e.getMessage()); + } + } + + /** + * 根据映射语句 ID 或类名获取对应的 DataPermission 注解对象 + * + * @param mapperId 映射语句 ID + * @return DataPermission 注解对象,如果不存在则返回 null + */ + public DataPermission getDataPermission(String mapperId) { + // 检查上下文中是否包含映射语句 ID 对应的 DataPermission 注解对象 + if (DataPermissionHelper.getPermission() != null) { + return DataPermissionHelper.getPermission(); + } + // 如果缓存中不包含映射语句 ID 对应的 DataPermission 注解对象,则尝试使用类名作为键查找 + String clazzName = mapperId.substring(0, mapperId.lastIndexOf(".")); + if (dataPermissionCacheMap.containsKey(clazzName)) { + return dataPermissionCacheMap.get(clazzName); + } + return null; + } + + /** + * 检查给定的映射语句 ID 是否有效,即是否能够找到对应的 DataPermission 注解对象 + * + * @param mapperId 映射语句 ID + * @return 如果找到对应的 DataPermission 注解对象,则返回 false;否则返回 true + */ + public boolean invalid(String mapperId) { + return getDataPermission(mapperId) == null; + } + + /** + * 对所有null变量找不到的变量返回默认值 + */ + @AllArgsConstructor + private static class NullSafeStandardEvaluationContext extends StandardEvaluationContext { + + private final Object defaultValue; + + @Override + public Object lookupVariable(String name) { + Object obj = super.lookupVariable(name); + // 如果读取到的值是 null,则返回默认值 + if (obj == null) { + return defaultValue; + } + return obj; + } + + } + + /** + * 对所有null变量找不到的变量返回默认值 委托模式 将不需要处理的方法委托给原处理器 + */ + @AllArgsConstructor + private static class NullSafePropertyAccessor implements PropertyAccessor { + + private final PropertyAccessor delegate; + private final Object defaultValue; + + @Override + public Class[] getSpecificTargetClasses() { + return delegate.getSpecificTargetClasses(); + } + + @Override + public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { + return delegate.canRead(context, target, name); + } + + @Override + public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { + TypedValue value = delegate.read(context, target, name); + // 如果读取到的值是 null,则返回默认值 + if (value.getValue() == null) { + return new TypedValue(defaultValue); + } + return value; + } + + @Override + public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { + return delegate.canWrite(context, target, name); + } + + @Override + public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { + delegate.write(context, target, name, newValue); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java new file mode 100644 index 0000000..60ca20b --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java @@ -0,0 +1,27 @@ +package org.dromara.common.mybatis.handler; + +import cn.hutool.core.convert.Convert; +import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.apache.ibatis.session.Configuration; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.reflect.ReflectUtils; + +/** + * 修改表信息初始化方式 + * 目前用于全局修改是否使用逻辑删除 + * + * @author Lion Li + */ +public class PlusPostInitTableInfoHandler implements PostInitTableInfoHandler { + + @Override + public void postTableInfo(TableInfo tableInfo, Configuration configuration) { + String flag = SpringUtils.getProperty("mybatis-plus.enableLogicDelete", "true"); + // 只有关闭时 统一设置false 为true时mp自动判断不处理 + if (!Convert.toBool(flag)) { + ReflectUtils.setFieldValue(tableInfo, "withLogicDelete", false); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java new file mode 100644 index 0000000..cd43c68 --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java @@ -0,0 +1,81 @@ +package org.dromara.common.mybatis.helper; + +import cn.hutool.core.convert.Convert; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.mybatis.enums.DataBaseType; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +/** + * 数据库助手 + * + * @author Lion Li + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class DataBaseHelper { + + private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class); + + /** + * 获取当前数据库类型 + */ + public static DataBaseType getDataBaseType() { + DataSource dataSource = DS.determineDataSource(); + try (Connection conn = dataSource.getConnection()) { + DatabaseMetaData metaData = conn.getMetaData(); + String databaseProductName = metaData.getDatabaseProductName(); + return DataBaseType.find(databaseProductName); + } catch (SQLException e) { + throw new ServiceException(e.getMessage()); + } + } + + public static boolean isMySql() { + return DataBaseType.MY_SQL == getDataBaseType(); + } + + public static boolean isOracle() { + return DataBaseType.ORACLE == getDataBaseType(); + } + + public static boolean isPostgerSql() { + return DataBaseType.POSTGRE_SQL == getDataBaseType(); + } + + public static boolean isSqlServer() { + return DataBaseType.SQL_SERVER == getDataBaseType(); + } + + public static String findInSet(Object var1, String var2) { + DataBaseType dataBasyType = getDataBaseType(); + String var = Convert.toStr(var1); + if (dataBasyType == DataBaseType.SQL_SERVER) { + // charindex(',100,' , ',0,100,101,') <> 0 + return "charindex(',%s,' , ','+%s+',') <> 0".formatted(var, var2); + } else if (dataBasyType == DataBaseType.POSTGRE_SQL) { + // (select strpos(',0,100,101,' , ',100,')) <> 0 + return "(select strpos(','||%s||',' , ',%s,')) <> 0".formatted(var2, var); + } else if (dataBasyType == DataBaseType.ORACLE) { + // instr(',0,100,101,' , ',100,') <> 0 + return "instr(','||%s||',' , ',%s,') <> 0".formatted(var2, var); + } + // find_in_set(100 , '0,100,101') + return "find_in_set('%s' , %s) <> 0".formatted(var, var2); + } + + /** + * 获取当前加载的数据库名 + */ + public static List getDataSourceNameList() { + return new ArrayList<>(DS.getDataSources().keySet()); + } +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java new file mode 100644 index 0000000..f03d74e --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java @@ -0,0 +1,176 @@ +package org.dromara.common.mybatis.helper; + +import cn.dev33.satoken.context.SaHolder; +import cn.dev33.satoken.context.model.SaStorage; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; +import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.reflect.ReflectUtils; +import org.dromara.common.mybatis.annotation.DataPermission; + +import java.util.HashMap; +import java.util.Map; +import java.util.Stack; +import java.util.function.Supplier; + +/** + * 数据权限助手 + * + * @author Lion Li + * @version 3.5.0 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +@SuppressWarnings("unchecked cast") +public class DataPermissionHelper { + + private static final String DATA_PERMISSION_KEY = "data:permission"; + + private static final ThreadLocal> REENTRANT_IGNORE = ThreadLocal.withInitial(Stack::new); + + private static final ThreadLocal PERMISSION_CACHE = new ThreadLocal<>(); + + /** + * 获取当前执行mapper权限注解 + * + * @return 返回当前执行mapper权限注解 + */ + public static DataPermission getPermission() { + return PERMISSION_CACHE.get(); + } + + /** + * 设置当前执行mapper权限注解 + * + * @param dataPermission 数据权限注解 + */ + public static void setPermission(DataPermission dataPermission) { + PERMISSION_CACHE.set(dataPermission); + } + + /** + * 删除当前执行mapper权限注解 + */ + public static void removePermission() { + PERMISSION_CACHE.remove(); + } + + /** + * 从上下文中获取指定键的变量值,并将其转换为指定的类型 + * + * @param key 变量的键 + * @param 变量值的类型 + * @return 指定键的变量值,如果不存在则返回 null + */ + public static T getVariable(String key) { + Map context = getContext(); + return (T) context.get(key); + } + + /** + * 向上下文中设置指定键的变量值 + * + * @param key 要设置的变量的键 + * @param value 要设置的变量值 + */ + public static void setVariable(String key, Object value) { + Map context = getContext(); + context.put(key, value); + } + + /** + * 获取数据权限上下文 + * + * @return 存储在SaStorage中的Map对象,用于存储数据权限相关的上下文信息 + * @throws NullPointerException 如果数据权限上下文类型异常,则抛出NullPointerException + */ + public static Map getContext() { + SaStorage saStorage = SaHolder.getStorage(); + Object attribute = saStorage.get(DATA_PERMISSION_KEY); + if (ObjectUtil.isNull(attribute)) { + saStorage.set(DATA_PERMISSION_KEY, new HashMap<>()); + attribute = saStorage.get(DATA_PERMISSION_KEY); + } + if (attribute instanceof Map map) { + return map; + } + throw new NullPointerException("data permission context type exception"); + } + + private static IgnoreStrategy getIgnoreStrategy() { + Object ignoreStrategyLocal = ReflectUtils.getStaticFieldValue(ReflectUtils.getField(InterceptorIgnoreHelper.class, "IGNORE_STRATEGY_LOCAL")); + if (ignoreStrategyLocal instanceof ThreadLocal IGNORE_STRATEGY_LOCAL) { + if (IGNORE_STRATEGY_LOCAL.get() instanceof IgnoreStrategy ignoreStrategy) { + return ignoreStrategy; + } + } + return null; + } + + /** + * 开启忽略数据权限(开启后需手动调用 {@link #disableIgnore()} 关闭) + */ + public static void enableIgnore() { + IgnoreStrategy ignoreStrategy = getIgnoreStrategy(); + if (ObjectUtil.isNull(ignoreStrategy)) { + InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().dataPermission(true).build()); + } else { + ignoreStrategy.setDataPermission(true); + } + Stack reentrantStack = REENTRANT_IGNORE.get(); + reentrantStack.push(reentrantStack.size() + 1); + } + + /** + * 关闭忽略数据权限 + */ + public static void disableIgnore() { + IgnoreStrategy ignoreStrategy = getIgnoreStrategy(); + if (ObjectUtil.isNotNull(ignoreStrategy)) { + boolean noOtherIgnoreStrategy = !Boolean.TRUE.equals(ignoreStrategy.getDynamicTableName()) + && !Boolean.TRUE.equals(ignoreStrategy.getBlockAttack()) + && !Boolean.TRUE.equals(ignoreStrategy.getIllegalSql()) + && !Boolean.TRUE.equals(ignoreStrategy.getTenantLine()) + && CollectionUtil.isEmpty(ignoreStrategy.getOthers()); + Stack reentrantStack = REENTRANT_IGNORE.get(); + boolean empty = reentrantStack.isEmpty() || reentrantStack.pop() == 1; + if (noOtherIgnoreStrategy && empty) { + InterceptorIgnoreHelper.clearIgnoreStrategy(); + } else if (empty) { + ignoreStrategy.setDataPermission(false); + } + + } + } + + /** + * 在忽略数据权限中执行 + * + * @param handle 处理执行方法 + */ + public static void ignore(Runnable handle) { + enableIgnore(); + try { + handle.run(); + } finally { + disableIgnore(); + } + } + + /** + * 在忽略数据权限中执行 + * + * @param handle 处理执行方法 + */ + public static T ignore(Supplier handle) { + enableIgnore(); + try { + return handle.get(); + } finally { + disableIgnore(); + } + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java new file mode 100644 index 0000000..85a4d0a --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java @@ -0,0 +1,181 @@ +package org.dromara.common.mybatis.interceptor; + +import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; +import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler; +import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; +import lombok.extern.slf4j.Slf4j; +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.schema.Table; +import net.sf.jsqlparser.statement.delete.Delete; +import net.sf.jsqlparser.statement.select.PlainSelect; +import net.sf.jsqlparser.statement.select.Select; +import net.sf.jsqlparser.statement.select.SetOperationList; +import net.sf.jsqlparser.statement.update.Update; +import org.apache.ibatis.executor.Executor; +import org.apache.ibatis.executor.statement.StatementHandler; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlCommandType; +import org.apache.ibatis.session.ResultHandler; +import org.apache.ibatis.session.RowBounds; +import org.dromara.common.mybatis.handler.PlusDataPermissionHandler; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; + +/** + * 数据权限拦截器 + * + * @author Lion Li + * @version 3.5.0 + */ +@Slf4j +public class PlusDataPermissionInterceptor extends BaseMultiTableInnerInterceptor implements InnerInterceptor { + + private final PlusDataPermissionHandler dataPermissionHandler; + + /** + * 构造函数,初始化 PlusDataPermissionHandler 实例 + * + * @param mapperPackage 扫描的映射器包 + */ + public PlusDataPermissionInterceptor(String mapperPackage) { + this.dataPermissionHandler = new PlusDataPermissionHandler(mapperPackage); + } + + /** + * 在执行查询之前,检查并处理数据权限相关逻辑 + * + * @param executor MyBatis 执行器对象 + * @param ms 映射语句对象 + * @param parameter 方法参数 + * @param rowBounds 分页对象 + * @param resultHandler 结果处理器 + * @param boundSql 绑定的 SQL 对象 + * @throws SQLException 如果发生 SQL 异常 + */ + @Override + public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { + // 检查是否需要忽略数据权限处理 + if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) { + return; + } + // 检查是否缺少有效的数据权限注解 + if (dataPermissionHandler.invalid(ms.getId())) { + return; + } + // 解析 sql 分配对应方法 + PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql); + mpBs.sql(parserSingle(mpBs.sql(), ms.getId())); + } + + /** + * 在准备 SQL 语句之前,检查并处理更新和删除操作的数据权限相关逻辑 + * + * @param sh MyBatis StatementHandler 对象 + * @param connection 数据库连接对象 + * @param transactionTimeout 事务超时时间 + */ + @Override + public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { + PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh); + MappedStatement ms = mpSh.mappedStatement(); + // 获取 SQL 命令类型(增、删、改、查) + SqlCommandType sct = ms.getSqlCommandType(); + + // 只处理更新和删除操作的 SQL 语句 + if (sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) { + if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) { + return; + } + // 检查是否缺少有效的数据权限注解 + if (dataPermissionHandler.invalid(ms.getId())) { + return; + } + PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql(); + mpBs.sql(parserMulti(mpBs.sql(), ms.getId())); + } + } + + /** + * 处理 SELECT 查询语句中的 WHERE 条件 + * + * @param select SELECT 查询对象 + * @param index 查询语句的索引 + * @param sql 查询语句 + * @param obj WHERE 条件参数 + */ + @Override + protected void processSelect(Select select, int index, String sql, Object obj) { + if (select instanceof PlainSelect) { + this.setWhere((PlainSelect) select, (String) obj); + } else if (select instanceof SetOperationList setOperationList) { + List + SELECT * FROM test_demo ${ew.customSqlSegment} + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml new file mode 100644 index 0000000..d7975ec --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml new file mode 100644 index 0000000..4906029 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/pom.xml @@ -0,0 +1,84 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + ruoyi-generator + + + generator 代码生成 + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-log + + + + + org.apache.velocity + velocity-engine-core + + + + org.anyline + anyline-environment-spring-data-jdbc + ${anyline.version} + + + + org.anyline + anyline-data-jdbc-mysql + ${anyline.version} + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java new file mode 100644 index 0000000..b29f8c9 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java @@ -0,0 +1,73 @@ +package org.dromara.generator.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +/** + * 读取代码生成相关配置 + * + * @author ruoyi + */ +@Component +@ConfigurationProperties(prefix = "gen") +@PropertySource(value = {"classpath:generator.yml"}, encoding = "UTF-8") +public class GenConfig { + + /** + * 作者 + */ + public static String author; + + /** + * 生成包路径 + */ + public static String packageName; + + /** + * 自动去除表前缀,默认是false + */ + public static boolean autoRemovePre; + + /** + * 表前缀(类名不会包含表前缀) + */ + public static String tablePrefix; + + public static String getAuthor() { + return author; + } + + @Value("${author}") + public void setAuthor(String author) { + GenConfig.author = author; + } + + public static String getPackageName() { + return packageName; + } + + @Value("${packageName}") + public void setPackageName(String packageName) { + GenConfig.packageName = packageName; + } + + public static boolean getAutoRemovePre() { + return autoRemovePre; + } + + @Value("${autoRemovePre}") + public void setAutoRemovePre(boolean autoRemovePre) { + GenConfig.autoRemovePre = autoRemovePre; + } + + public static String getTablePrefix() { + return tablePrefix; + } + + @Value("${tablePrefix}") + public void setTablePrefix(String tablePrefix) { + GenConfig.tablePrefix = tablePrefix; + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java new file mode 100644 index 0000000..8c0f352 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java @@ -0,0 +1,105 @@ +package org.dromara.generator.config; + +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; +import lombok.extern.slf4j.Slf4j; +import org.anyline.data.datasource.DataSourceMonitor; +import org.anyline.data.runtime.DataRuntime; +import org.anyline.util.ConfigTable; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.DataSourceUtils; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.util.HashMap; +import java.util.Map; + +/** + * anyline 适配 动态数据源改造 + * + * @author Lion Li + */ +@Slf4j +@Component +public class MyBatisDataSourceMonitor implements DataSourceMonitor { + + public MyBatisDataSourceMonitor() { + // 调整执行模式为自定义 + ConfigTable.KEEP_ADAPTER = 2; + // 禁用缓存 + ConfigTable.METADATA_CACHE_SCOPE = 0; + } + + private final Map features = new HashMap<>(); + + /** + * 数据源特征 用来定准 adapter 包含数据库或JDBC协议关键字
+ * 一般会通过 产品名_url 合成 如果返回null 上层方法会通过driver_产品名_url合成 + * + * @param datasource 数据源 + * @return String 返回null由上层自动提取 + */ + @Override + public String feature(DataRuntime runtime, Object datasource) { + String feature = null; + if (datasource instanceof JdbcTemplate jdbc) { + DataSource ds = jdbc.getDataSource(); + if (ds instanceof DynamicRoutingDataSource) { + String key = DynamicDataSourceContextHolder.peek(); + feature = features.get(key); + if (null == feature) { + Connection con = null; + try { + con = DataSourceUtils.getConnection(ds); + DatabaseMetaData meta = con.getMetaData(); + String url = meta.getURL(); + feature = meta.getDatabaseProductName().toLowerCase().replace(" ", "") + "_" + url; + features.put(key, feature); + } catch (Exception e) { + log.error(e.getMessage(), e); + } finally { + if (null != con && !DataSourceUtils.isConnectionTransactional(con, ds)) { + DataSourceUtils.releaseConnection(con, ds); + } + } + } + } + } + return feature; + } + + /** + * 数据源唯一标识 如果不实现则默认feature + * @param datasource 数据源 + * @return String 返回null由上层自动提取 + */ + @Override + public String key(DataRuntime runtime, Object datasource) { + if(datasource instanceof JdbcTemplate jdbc){ + DataSource ds = jdbc.getDataSource(); + if(ds instanceof DynamicRoutingDataSource){ + return DynamicDataSourceContextHolder.peek(); + } + } + return runtime.getKey(); + } + + /** + * ConfigTable.KEEP_ADAPTER=2 : 根据当前接口判断是否保持同一个数据源绑定同一个adapter
+ * DynamicRoutingDataSource类型的返回false,因为同一个DynamicRoutingDataSource可能对应多类数据库, 如果项目中只有一种数据库 应该直接返回true + * + * @param datasource 数据源 + * @return boolean + */ + @Override + public boolean keepAdapter(DataRuntime runtime, Object datasource) { + if (datasource instanceof JdbcTemplate jdbc) { + DataSource ds = jdbc.getDataSource(); + return !(ds instanceof DynamicRoutingDataSource); + } + return true; + } + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java new file mode 100644 index 0000000..b9888fb --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java @@ -0,0 +1,186 @@ +package org.dromara.generator.constant; + +/** + * 代码生成通用常量 + * + * @author ruoyi + */ +public interface GenConstants { + /** + * 单表(增删改查) + */ + String TPL_CRUD = "crud"; + + /** + * 树表(增删改查) + */ + String TPL_TREE = "tree"; + + /** + * 树编码字段 + */ + String TREE_CODE = "treeCode"; + + /** + * 树父编码字段 + */ + String TREE_PARENT_CODE = "treeParentCode"; + + /** + * 树名称字段 + */ + String TREE_NAME = "treeName"; + + /** + * 上级菜单ID字段 + */ + String PARENT_MENU_ID = "parentMenuId"; + + /** + * 上级菜单名称字段 + */ + String PARENT_MENU_NAME = "parentMenuName"; + + /** + * 数据库字符串类型 + */ + String[] COLUMNTYPE_STR = {"char", "varchar", "enum", "set", "nchar", "nvarchar", "varchar2", "nvarchar2"}; + + /** + * 数据库文本类型 + */ + String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext", "binary", "varbinary", "blob", + "ntext", "image", "bytea"}; + + /** + * 数据库时间类型 + */ + String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp", "year", "interval", + "smalldatetime", "datetime2", "datetimeoffset", "timestamptz"}; + + /** + * 数据库数字类型 + */ + String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "int2", "int4", "int8", "number", "integer", + "bit", "bigint", "float", "float4", "float8", "double", "decimal", "numeric", "real", "double precision", + "smallserial", "serial", "bigserial", "money", "smallmoney"}; + + /** + * BO对象 不需要添加字段 + */ + String[] COLUMNNAME_NOT_ADD = {"create_dept", "create_by", "create_time", "del_flag", "update_by", + "update_time", "version", "tenant_id"}; + + /** + * BO对象 不需要编辑字段 + */ + String[] COLUMNNAME_NOT_EDIT = {"create_dept", "create_by", "create_time", "del_flag", "update_by", + "update_time", "version", "tenant_id"}; + + /** + * VO对象 不需要返回字段 + */ + String[] COLUMNNAME_NOT_LIST = {"create_dept", "create_by", "create_time", "del_flag", "update_by", + "update_time", "version", "tenant_id"}; + + /** + * BO对象 不需要查询字段 + */ + String[] COLUMNNAME_NOT_QUERY = {"id", "create_dept", "create_by", "create_time", "del_flag", "update_by", + "update_time", "remark", "version", "tenant_id"}; + + /** + * Entity基类字段 + */ + String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime", "tenantId"}; + + /** + * 文本框 + */ + String HTML_INPUT = "input"; + + /** + * 文本域 + */ + String HTML_TEXTAREA = "textarea"; + + /** + * 下拉框 + */ + String HTML_SELECT = "select"; + + /** + * 单选框 + */ + String HTML_RADIO = "radio"; + + /** + * 复选框 + */ + String HTML_CHECKBOX = "checkbox"; + + /** + * 日期控件 + */ + String HTML_DATETIME = "datetime"; + + /** + * 图片上传控件 + */ + String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** + * 文件上传控件 + */ + String HTML_FILE_UPLOAD = "fileUpload"; + + /** + * 富文本控件 + */ + String HTML_EDITOR = "editor"; + + /** + * 字符串类型 + */ + String TYPE_STRING = "String"; + + /** + * 整型 + */ + String TYPE_INTEGER = "Integer"; + + /** + * 长整型 + */ + String TYPE_LONG = "Long"; + + /** + * 浮点型 + */ + String TYPE_DOUBLE = "Double"; + + /** + * 高精度计算类型 + */ + String TYPE_BIGDECIMAL = "BigDecimal"; + + /** + * 时间类型 + */ + String TYPE_DATE = "Date"; + + /** + * 模糊查询 + */ + String QUERY_LIKE = "LIKE"; + + /** + * 相等查询 + */ + String QUERY_EQ = "EQ"; + + /** + * 需要 + */ + String REQUIRE = "1"; +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java new file mode 100644 index 0000000..c9ac525 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java @@ -0,0 +1,217 @@ +package org.dromara.generator.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.io.IoUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.generator.domain.GenTable; +import org.dromara.generator.domain.GenTableColumn; +import org.dromara.generator.service.IGenTableService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 代码生成 操作处理 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/tool/gen") +public class GenController extends BaseController { + + private final IGenTableService genTableService; + + /** + * 查询代码生成列表 + */ + @SaCheckPermission("tool:gen:list") + @GetMapping("/list") + public TableDataInfo genList(GenTable genTable, PageQuery pageQuery) { + return genTableService.selectPageGenTableList(genTable, pageQuery); + } + + /** + * 修改代码生成业务 + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:query") + @GetMapping(value = "/{tableId}") + public R> getInfo(@PathVariable Long tableId) { + GenTable table = genTableService.selectGenTableById(tableId); + List tables = genTableService.selectGenTableAll(); + List list = genTableService.selectGenTableColumnListByTableId(tableId); + Map map = new HashMap<>(3); + map.put("info", table); + map.put("rows", list); + map.put("tables", tables); + return R.ok(map); + } + + /** + * 查询数据库列表 + */ + @SaCheckPermission("tool:gen:list") + @GetMapping("/db/list") + public TableDataInfo dataList(GenTable genTable, PageQuery pageQuery) { + return genTableService.selectPageDbTableList(genTable, pageQuery); + } + + /** + * 查询数据表字段列表 + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:list") + @GetMapping(value = "/column/{tableId}") + public TableDataInfo columnList(@PathVariable("tableId") Long tableId) { + TableDataInfo dataInfo = new TableDataInfo<>(); + List list = genTableService.selectGenTableColumnListByTableId(tableId); + dataInfo.setRows(list); + dataInfo.setTotal(list.size()); + return dataInfo; + } + + /** + * 导入表结构(保存) + * + * @param tables 表名串 + */ + @SaCheckPermission("tool:gen:import") + @Log(title = "代码生成", businessType = BusinessType.IMPORT) + @PostMapping("/importTable") + public R importTableSave(String tables, String dataName) { + String[] tableNames = Convert.toStrArray(tables); + // 查询表信息 + List tableList = genTableService.selectDbTableListByNames(tableNames, dataName); + genTableService.importGenTable(tableList, dataName); + return R.ok(); + } + + /** + * 修改保存代码生成业务 + */ + @SaCheckPermission("tool:gen:edit") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @PutMapping + public R editSave(@Validated @RequestBody GenTable genTable) { + genTableService.validateEdit(genTable); + genTableService.updateGenTable(genTable); + return R.ok(); + } + + /** + * 删除代码生成 + * + * @param tableIds 表ID串 + */ + @SaCheckPermission("tool:gen:remove") + @Log(title = "代码生成", businessType = BusinessType.DELETE) + @DeleteMapping("/{tableIds}") + public R remove(@PathVariable Long[] tableIds) { + genTableService.deleteGenTableByIds(tableIds); + return R.ok(); + } + + /** + * 预览代码 + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:preview") + @GetMapping("/preview/{tableId}") + public R> preview(@PathVariable("tableId") Long tableId) throws IOException { + Map dataMap = genTableService.previewCode(tableId); + return R.ok(dataMap); + } + + /** + * 生成代码(下载方式) + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/download/{tableId}") + public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException { + byte[] data = genTableService.downloadCode(tableId); + genCode(response, data); + } + + /** + * 生成代码(自定义路径) + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/genCode/{tableId}") + public R genCode(@PathVariable("tableId") Long tableId) { + genTableService.generatorCode(tableId); + return R.ok(); + } + + /** + * 同步数据库 + * + * @param tableId 表ID + */ + @SaCheckPermission("tool:gen:edit") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @GetMapping("/synchDb/{tableId}") + public R synchDb(@PathVariable("tableId") Long tableId) { + genTableService.synchDb(tableId); + return R.ok(); + } + + /** + * 批量生成代码 + * + * @param tableIdStr 表ID串 + */ + @SaCheckPermission("tool:gen:code") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/batchGenCode") + public void batchGenCode(HttpServletResponse response, String tableIdStr) throws IOException { + String[] tableIds = Convert.toStrArray(tableIdStr); + byte[] data = genTableService.downloadCode(tableIds); + genCode(response, data); + } + + /** + * 生成zip文件 + */ + private void genCode(HttpServletResponse response, byte[] data) throws IOException { + 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.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + IoUtil.write(response.getOutputStream(), false, data); + } + + /** + * 查询数据源名称列表 + */ + @SaCheckPermission("tool:gen:list") + @GetMapping(value = "/getDataNames") + public R getCurrentDataSourceNameList(){ + return R.ok(DataBaseHelper.getDataSourceNameList()); + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java new file mode 100644 index 0000000..9214a05 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java @@ -0,0 +1,196 @@ +package org.dromara.generator.domain; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.generator.constant.GenConstants; + +import java.util.List; + +/** + * 业务表 gen_table + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("gen_table") +public class GenTable extends BaseEntity { + + /** + * 编号 + */ + @TableId(value = "table_id") + private Long tableId; + + /** + * 数据源名称 + */ + @NotBlank(message = "数据源名称不能为空") + private String dataName; + + /** + * 表名称 + */ + @NotBlank(message = "表名称不能为空") + private String tableName; + + /** + * 表描述 + */ + @NotBlank(message = "表描述不能为空") + private String tableComment; + + /** + * 关联父表的表名 + */ + private String subTableName; + + /** + * 本表关联父表的外键名 + */ + private String subTableFkName; + + /** + * 实体类名称(首字母大写) + */ + @NotBlank(message = "实体类名称不能为空") + private String className; + + /** + * 使用的模板(crud单表操作 tree树表操作 sub主子表操作) + */ + private String tplCategory; + + /** + * 生成包路径 + */ + @NotBlank(message = "生成包路径不能为空") + private String packageName; + + /** + * 生成模块名 + */ + @NotBlank(message = "生成模块名不能为空") + private String moduleName; + + /** + * 生成业务名 + */ + @NotBlank(message = "生成业务名不能为空") + private String businessName; + + /** + * 生成功能名 + */ + @NotBlank(message = "生成功能名不能为空") + private String functionName; + + /** + * 生成作者 + */ + @NotBlank(message = "作者不能为空") + private String functionAuthor; + + /** + * 生成代码方式(0zip压缩包 1自定义路径) + */ + private String genType; + + /** + * 生成路径(不填默认项目路径) + */ + @TableField(updateStrategy = FieldStrategy.NOT_EMPTY) + private String genPath; + + /** + * 主键信息 + */ + @TableField(exist = false) + private GenTableColumn pkColumn; + + /** + * 表列信息 + */ + @Valid + @TableField(exist = false) + private List columns; + + /** + * 其它生成选项 + */ + private String options; + + /** + * 备注 + */ + private String remark; + + /** + * 树编码字段 + */ + @TableField(exist = false) + private String treeCode; + + /** + * 树父编码字段 + */ + @TableField(exist = false) + private String treeParentCode; + + /** + * 树名称字段 + */ + @TableField(exist = false) + private String treeName; + + /* + * 菜单id列表 + */ + @TableField(exist = false) + private List menuIds; + + /** + * 上级菜单ID字段 + */ + @TableField(exist = false) + private Long parentMenuId; + + /** + * 上级菜单名称字段 + */ + @TableField(exist = false) + private String parentMenuName; + + public boolean isTree() { + return isTree(this.tplCategory); + } + + public static boolean isTree(String tplCategory) { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); + } + + public boolean isCrud() { + return isCrud(this.tplCategory); + } + + public static boolean isCrud(String tplCategory) { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); + } + + public boolean isSuperColumn(String javaField) { + return isSuperColumn(this.tplCategory, javaField); + } + + public static boolean isSuperColumn(String tplCategory, String javaField) { + return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java new file mode 100644 index 0000000..76b0250 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java @@ -0,0 +1,221 @@ +package org.dromara.generator.domain; + +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.ibatis.type.JdbcType; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 代码生成业务字段表 gen_table_column + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("gen_table_column") +public class GenTableColumn extends BaseEntity { + + /** + * 编号 + */ + @TableId(value = "column_id") + private Long columnId; + + /** + * 归属表编号 + */ + private Long tableId; + + /** + * 列名称 + */ + private String columnName; + + /** + * 列描述 + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String columnComment; + + /** + * 列类型 + */ + private String columnType; + + /** + * JAVA类型 + */ + private String javaType; + + /** + * JAVA字段名 + */ + @NotBlank(message = "Java属性不能为空") + private String javaField; + + /** + * 是否主键(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isPk; + + /** + * 是否自增(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isIncrement; + + /** + * 是否必填(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isRequired; + + /** + * 是否为插入字段(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isInsert; + + /** + * 是否编辑字段(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isEdit; + + /** + * 是否列表字段(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isList; + + /** + * 是否查询字段(1是) + */ + @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR) + private String isQuery; + + /** + * 查询方式(EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围) + */ + private String queryType; + + /** + * 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件) + */ + private String htmlType; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 排序 + */ + private Integer sort; + + public String getCapJavaField() { + return StringUtils.capitalize(javaField); + } + + public boolean isPk() { + return isPk(this.isPk); + } + + public boolean isPk(String isPk) { + return isPk != null && StringUtils.equals("1", isPk); + } + + public boolean isIncrement() { + return isIncrement(this.isIncrement); + } + + public boolean isIncrement(String isIncrement) { + return isIncrement != null && StringUtils.equals("1", isIncrement); + } + + public boolean isRequired() { + return isRequired(this.isRequired); + } + + public boolean isRequired(String isRequired) { + return isRequired != null && StringUtils.equals("1", isRequired); + } + + public boolean isInsert() { + return isInsert(this.isInsert); + } + + public boolean isInsert(String isInsert) { + return isInsert != null && StringUtils.equals("1", isInsert); + } + + public boolean isEdit() { + return isEdit(this.isEdit); + } + + public boolean isEdit(String isEdit) { + return isEdit != null && StringUtils.equals("1", isEdit); + } + + public boolean isList() { + return isList(this.isList); + } + + public boolean isList(String isList) { + return isList != null && StringUtils.equals("1", isList); + } + + public boolean isQuery() { + return isQuery(this.isQuery); + } + + public boolean isQuery(String isQuery) { + return isQuery != null && StringUtils.equals("1", isQuery); + } + + public boolean isSuperColumn() { + return isSuperColumn(this.javaField); + } + + public static boolean isSuperColumn(String javaField) { + return StringUtils.equalsAnyIgnoreCase(javaField, + // BaseEntity + "createBy", "createTime", "updateBy", "updateTime", + // TreeEntity + "parentName", "parentId"); + } + + public boolean isUsableColumn() { + return isUsableColumn(javaField); + } + + public static boolean isUsableColumn(String javaField) { + // isSuperColumn()中的名单用于避免生成多余Domain属性,若某些属性在生成页面时需要用到不能忽略,则放在此处白名单 + return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); + } + + public String readConverterExp() { + String remarks = StringUtils.substringBetween(this.columnComment, "(", ")"); + StringBuffer sb = new StringBuffer(); + if (StringUtils.isNotEmpty(remarks)) { + for (String value : remarks.split(" ")) { + if (StringUtils.isNotEmpty(value)) { + Object startStr = value.subSequence(0, 1); + String endStr = value.substring(1); + sb.append(StringUtils.EMPTY).append(startStr).append("=").append(endStr).append(StringUtils.SEPARATOR); + } + } + return sb.deleteCharAt(sb.length() - 1).toString(); + } else { + return this.columnComment; + } + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java new file mode 100644 index 0000000..ed8ed20 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java @@ -0,0 +1,15 @@ +package org.dromara.generator.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.generator.domain.GenTableColumn; + +/** + * 业务字段 数据层 + * + * @author Lion Li + */ +@InterceptorIgnore(dataPermission = "true", tenantLine = "true") +public interface GenTableColumnMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java new file mode 100644 index 0000000..1798b4b --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java @@ -0,0 +1,51 @@ +package org.dromara.generator.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.generator.domain.GenTable; + +import java.util.List; + +/** + * 业务 数据层 + * + * @author Lion Li + */ +@InterceptorIgnore(dataPermission = "true", tenantLine = "true") +public interface GenTableMapper extends BaseMapperPlus { + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + List selectGenTableAll(); + + /** + * 查询表ID业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + GenTable selectGenTableById(Long id); + + /** + * 查询表名称业务信息 + * + * @param tableName 表名称 + * @return 业务信息 + */ + GenTable selectGenTableByName(String tableName); + + /** + * 查询指定数据源下的所有表名列表 + * + * @param dataName 数据源名称,用于选择不同的数据源 + * @return 当前数据库中的表名列表 + * + * @DS("") 使用默认数据源执行查询操作 + */ + @DS("") + List selectTableNameList(String dataName); +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java new file mode 100644 index 0000000..6b9e606 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java @@ -0,0 +1,582 @@ +package org.dromara.generator.service; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.IoUtil; +import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.anyline.metadata.Column; +import org.anyline.metadata.Table; +import org.anyline.proxy.ServiceProxy; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.generator.constant.GenConstants; +import org.dromara.generator.domain.GenTable; +import org.dromara.generator.domain.GenTableColumn; +import org.dromara.generator.mapper.GenTableColumnMapper; +import org.dromara.generator.mapper.GenTableMapper; +import org.dromara.generator.util.GenUtils; +import org.dromara.generator.util.VelocityInitializer; +import org.dromara.generator.util.VelocityUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * 业务 服务层实现 + * + * @author Lion Li + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class GenTableServiceImpl implements IGenTableService { + + private final GenTableMapper baseMapper; + private final GenTableColumnMapper genTableColumnMapper; + private final IdentifierGenerator identifierGenerator; + + private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"}; + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + @Override + public List selectGenTableColumnListByTableId(Long tableId) { + return genTableColumnMapper.selectList(new LambdaQueryWrapper() + .eq(GenTableColumn::getTableId, tableId) + .orderByAsc(GenTableColumn::getSort)); + } + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + @Override + public GenTable selectGenTableById(Long id) { + GenTable genTable = baseMapper.selectGenTableById(id); + setTableFromOptions(genTable); + return genTable; + } + + @Override + public TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { + Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); + return TableDataInfo.build(page); + } + + private QueryWrapper buildGenTableQueryWrapper(GenTable genTable) { + Map params = genTable.getParams(); + QueryWrapper wrapper = Wrappers.query(); + wrapper + .eq(StringUtils.isNotEmpty(genTable.getDataName()), "data_name", genTable.getDataName()) + .like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName())) + .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment())) + .between(params.get("beginTime") != null && params.get("endTime") != null, + "create_time", params.get("beginTime"), params.get("endTime")) + .orderByDesc("update_time"); + return wrapper; + } + + /** + * 查询数据库列表 + * + * @param genTable 包含查询条件的GenTable对象 + * @param pageQuery 包含分页信息的PageQuery对象 + * @return 包含分页结果的TableDataInfo对象 + */ + @DS("#genTable.dataName") + @Override + public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) { + // 获取查询条件 + String tableName = genTable.getTableName(); + String tableComment = genTable.getTableComment(); + + LinkedHashMap> tablesMap = ServiceProxy.metadata().tables(); + if (CollUtil.isEmpty(tablesMap)) { + return TableDataInfo.build(); + } + List tableNames = baseMapper.selectTableNameList(genTable.getDataName()); + String[] tableArrays; + if (CollUtil.isNotEmpty(tableNames)) { + tableArrays = tableNames.toArray(new String[0]); + } else { + tableArrays = new String[0]; + } + // 过滤并转换表格数据 + List tables = tablesMap.values().stream() + .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE)) + .filter(x -> { + if (CollUtil.isEmpty(tableNames)) { + return true; + } + return !StringUtils.equalsAnyIgnoreCase(x.getName(), tableArrays); + }) + .filter(x -> { + boolean nameMatches = true; + boolean commentMatches = true; + // 进行表名称的模糊查询 + if (StringUtils.isNotBlank(tableName)) { + nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName); + } + // 进行表描述的模糊查询 + if (StringUtils.isNotBlank(tableComment)) { + commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment); + } + // 同时匹配名称和描述 + return nameMatches && commentMatches; + }) + .map(x -> { + GenTable gen = new GenTable(); + gen.setTableName(x.getName()); + gen.setTableComment(x.getComment()); + // postgresql的表元数据没有创建时间这个东西(好奇葩) 只能new Date代替 + gen.setCreateTime(ObjectUtil.defaultIfNull(x.getCreateTime(), new Date())); + gen.setUpdateTime(x.getUpdateTime()); + return gen; + }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed()) + .toList(); + + IPage page = pageQuery.build(); + page.setTotal(tables.size()); + // 手动分页 set数据 + page.setRecords(CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables)); + return TableDataInfo.build(page); + } + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @param dataName 数据源名称 + * @return 数据库表集合 + */ + @DS("#dataName") + @Override + public List selectDbTableListByNames(String[] tableNames, String dataName) { + Set tableNameSet = new HashSet<>(List.of(tableNames)); + LinkedHashMap> tablesMap = ServiceProxy.metadata().tables(); + + if (CollUtil.isEmpty(tablesMap)) { + return new ArrayList<>(); + } + + List> tableList = tablesMap.values().stream() + .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE)) + .filter(x -> tableNameSet.contains(x.getName())).toList(); + + if (CollUtil.isEmpty(tableList)) { + return new ArrayList<>(); + } + return tableList.stream().map(x -> { + GenTable gen = new GenTable(); + gen.setDataName(dataName); + gen.setTableName(x.getName()); + gen.setTableComment(x.getComment()); + gen.setCreateTime(x.getCreateTime()); + gen.setUpdateTime(x.getUpdateTime()); + return gen; + }).toList(); + } + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + @Override + public List selectGenTableAll() { + return baseMapper.selectGenTableAll(); + } + + /** + * 修改业务 + * + * @param genTable 业务信息 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void updateGenTable(GenTable genTable) { + String options = JsonUtils.toJsonString(genTable.getParams()); + genTable.setOptions(options); + int row = baseMapper.updateById(genTable); + if (row > 0) { + for (GenTableColumn cenTableColumn : genTable.getColumns()) { + genTableColumnMapper.updateById(cenTableColumn); + } + } + } + + /** + * 删除业务对象 + * + * @param tableIds 需要删除的数据ID + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void deleteGenTableByIds(Long[] tableIds) { + List ids = Arrays.asList(tableIds); + baseMapper.deleteByIds(ids); + genTableColumnMapper.delete(new LambdaQueryWrapper().in(GenTableColumn::getTableId, ids)); + } + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + * @param dataName 数据源名称 + */ + @DSTransactional + @Override + public void importGenTable(List tableList, String dataName) { + try { + for (GenTable table : tableList) { + String tableName = table.getTableName(); + GenUtils.initTable(table); + table.setDataName(dataName); + int row = baseMapper.insert(table); + if (row > 0) { + // 保存列信息 + List genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName); + List saveColumns = new ArrayList<>(); + for (GenTableColumn column : genTableColumns) { + GenUtils.initColumnField(column, table); + saveColumns.add(column); + } + if (CollUtil.isNotEmpty(saveColumns)) { + genTableColumnMapper.insertBatch(saveColumns); + } + } + } + } catch (Exception e) { + throw new ServiceException("导入失败:" + e.getMessage()); + } + } + + /** + * 根据表名称查询列信息 + * + * @param tableName 表名称 + * @param dataName 数据源名称 + * @return 列信息 + */ + @DS("#dataName") + @Override + public List selectDbTableColumnsByName(String tableName, String dataName) { + Table table = ServiceProxy.metadata().table(tableName); + if (ObjectUtil.isNull(table)) { + return new ArrayList<>(); + } + LinkedHashMap columns = table.getColumns(); + List tableColumns = new ArrayList<>(); + columns.forEach((columnName, column) -> { + GenTableColumn tableColumn = new GenTableColumn(); + tableColumn.setIsPk(String.valueOf(column.isPrimaryKey())); + tableColumn.setColumnName(column.getName()); + tableColumn.setColumnComment(column.getComment()); + tableColumn.setColumnType(column.getOriginType().toLowerCase()); + tableColumn.setSort(column.getPosition()); + tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0"); + tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1"); + tableColumns.add(tableColumn); + }); + return tableColumns; + } + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + @Override + public Map previewCode(Long tableId) { + Map dataMap = new LinkedHashMap<>(); + // 查询表信息 + GenTable table = baseMapper.selectGenTableById(tableId); + List menuIds = new ArrayList<>(); + for (int i = 0; i < 6; i++) { + menuIds.add(identifierGenerator.nextId(null).longValue()); + } + table.setMenuIds(menuIds); + // 设置主键列信息 + setPkColumn(table); + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory()); + for (String template : templates) { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + dataMap.put(template, sw.toString()); + } + return dataMap; + } + + /** + * 生成代码(下载方式) + * + * @param tableId 表名称 + * @return 数据 + */ + @Override + public byte[] downloadCode(Long tableId) { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + generatorCode(tableId, zip); + IoUtil.close(zip); + return outputStream.toByteArray(); + } + + /** + * 生成代码(自定义路径) + * + * @param tableId 表名称 + */ + @Override + public void generatorCode(Long tableId) { + // 查询表信息 + GenTable table = baseMapper.selectGenTableById(tableId); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory()); + for (String template : templates) { + if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try { + String path = getGenPath(table, template); + FileUtils.writeUtf8String(sw.toString(), path); + } catch (Exception e) { + throw new ServiceException("渲染模板失败,表名:" + table.getTableName()); + } + } + } + } + + /** + * 同步数据库 + * + * @param tableId 表名称 + */ + @DSTransactional + @Override + public void synchDb(Long tableId) { + GenTable table = baseMapper.selectGenTableById(tableId); + List tableColumns = table.getColumns(); + Map tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName); + + List dbTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(table.getTableName(), table.getDataName()); + if (CollUtil.isEmpty(dbTableColumns)) { + throw new ServiceException("同步数据失败,原表结构不存在"); + } + List dbTableColumnNames = StreamUtils.toList(dbTableColumns, GenTableColumn::getColumnName); + + List saveColumns = new ArrayList<>(); + dbTableColumns.forEach(column -> { + GenUtils.initColumnField(column, table); + if (tableColumnMap.containsKey(column.getColumnName())) { + GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); + column.setColumnId(prevColumn.getColumnId()); + if (column.isList()) { + // 如果是列表,继续保留查询方式/字典类型选项 + column.setDictType(prevColumn.getDictType()); + column.setQueryType(prevColumn.getQueryType()); + } + if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() + && (column.isInsert() || column.isEdit()) + && ((column.isUsableColumn()) || (!column.isSuperColumn()))) { + // 如果是(新增/修改&非主键/非忽略及父属性),继续保留必填/显示类型选项 + column.setIsRequired(prevColumn.getIsRequired()); + column.setHtmlType(prevColumn.getHtmlType()); + } + } + saveColumns.add(column); + }); + if (CollUtil.isNotEmpty(saveColumns)) { + genTableColumnMapper.insertOrUpdateBatch(saveColumns); + } + List delColumns = StreamUtils.filter(tableColumns, column -> !dbTableColumnNames.contains(column.getColumnName())); + if (CollUtil.isNotEmpty(delColumns)) { + List ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId); + if (CollUtil.isNotEmpty(ids)) { + genTableColumnMapper.deleteByIds(ids); + } + } + } + + /** + * 批量生成代码(下载方式) + * + * @param tableIds 表ID数组 + * @return 数据 + */ + @Override + public byte[] downloadCode(String[] tableIds) { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + for (String tableId : tableIds) { + generatorCode(Long.parseLong(tableId), zip); + } + IoUtil.close(zip); + return outputStream.toByteArray(); + } + + /** + * 查询表信息并生成代码 + */ + private void generatorCode(Long tableId, ZipOutputStream zip) { + // 查询表信息 + GenTable table = baseMapper.selectGenTableById(tableId); + List menuIds = new ArrayList<>(); + for (int i = 0; i < 6; i++) { + menuIds.add(identifierGenerator.nextId(null).longValue()); + } + table.setMenuIds(menuIds); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = VelocityUtils.getTemplateList(table.getTplCategory()); + for (String template : templates) { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try { + // 添加到zip + zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); + IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString()); + IoUtil.close(sw); + zip.flush(); + zip.closeEntry(); + } catch (IOException e) { + log.error("渲染模板失败,表名:" + table.getTableName(), e); + } + } + } + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + @Override + public void validateEdit(GenTable genTable) { + if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { + String options = JsonUtils.toJsonString(genTable.getParams()); + Dict paramsObj = JsonUtils.parseMap(options); + if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) { + throw new ServiceException("树编码字段不能为空"); + } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) { + throw new ServiceException("树父编码字段不能为空"); + } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) { + throw new ServiceException("树名称字段不能为空"); + } + } + } + + /** + * 设置主键列信息 + * + * @param table 业务表信息 + */ + public void setPkColumn(GenTable table) { + for (GenTableColumn column : table.getColumns()) { + if (column.isPk()) { + table.setPkColumn(column); + break; + } + } + if (ObjectUtil.isNull(table.getPkColumn())) { + table.setPkColumn(table.getColumns().get(0)); + } + + } + + /** + * 设置代码生成其他选项值 + * + * @param genTable 设置后的生成对象 + */ + public void setTableFromOptions(GenTable genTable) { + Dict paramsObj = JsonUtils.parseMap(genTable.getOptions()); + if (ObjectUtil.isNotNull(paramsObj)) { + String treeCode = paramsObj.getStr(GenConstants.TREE_CODE); + String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE); + String treeName = paramsObj.getStr(GenConstants.TREE_NAME); + Long parentMenuId = paramsObj.getLong(GenConstants.PARENT_MENU_ID); + String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME); + + genTable.setTreeCode(treeCode); + genTable.setTreeParentCode(treeParentCode); + genTable.setTreeName(treeName); + genTable.setParentMenuId(parentMenuId); + genTable.setParentMenuName(parentMenuName); + } + } + + /** + * 获取代码生成地址 + * + * @param table 业务表信息 + * @param template 模板文件路径 + * @return 生成地址 + */ + public static String getGenPath(GenTable table, String template) { + String genPath = table.getGenPath(); + if (StringUtils.equals(genPath, "/")) { + return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); + } + return genPath + File.separator + VelocityUtils.getFileName(template, table); + } +} + diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java new file mode 100644 index 0000000..b2c20c5 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java @@ -0,0 +1,141 @@ +package org.dromara.generator.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.generator.domain.GenTable; +import org.dromara.generator.domain.GenTableColumn; + +import java.util.List; +import java.util.Map; + +/** + * 业务 服务层 + * + * @author Lion Li + */ +public interface IGenTableService { + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + List selectGenTableColumnListByTableId(Long tableId); + + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + TableDataInfo selectPageGenTableList(GenTable genTable, PageQuery pageQuery); + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery); + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @param dataName 数据源名称 + * @return 数据库表集合 + */ + List selectDbTableListByNames(String[] tableNames, String dataName); + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + List selectGenTableAll(); + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + GenTable selectGenTableById(Long id); + + /** + * 修改业务 + * + * @param genTable 业务信息 + */ + void updateGenTable(GenTable genTable); + + /** + * 删除业务信息 + * + * @param tableIds 需要删除的表数据ID + */ + void deleteGenTableByIds(Long[] tableIds); + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + * @param dataName 数据源名称 + */ + void importGenTable(List tableList, String dataName); + + /** + * 根据表名称查询列信息 + * + * @param tableName 表名称 + * @param dataName 数据源名称 + * @return 列信息 + */ + List selectDbTableColumnsByName(String tableName, String dataName); + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + Map previewCode(Long tableId); + + /** + * 生成代码(下载方式) + * + * @param tableId 表名称 + * @return 数据 + */ + byte[] downloadCode(Long tableId); + + /** + * 生成代码(自定义路径) + * + * @param tableId 表名称 + */ + void generatorCode(Long tableId); + + /** + * 同步数据库 + * + * @param tableId 表名称 + */ + void synchDb(Long tableId); + + /** + * 批量生成代码(下载方式) + * + * @param tableIds 表ID数组 + * @return 数据 + */ + byte[] downloadCode(String[] tableIds); + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + void validateEdit(GenTable genTable); +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java new file mode 100644 index 0000000..996cf9b --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java @@ -0,0 +1,219 @@ +package org.dromara.generator.util; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.RegExUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.generator.config.GenConfig; +import org.dromara.generator.constant.GenConstants; +import org.dromara.generator.domain.GenTable; +import org.dromara.generator.domain.GenTableColumn; + +import java.util.Arrays; + +/** + * 代码生成器 工具类 + * + * @author ruoyi + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class GenUtils { + + /** + * 初始化表信息 + */ + public static void initTable(GenTable genTable) { + genTable.setClassName(convertClassName(genTable.getTableName())); + genTable.setPackageName(GenConfig.getPackageName()); + genTable.setModuleName(getModuleName(GenConfig.getPackageName())); + genTable.setBusinessName(getBusinessName(genTable.getTableName())); + genTable.setFunctionName(replaceText(genTable.getTableComment())); + genTable.setFunctionAuthor(GenConfig.getAuthor()); + genTable.setCreateTime(null); + genTable.setUpdateTime(null); + } + + /** + * 初始化列属性字段 + */ + public static void initColumnField(GenTableColumn column, GenTable table) { + String dataType = getDbType(column.getColumnType()); + // 统一转小写 避免有些数据库默认大写问题 如果需要特别书写方式 请在实体类增加注解标注别名 + String columnName = column.getColumnName().toLowerCase(); + column.setTableId(table.getTableId()); + column.setCreateTime(null); + column.setUpdateTime(null); + // 设置java字段名 + column.setJavaField(StringUtils.toCamelCase(columnName)); + // 设置默认类型 + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + + if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) { + // 字符串长度超过500设置为文本域 + Integer columnLength = getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); + } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) { + column.setHtmlType(GenConstants.HTML_INPUT); + // 数据库的数字字段与java不匹配 且很多数据库的数字字段很模糊 例如oracle只有number没有细分 + // 所以默认数字类型全为Long可在界面上自行编辑想要的类型 有什么特殊需求也可以在这里特殊处理 + column.setJavaType(GenConstants.TYPE_LONG); + } + + // BO对象 默认插入勾选 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) { + column.setIsInsert(GenConstants.REQUIRE); + } + // BO对象 默认编辑勾选 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) { + column.setIsEdit(GenConstants.REQUIRE); + } + // VO对象 默认返回勾选 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) { + column.setIsList(GenConstants.REQUIRE); + } + // BO对象 默认查询勾选 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) { + column.setIsQuery(GenConstants.REQUIRE); + } + + // 查询字段类型 + if (StringUtils.endsWithIgnoreCase(columnName, "name")) { + column.setQueryType(GenConstants.QUERY_LIKE); + } + // 状态字段设置单选框 + if (StringUtils.endsWithIgnoreCase(columnName, "status")) { + column.setHtmlType(GenConstants.HTML_RADIO); + } + // 类型&性别字段设置下拉框 + else if (StringUtils.endsWithIgnoreCase(columnName, "type") + || StringUtils.endsWithIgnoreCase(columnName, "sex")) { + column.setHtmlType(GenConstants.HTML_SELECT); + } + // 图片字段设置图片上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "image")) { + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } + // 文件字段设置文件上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "file")) { + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } + // 内容字段设置富文本控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "content")) { + column.setHtmlType(GenConstants.HTML_EDITOR); + } + } + + /** + * 校验数组是否包含指定值 + * + * @param arr 数组 + * @param targetValue 值 + * @return 是否包含 + */ + public static boolean arraysContains(String[] arr, String targetValue) { + return Arrays.asList(arr).contains(targetValue); + } + + /** + * 获取模块名 + * + * @param packageName 包名 + * @return 模块名 + */ + public static String getModuleName(String packageName) { + int lastIndex = packageName.lastIndexOf("."); + int nameLength = packageName.length(); + return StringUtils.substring(packageName, lastIndex + 1, nameLength); + } + + /** + * 获取业务名 + * + * @param tableName 表名 + * @return 业务名 + */ + public static String getBusinessName(String tableName) { + int firstIndex = tableName.indexOf("_"); + int nameLength = tableName.length(); + String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength); + businessName = StringUtils.toCamelCase(businessName); + return businessName; + } + + /** + * 表名转换成Java类名 + * + * @param tableName 表名称 + * @return 类名 + */ + public static String convertClassName(String tableName) { + boolean autoRemovePre = GenConfig.getAutoRemovePre(); + String tablePrefix = GenConfig.getTablePrefix(); + if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) { + String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR); + tableName = replaceFirst(tableName, searchList); + } + return StringUtils.convertToCamelCase(tableName); + } + + /** + * 批量替换前缀 + * + * @param replacementm 替换值 + * @param searchList 替换列表 + */ + public static String replaceFirst(String replacementm, String[] searchList) { + String text = replacementm; + for (String searchString : searchList) { + if (replacementm.startsWith(searchString)) { + text = replacementm.replaceFirst(searchString, StringUtils.EMPTY); + break; + } + } + return text; + } + + /** + * 关键字替换 + * + * @param text 需要被替换的名字 + * @return 替换后的名字 + */ + public static String replaceText(String text) { + return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + } + + /** + * 获取数据库类型字段 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static String getDbType(String columnType) { + if (StringUtils.indexOf(columnType, "(") > 0) { + return StringUtils.substringBefore(columnType, "("); + } else { + return columnType; + } + } + + /** + * 获取字段长度 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static Integer getColumnLength(String columnType) { + if (StringUtils.indexOf(columnType, "(") > 0) { + String length = StringUtils.substringBetween(columnType, "(", ")"); + return Integer.valueOf(length); + } else { + return 0; + } + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java new file mode 100644 index 0000000..09e0121 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java @@ -0,0 +1,35 @@ +package org.dromara.generator.util; + +import org.dromara.common.core.constant.Constants; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.velocity.app.Velocity; + +import java.util.Properties; + +/** + * VelocityEngine工厂 + * + * @author ruoyi + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class VelocityInitializer { + + /** + * 初始化vm方法 + */ + public static void initVelocity() { + Properties p = new Properties(); + try { + // 加载classpath目录下的vm文件 + p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + // 定义字符集 + p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); + // 初始化Velocity引擎,指定配置Properties + Velocity.init(p); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java new file mode 100644 index 0000000..6e111e3 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java @@ -0,0 +1,341 @@ +package org.dromara.generator.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.Dict; +import org.dromara.generator.constant.GenConstants; +import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.generator.domain.GenTable; +import org.dromara.generator.domain.GenTableColumn; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.velocity.VelocityContext; + +import java.util.*; + +/** + * 模板处理工具类 + * + * @author ruoyi + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class VelocityUtils { + + /** + * 项目空间路径 + */ + private static final String PROJECT_PATH = "main/java"; + + /** + * mybatis空间路径 + */ + private static final String MYBATIS_PATH = "main/resources/mapper"; + + /** + * 默认上级菜单,系统工具 + */ + private static final String DEFAULT_PARENT_MENU_ID = "3"; + + /** + * 设置模板变量信息 + * + * @return 模板列表 + */ + public static VelocityContext prepareContext(GenTable genTable) { + String moduleName = genTable.getModuleName(); + String businessName = genTable.getBusinessName(); + String packageName = genTable.getPackageName(); + String tplCategory = genTable.getTplCategory(); + String functionName = genTable.getFunctionName(); + + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("tplCategory", genTable.getTplCategory()); + velocityContext.put("tableName", genTable.getTableName()); + velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); + velocityContext.put("ClassName", genTable.getClassName()); + velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); + velocityContext.put("moduleName", genTable.getModuleName()); + velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); + velocityContext.put("businessName", genTable.getBusinessName()); + velocityContext.put("basePackage", getPackagePrefix(packageName)); + velocityContext.put("packageName", packageName); + velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("datetime", DateUtils.getDate()); + velocityContext.put("pkColumn", genTable.getPkColumn()); + velocityContext.put("importList", getImportList(genTable)); + velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); + velocityContext.put("columns", genTable.getColumns()); + velocityContext.put("table", genTable); + velocityContext.put("dicts", getDicts(genTable)); + setMenuVelocityContext(velocityContext, genTable); + if (GenConstants.TPL_TREE.equals(tplCategory)) { + setTreeVelocityContext(velocityContext, genTable); + } + return velocityContext; + } + + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { + String options = genTable.getOptions(); + Dict paramsObj = JsonUtils.parseMap(options); + String parentMenuId = getParentMenuId(paramsObj); + context.put("parentMenuId", parentMenuId); + } + + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { + String options = genTable.getOptions(); + Dict paramsObj = JsonUtils.parseMap(options); + String treeCode = getTreecode(paramsObj); + String treeParentCode = getTreeParentCode(paramsObj); + String treeName = getTreeName(paramsObj); + + context.put("treeCode", treeCode); + context.put("treeParentCode", treeParentCode); + context.put("treeName", treeName); + context.put("expandColumn", getExpandColumn(genTable)); + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { + context.put("tree_parent_code", paramsObj.get(GenConstants.TREE_PARENT_CODE)); + } + if (paramsObj.containsKey(GenConstants.TREE_NAME)) { + context.put("tree_name", paramsObj.get(GenConstants.TREE_NAME)); + } + } + + /** + * 获取模板信息 + * + * @return 模板列表 + */ + public static List getTemplateList(String tplCategory) { + List templates = new ArrayList<>(); + templates.add("vm/java/domain.java.vm"); + templates.add("vm/java/vo.java.vm"); + templates.add("vm/java/bo.java.vm"); + templates.add("vm/java/mapper.java.vm"); + templates.add("vm/java/service.java.vm"); + templates.add("vm/java/serviceImpl.java.vm"); + templates.add("vm/java/controller.java.vm"); + templates.add("vm/xml/mapper.xml.vm"); + if (DataBaseHelper.isOracle()) { + templates.add("vm/sql/oracle/sql.vm"); + } else if (DataBaseHelper.isPostgerSql()) { + templates.add("vm/sql/postgres/sql.vm"); + } else if (DataBaseHelper.isSqlServer()) { + templates.add("vm/sql/sqlserver/sql.vm"); + } else { + templates.add("vm/sql/sql.vm"); + } + templates.add("vm/ts/api.ts.vm"); + templates.add("vm/ts/types.ts.vm"); + if (GenConstants.TPL_CRUD.equals(tplCategory)) { + templates.add("vm/vue/index.vue.vm"); + } else if (GenConstants.TPL_TREE.equals(tplCategory)) { + templates.add("vm/vue/index-tree.vue.vm"); + } + return templates; + } + + /** + * 获取文件名 + */ + public static String getFileName(String template, GenTable genTable) { + // 文件名称 + String fileName = ""; + // 包路径 + String packageName = genTable.getPackageName(); + // 模块名 + String moduleName = genTable.getModuleName(); + // 大写类名 + String className = genTable.getClassName(); + // 业务名称 + String businessName = genTable.getBusinessName(); + + String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); + String mybatisPath = MYBATIS_PATH + "/" + moduleName; + String vuePath = "vue"; + + if (template.contains("domain.java.vm")) { + fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + } + if (template.contains("vo.java.vm")) { + fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className); + } + if (template.contains("bo.java.vm")) { + fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className); + } + if (template.contains("mapper.java.vm")) { + fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); + } else if (template.contains("service.java.vm")) { + fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); + } else if (template.contains("serviceImpl.java.vm")) { + fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); + } else if (template.contains("controller.java.vm")) { + fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); + } else if (template.contains("mapper.xml.vm")) { + fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); + } else if (template.contains("sql.vm")) { + fileName = businessName + "Menu.sql"; + } else if (template.contains("api.ts.vm")) { + fileName = StringUtils.format("{}/api/{}/{}/index.ts", vuePath, moduleName, businessName); + } else if (template.contains("types.ts.vm")) { + fileName = StringUtils.format("{}/api/{}/{}/types.ts", vuePath, moduleName, businessName); + } else if (template.contains("index.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } else if (template.contains("index-tree.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } + return fileName; + } + + /** + * 获取包前缀 + * + * @param packageName 包名称 + * @return 包前缀名称 + */ + public static String getPackagePrefix(String packageName) { + int lastIndex = packageName.lastIndexOf("."); + return StringUtils.substring(packageName, 0, lastIndex); + } + + /** + * 根据列类型获取导入包 + * + * @param genTable 业务表对象 + * @return 返回需要导入的包列表 + */ + public static HashSet getImportList(GenTable genTable) { + List columns = genTable.getColumns(); + HashSet importList = new HashSet<>(); + for (GenTableColumn column : columns) { + if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) { + importList.add("java.util.Date"); + importList.add("com.fasterxml.jackson.annotation.JsonFormat"); + } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { + importList.add("java.math.BigDecimal"); + } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { + importList.add("org.dromara.common.translation.annotation.Translation"); + importList.add("org.dromara.common.translation.constant.TransConstant"); + } + } + return importList; + } + + /** + * 根据列类型获取字典组 + * + * @param genTable 业务表对象 + * @return 返回字典组 + */ + public static String getDicts(GenTable genTable) { + List columns = genTable.getColumns(); + Set dicts = new HashSet<>(); + addDicts(dicts, columns); + return StringUtils.join(dicts, ", "); + } + + /** + * 添加字典列表 + * + * @param dicts 字典列表 + * @param columns 列集合 + */ + public static void addDicts(Set dicts, List columns) { + for (GenTableColumn column : columns) { + if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( + column.getHtmlType(), + new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) { + dicts.add("'" + column.getDictType() + "'"); + } + } + } + + /** + * 获取权限前缀 + * + * @param moduleName 模块名称 + * @param businessName 业务名称 + * @return 返回权限前缀 + */ + public static String getPermissionPrefix(String moduleName, String businessName) { + return StringUtils.format("{}:{}", moduleName, businessName); + } + + /** + * 获取上级菜单ID字段 + * + * @param paramsObj 生成其他选项 + * @return 上级菜单ID字段 + */ + public static String getParentMenuId(Dict paramsObj) { + if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) + && StringUtils.isNotEmpty(paramsObj.getStr(GenConstants.PARENT_MENU_ID))) { + return paramsObj.getStr(GenConstants.PARENT_MENU_ID); + } + return DEFAULT_PARENT_MENU_ID; + } + + /** + * 获取树编码 + * + * @param paramsObj 生成其他选项 + * @return 树编码 + */ + public static String getTreecode(Map paramsObj) { + if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) { + return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE))); + } + return StringUtils.EMPTY; + } + + /** + * 获取树父编码 + * + * @param paramsObj 生成其他选项 + * @return 树父编码 + */ + public static String getTreeParentCode(Dict paramsObj) { + if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { + return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_PARENT_CODE)); + } + return StringUtils.EMPTY; + } + + /** + * 获取树名称 + * + * @param paramsObj 生成其他选项 + * @return 树名称 + */ + public static String getTreeName(Dict paramsObj) { + if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) { + return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_NAME)); + } + return StringUtils.EMPTY; + } + + /** + * 获取需要在哪一列上面显示展开按钮 + * + * @param genTable 业务表对象 + * @return 展开按钮列序号 + */ + public static int getExpandColumn(GenTable genTable) { + String options = genTable.getOptions(); + Dict paramsObj = JsonUtils.parseMap(options); + String treeName = paramsObj.getStr(GenConstants.TREE_NAME); + int num = 0; + for (GenTableColumn column : genTable.getColumns()) { + if (column.isList()) { + num++; + String columnName = column.getColumnName(); + if (columnName.equals(treeName)) { + break; + } + } + } + return num; + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml new file mode 100644 index 0000000..d779d97 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml @@ -0,0 +1,10 @@ +# 代码生成 +gen: + # 作者 + author: Lion Li + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: org.dromara.system + # 自动去除表前缀,默认是false + autoRemovePre: false + # 表前缀(生成类名不会包含表前缀,多个用逗号分隔) + tablePrefix: sys_ diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..fc1c610 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..78aa852 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + SELECT t.table_id, t.data_name, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, + c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort + FROM gen_table t + LEFT JOIN gen_table_column c ON t.table_id = c.table_id + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm new file mode 100644 index 0000000..511d37c --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -0,0 +1,50 @@ +package ${packageName}.domain.bo; + +import ${packageName}.domain.${ClassName}; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +#foreach ($import in $importList) +import ${import}; +#end + +/** + * ${functionName}业务对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) +public class ${ClassName}Bo extends BaseEntity { + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) + /** + * $column.columnComment + */ +#if($column.insert && $column.edit) +#set($Group="AddGroup.class, EditGroup.class") +#elseif($column.insert) +#set($Group="AddGroup.class") +#elseif($column.edit) +#set($Group="EditGroup.class") +#end +#if($column.required) +#if($column.javaType == 'String') + @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) +#else + @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) +#end +#end + private $column.javaType $column.javaField; + +#end +#end + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 0000000..6438971 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1,115 @@ +package ${packageName}.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import ${packageName}.domain.vo.${ClassName}Vo; +import ${packageName}.domain.bo.${ClassName}Bo; +import ${packageName}.service.I${ClassName}Service; +#if($table.crud) +import org.dromara.common.mybatis.core.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName} + * + * @author ${author} + * @date ${datetime} + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController { + + private final I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @SaCheckPermission("${permissionPrefix}:list") + @GetMapping("/list") +#if($table.crud) + public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) { + return ${className}Service.queryPageList(bo, pageQuery); + } +#elseif($table.tree) + public R> list(${ClassName}Bo bo) { + List<${ClassName}Vo> list = ${className}Service.queryList(bo); + return R.ok(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @SaCheckPermission("${permissionPrefix}:export") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(${ClassName}Bo bo, HttpServletResponse response) { + List<${ClassName}Vo> list = ${className}Service.queryList(bo); + ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response); + } + + /** + * 获取${functionName}详细信息 + * + * @param ${pkColumn.javaField} 主键 + */ + @SaCheckPermission("${permissionPrefix}:query") + @GetMapping("/{${pkColumn.javaField}}") + public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空") + @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) { + return R.ok(${className}Service.queryById(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @SaCheckPermission("${permissionPrefix}:add") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) { + return toAjax(${className}Service.insertByBo(bo)); + } + + /** + * 修改${functionName} + */ + @SaCheckPermission("${permissionPrefix}:edit") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) { + return toAjax(${className}Service.updateByBo(bo)); + } + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField}s 主键串 + */ + @SaCheckPermission("${permissionPrefix}:remove") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { + return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true)); + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm new file mode 100644 index 0000000..205fb73 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -0,0 +1,60 @@ +package ${packageName}.domain; + +#foreach ($column in $columns) +#if($column.javaField=='tenantId') +#set($IsTenant=1) +#end +#end +#if($IsTenant==1) +import org.dromara.common.tenant.core.TenantEntity; +#else +import org.dromara.common.mybatis.core.domain.BaseEntity; +#end +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +#foreach ($import in $importList) +import ${import}; +#end + +import java.io.Serial; + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($IsTenant==1) +#set($Entity="TenantEntity") +#else +#set($Entity="BaseEntity") +#end +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("${tableName}") +public class ${ClassName} extends ${Entity} { + + @Serial + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** + * $column.columnComment + */ +#if($column.javaField=='delFlag') + @TableLogic +#end +#if($column.javaField=='version') + @Version +#end +#if($column.isPk==1) + @TableId(value = "$column.columnName") +#end + private $column.javaType $column.javaField; + +#end +#end + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm new file mode 100644 index 0000000..0922401 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm @@ -0,0 +1,15 @@ +package ${packageName}.mapper; + +import ${packageName}.domain.${ClassName}; +import ${packageName}.domain.vo.${ClassName}Vo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> { + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm new file mode 100644 index 0000000..4db9030 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -0,0 +1,72 @@ +package ${packageName}.service; + +import ${packageName}.domain.vo.${ClassName}Vo; +import ${packageName}.domain.bo.${ClassName}Bo; +#if($table.crud) +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +#end + +import java.util.Collection; +import java.util.List; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service { + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} 主键 + * @return ${functionName} + */ + ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}); + +#if($table.crud) + /** + * 分页查询${functionName}列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return ${functionName}分页列表 + */ + TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery); +#end + + /** + * 查询符合条件的${functionName}列表 + * + * @param bo 查询条件 + * @return ${functionName}列表 + */ + List<${ClassName}Vo> queryList(${ClassName}Bo bo); + + /** + * 新增${functionName} + * + * @param bo ${functionName} + * @return 是否新增成功 + */ + Boolean insertByBo(${ClassName}Bo bo); + + /** + * 修改${functionName} + * + * @param bo ${functionName} + * @return 是否修改成功 + */ + Boolean updateByBo(${ClassName}Bo bo); + + /** + * 校验并批量删除${functionName}信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..48cc8b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -0,0 +1,158 @@ +package ${packageName}.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +#if($table.crud) +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +#end +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import ${packageName}.domain.bo.${ClassName}Bo; +import ${packageName}.domain.vo.${ClassName}Vo; +import ${packageName}.domain.${ClassName}; +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.service.I${ClassName}Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@RequiredArgsConstructor +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service { + + private final ${ClassName}Mapper baseMapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} 主键 + * @return ${functionName} + */ + @Override + public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){ + return baseMapper.selectVoById(${pkColumn.javaField}); + } + +#if($table.crud) + /** + * 分页查询${functionName}列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return ${functionName}分页列表 + */ + @Override + public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { + LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); + Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } +#end + + /** + * 查询符合条件的${functionName}列表 + * + * @param bo 查询条件 + * @return ${functionName}列表 + */ + @Override + public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { + LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); +#foreach($column in $columns) +#if($column.query) +#set($queryType=$column.queryType) +#set($javaField=$column.javaField) +#set($javaType=$column.javaType) +#set($columnName=$column.columnName) +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#set($mpMethod=$column.queryType.toLowerCase()) +#if($queryType != 'BETWEEN') +#if($javaType == 'String') +#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') +#else +#set($condition='bo.get'+$AttrName+'() != null') +#end + lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()); +#else + lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null, + ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")); +#end +#end +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#if($column.isPk==1) + lqw.orderByAsc(${ClassName}::get$AttrName); +#end +#end + return lqw; + } + + /** + * 新增${functionName} + * + * @param bo ${functionName} + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(${ClassName}Bo bo) { + ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; +#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) + if (flag) { + bo.set$pk(add.get$pk()); + } + return flag; + } + + /** + * 修改${functionName} + * + * @param bo ${functionName} + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(${ClassName}Bo bo) { + ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(${ClassName} entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除${functionName}信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm new file mode 100644 index 0000000..5591f97 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -0,0 +1,66 @@ +package ${packageName}.domain.vo; + +#foreach ($import in $importList) +import ${import}; +#end +import ${packageName}.domain.${ClassName}; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * ${functionName}视图对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ${ClassName}.class) +public class ${ClassName}Vo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if($column.list) + /** + * $column.columnComment + */ +#set($parentheseIndex=$column.columnComment.indexOf("(")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if(${column.dictType} && ${column.dictType} != '') + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "${column.dictType}") +#elseif($parentheseIndex != -1) + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") +#else + @ExcelProperty(value = "${comment}") +#end + private $column.javaType $column.javaField; + +#if($column.htmlType == "imageUpload") + /** + * ${column.columnComment}Url + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "${column.javaField}") + private String ${column.javaField}Url; +#end +#end +#end + +} diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm new file mode 100644 index 0000000..f6638be --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm @@ -0,0 +1,19 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate, null, null, '${functionName}菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, sysdate, null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, sysdate, null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, sysdate, null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, sysdate, null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, sysdate, null, null, ''); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm new file mode 100644 index 0000000..0923392 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm @@ -0,0 +1,20 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, now(), null, null, '${functionName}菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, now(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, now(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, now(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, now(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, now(), null, null, ''); + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm new file mode 100644 index 0000000..01824c2 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm @@ -0,0 +1,19 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate(), null, null, '${functionName}菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, sysdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, sysdate(), null, null, ''); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm new file mode 100644 index 0000000..bdf166e --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm @@ -0,0 +1,19 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, getdate(), null, null, '${functionName}菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 103, 1, getdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 103, 1, getdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 103, 1, getdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 103, 1, getdate(), null, null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) +values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 103, 1, getdate(), null, null, ''); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm new file mode 100644 index 0000000..9ef9ff4 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import {AxiosPromise} from 'axios'; +import {${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO} from '@/api/'; + +/** + * 查询${functionName}列表 + * @param query + * @returns {*} + */ + +export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }); +}; + +/** + * 查询${functionName}详细 + * @param ${pkColumn.javaField} + */ +export const get${BusinessName} = (${pkColumn.javaField}: string | number): AxiosPromise<${BusinessName}VO> => { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }); +}; + +/** + * 新增${functionName} + * @param data + */ +export const add${BusinessName} = (data: ${BusinessName}Form) => { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }); +}; + +/** + * 修改${functionName} + * @param data + */ +export const update${BusinessName} = (data: ${BusinessName}Form) => { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }); +}; + +/** + * 删除${functionName} + * @param ${pkColumn.javaField} + */ +export const del${BusinessName} = (${pkColumn.javaField}: string | number | Array) => { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }); +}; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm new file mode 100644 index 0000000..35a468e --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm @@ -0,0 +1,64 @@ +export interface ${BusinessName}VO { +#foreach ($column in $columns) +#if($column.list) + /** + * $column.columnComment + */ + $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#if($column.htmlType == "imageUpload") + /** + * ${column.columnComment}Url + */ + ${column.javaField}Url: string; +#end +#end +#end +#if ($table.tree) + /** + * 子对象 + */ + children: ${BusinessName}VO[]; +#end +} + +export interface ${BusinessName}Form extends BaseEntity { +#foreach ($column in $columns) +#if($column.insert || $column.edit) + /** + * $column.columnComment + */ + $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#end +#end +} + +export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{ + +#foreach ($column in $columns) +#if($column.query) + /** + * $column.columnComment + */ + $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#end +#end + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..b038e49 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 0000000..8359fef --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -0,0 +1,466 @@ + + + diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..9fb48d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml new file mode 100644 index 0000000..1a44d70 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -0,0 +1,37 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + jar + ruoyi-job + + + 任务调度 + + + + + + + org.dromara + ruoyi-common-json + + + + org.dromara + ruoyi-common-job + + + org.dromara + ruoyi-mall + + + + + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java new file mode 100644 index 0000000..2f118b0 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java @@ -0,0 +1 @@ +package org.dromara.job; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderStatusJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderStatusJobExecutor.java new file mode 100644 index 0000000..0963f2d --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/OrderStatusJobExecutor.java @@ -0,0 +1,52 @@ +package org.dromara.job.snailjob; + +import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; +import com.aizuda.snailjob.client.model.ExecuteResult; +import lombok.RequiredArgsConstructor; +import org.dromara.mall.domain.HyOrderItem; +import org.dromara.mall.domain.bo.HyOrderItemBo; +import org.dromara.mall.domain.vo.HyOrderItemVo; +import org.dromara.mall.service.IHyOrderItemService; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Maosw + * @date 2025-02-17 + */ +@Component +@RequiredArgsConstructor +@JobExecutor(name = "orderStatusJobExecutor") +public class OrderStatusJobExecutor { + + private final IHyOrderItemService hyOrderItemService; + + + /** + * 更新订单状态(订单状态发货后7天自动变成待评价) + * @return + */ + public ExecuteResult jobExecute() { + // 获取订单id + HyOrderItemBo bo = new HyOrderItemBo(); + bo.setStatus(3L); + List list = hyOrderItemService.queryList(bo); + + List list1 = new ArrayList<>(); + for (HyOrderItemVo hyOrderItemVo : list) { + HyOrderItem orderItem = new HyOrderItem(); + //判断发货时间对比当前时间超过7天,则更新订单状态为待评价 + if (hyOrderItemVo.getDvyTime().getTime() + 7 * 24 * 60 * 60 * 1000 <= System.currentTimeMillis()) { + orderItem.setId(hyOrderItemVo.getId()); + orderItem.setStatus(4); + list1.add(orderItem); + } + } + // 批量更新订单状态为待评价 + boolean success = hyOrderItemService.updateBatchById(list1); + return ExecuteResult.success("更新订单调度成功"); + } + +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java new file mode 100644 index 0000000..9229bd9 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java @@ -0,0 +1,24 @@ +package org.dromara.job.snailjob; + +import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; +import com.aizuda.snailjob.client.job.core.dto.JobArgs; +import com.aizuda.snailjob.client.model.ExecuteResult; +import com.aizuda.snailjob.common.core.util.JsonUtil; +import com.aizuda.snailjob.common.log.SnailJobLog; +import org.springframework.stereotype.Component; + +/** + * @author opensnail + * @date 2024-05-17 + */ +@Component +@JobExecutor(name = "testJobExecutor") +public class TestAnnoJobExecutor { + + public ExecuteResult jobExecute(JobArgs jobArgs) { + SnailJobLog.LOCAL.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs)); + SnailJobLog.REMOTE.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs)); + return ExecuteResult.success("测试成功"); + } + +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java new file mode 100644 index 0000000..6f7c21f --- /dev/null +++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java @@ -0,0 +1,19 @@ +package org.dromara.job.snailjob; + +import com.aizuda.snailjob.client.job.core.dto.JobArgs; +import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; +import com.aizuda.snailjob.client.model.ExecuteResult; +import org.springframework.stereotype.Component; + +/** + * @author opensnail + * @date 2024-05-17 + */ +@Component +public class TestClassJobExecutor extends AbstractJobExecutor { + + @Override + protected ExecuteResult doJobExecute(JobArgs jobArgs) { + return ExecuteResult.success("TestJobExecutor测试成功"); + } +} diff --git a/ruoyi-modules/ruoyi-mall/pom.xml b/ruoyi-modules/ruoyi-mall/pom.xml new file mode 100644 index 0000000..d73fdf5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/pom.xml @@ -0,0 +1,150 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + ruoyi-mall + + + 商城模块 + + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-sms + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-common-redis + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-excel + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-ratelimiter + + + + org.dromara + ruoyi-common-translation + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-system + + + + org.dromara + ruoyi-common-websocket + + + + + com.github.yulichang + mybatis-plus-join-boot-starter + ${com.github.yulichang.version} + + + + com.google.guava + guava + ${com.google.guava.version} + compile + + + + + org.apache.logging.log4j + log4j-api + ${org.apache.logging.log4j.version} + + + org.apache.logging.log4j + log4j-core + ${org.apache.logging.log4j.version} + + + org.dromara + ruoyi-common-pay + 5.3.0 + compile + + + org.dromara + ruoyi-common-pay-new + 5.3.0 + compile + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyBasketController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyBasketController.java new file mode 100644 index 0000000..61b8bb7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyBasketController.java @@ -0,0 +1,94 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyBasketBo; +import org.dromara.mall.domain.vo.HyBasketVo; +import org.dromara.mall.service.IHyBasketService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 购物车 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/basket") +public class HyBasketController extends BaseController { + + private final IHyBasketService hyBasketService; + + /** + * 查询购物车列表 + */ + @SaCheckPermission("mall:basket:list") + @GetMapping("/list") + public TableDataInfo list(HyBasketBo bo, PageQuery pageQuery) { + return hyBasketService.queryPageList(bo, pageQuery); + } + + /** + * 导出购物车列表 + */ + @SaCheckPermission("mall:basket:export") + @Log(title = "购物车", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyBasketBo bo, HttpServletResponse response) { + List list = hyBasketService.queryList(bo); + ExcelUtil.exportExcel(list, "购物车", HyBasketVo.class, response); + } + + /** + * 获取购物车详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:basket:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyBasketService.queryById(id)); + } + + /** + * 修改购物车 + */ + @SaCheckPermission("mall:basket:edit") + @Log(title = "购物车", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyBasketBo bo) { + return toAjax(hyBasketService.updateByBo(bo)); + } + + /** + * 删除购物车 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:basket:remove") + @Log(title = "购物车", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyBasketService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCodeOrderController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCodeOrderController.java new file mode 100644 index 0000000..882ff0f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCodeOrderController.java @@ -0,0 +1,116 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyCodeOrderBo; +import org.dromara.mall.domain.vo.HyCodeOrderSumVo; +import org.dromara.mall.domain.vo.HyCodeOrderVo; +import org.dromara.mall.service.IHyCodeOrderService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 会员码订单 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/codeOrder") +public class HyCodeOrderController extends BaseController { + + private final IHyCodeOrderService hyCodeOrderService; + + /** + * 查询会员码订单列表 + */ + @SaCheckPermission("mall:codeOrder:list") + @GetMapping("/list") + public TableDataInfo list(HyCodeOrderBo bo, PageQuery pageQuery) { + return hyCodeOrderService.queryPageList(bo, pageQuery); + } + + /** + * 查询会员码订单统计信息 + */ + @SaCheckPermission("mall:codeOrder:list") + @GetMapping("/listSum") + public R listSum(HyCodeOrderBo bo) { + return R.ok(hyCodeOrderService.querySum(bo)); + } + + /** + * 导出会员码订单列表 + */ + @SaCheckPermission("mall:codeOrder:export") + @Log(title = "会员码订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyCodeOrderBo bo, HttpServletResponse response) { + List list = hyCodeOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "会员码订单", HyCodeOrderVo.class, response); + } + + /** + * 获取会员码订单详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:codeOrder:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyCodeOrderService.queryById(id)); + } + + /** + * 新增会员码订单 + */ + @SaCheckPermission("mall:codeOrder:add") + @Log(title = "会员码订单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyCodeOrderBo bo) { + return toAjax(hyCodeOrderService.insertByBo(bo)); + } + + /** + * 修改会员码订单 + */ + @SaCheckPermission("mall:codeOrder:edit") + @Log(title = "会员码订单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyCodeOrderBo bo) { + return toAjax(hyCodeOrderService.updateByBo(bo)); + } + + /** + * 删除会员码订单 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:codeOrder:remove") + @Log(title = "会员码订单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyCodeOrderService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCouponRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCouponRecordController.java new file mode 100644 index 0000000..c09dfc6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyCouponRecordController.java @@ -0,0 +1,67 @@ +package org.dromara.mall.controller; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyCouponRecordBo; +import org.dromara.mall.domain.vo.HyCouponRecordVo; +import org.dromara.mall.service.IHyCouponRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/coupon/record") +public class HyCouponRecordController extends BaseController { + + private final IHyCouponRecordService couponRecordService; + + /** + * 查询会员券抵金记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(HyCouponRecordBo bo, PageQuery pageQuery) { + return couponRecordService.queryPageList(bo, pageQuery); + } + + /** + * 获取会员券抵金记录详细信息 + */ + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(couponRecordService.queryById(id)); + } + + /** + * 新增会员券抵金记录 + */ + @PostMapping + public R add(@Validated(AddGroup.class) @RequestBody HyCouponRecordBo bo) { + return toAjax(couponRecordService.insertByBo(bo)); + } + + /** + * 修改会员券抵金记录 + */ + @PutMapping + public R edit(@Validated(EditGroup.class) @RequestBody HyCouponRecordBo bo) { + return toAjax(couponRecordService.updateByBo(bo)); + } + + /** + * 删除会员券抵金记录 + */ + @DeleteMapping("/{ids}") + public R remove(@PathVariable Long[] ids) { + return toAjax(couponRecordService.deleteByIds(ids)); + } + + private R toAjax(Boolean result) { + return result ? R.ok() : R.fail(); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyMemberCodeController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyMemberCodeController.java new file mode 100644 index 0000000..fa5b981 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyMemberCodeController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyMemberCodeBo; +import org.dromara.mall.domain.vo.HyMemberCodeVo; +import org.dromara.mall.service.IHyMemberCodeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 会员码兑换 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/memberCode") +public class HyMemberCodeController extends BaseController { + + private final IHyMemberCodeService hyMemberCodeService; + + /** + * 查询会员码兑换列表 + */ + @SaCheckPermission("mall:memberCode:list") + @GetMapping("/list") + public TableDataInfo list(HyMemberCodeBo bo, PageQuery pageQuery) { + return hyMemberCodeService.queryPageList(bo, pageQuery); + } + + /** + * 导出会员码兑换列表 + */ + @SaCheckPermission("mall:memberCode:export") + @Log(title = "会员码兑换", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyMemberCodeBo bo, HttpServletResponse response) { + List list = hyMemberCodeService.queryList(bo); + ExcelUtil.exportExcel(list, "会员码兑换", HyMemberCodeVo.class, response); + } + + /** + * 获取会员码兑换详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:memberCode:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyMemberCodeService.queryById(id)); + } + + /** + * 新增会员码兑换 + */ + @SaCheckPermission("mall:memberCode:add") + @Log(title = "会员码兑换", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyMemberCodeBo bo) { + return toAjax(hyMemberCodeService.insertByBo(bo)); + } + + /** + * 修改会员码兑换 + */ + @SaCheckPermission("mall:memberCode:edit") + @Log(title = "会员码兑换", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyMemberCodeBo bo) { + return toAjax(hyMemberCodeService.updateByBo(bo)); + } + + /** + * 删除会员码兑换 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:memberCode:remove") + @Log(title = "会员码兑换", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyMemberCodeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderController.java new file mode 100644 index 0000000..8967a65 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderController.java @@ -0,0 +1,128 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyOrderBo; +import org.dromara.mall.domain.vo.HyOrderSumVo; +import org.dromara.mall.domain.vo.HyOrderVo; +import org.dromara.mall.service.IHyOrderService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 总订单 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/order") +public class HyOrderController extends BaseController { + + private final IHyOrderService hyOrderService; + + /** + * 查询总订单列表 + */ + @SaCheckPermission("mall:order:list") + @GetMapping("/list") + public TableDataInfo list(HyOrderBo bo, PageQuery pageQuery) { + return hyOrderService.queryPageList(bo, pageQuery); + } + + /** + * 查询总订单统计信息 + */ + @SaCheckPermission("mall:order:list") + @GetMapping("/listSum") + public R listSum(HyOrderBo bo) { + return R.ok(hyOrderService.querySum(bo)); + } + + /** + * 导出总订单列表 + */ + @SaCheckPermission("mall:order:export") + @Log(title = "总订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyOrderBo bo, HttpServletResponse response) { + List list = hyOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "总订单", HyOrderVo.class, response); + } + + /** + * 获取总订单详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:order:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyOrderService.queryById(id)); + } + + /** + * 新增总订单 + */ + @SaCheckPermission("mall:order:add") + @Log(title = "总订单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyOrderBo bo) { + return toAjax(hyOrderService.insertByBo(bo)); + } + + /** + * 修改总订单 + */ + @SaCheckPermission("mall:order:edit") + @Log(title = "总订单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyOrderBo bo) { + return toAjax(hyOrderService.updateByBo(bo)); + } + + /** + * 删除总订单 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:order:remove") + @Log(title = "总订单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyOrderService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 订单退款 + */ + @SaCheckPermission("mall:order:refund") + @Log(title = "订单退款", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/refund") + public R refund(@Validated(EditGroup.class) @RequestBody HyOrderBo bo) throws Exception { + return toAjax(hyOrderService.refund(bo)); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderItemController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderItemController.java new file mode 100644 index 0000000..0b8813f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderItemController.java @@ -0,0 +1,154 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyOrderItemBo; +import org.dromara.mall.domain.vo.HyOrderItemSumVo; +import org.dromara.mall.domain.vo.HyOrderItemVo; +import org.dromara.mall.service.IHyOrderItemService; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantVo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单详情 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderItem") +public class HyOrderItemController extends BaseController { + + private final IHyOrderItemService hyOrderItemService; + + /** + * 查询订单详情列表 + */ + @SaCheckPermission("mall:orderItem:list") + @GetMapping("/list") + @InterceptorIgnore(tenantLine = "true") + public TableDataInfo list(HyOrderItemBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return hyOrderItemService.queryPageList(bo, pageQuery); + } + + /** + * 查询订单详情统计信息 + */ + @SaCheckPermission("mall:orderItem:list") + @GetMapping("/listSum") + public R listSum(HyOrderItemBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return R.ok(hyOrderItemService.querySum(bo)); + } + + /** + * 查询厂家销量排行榜列表 + */ + @SaCheckPermission("system:tenant:listChart") + @GetMapping("/listChart") + public TableDataInfo listChart(SysTenantBo bo, PageQuery pageQuery) { + return hyOrderItemService.queryPageListChart(bo, pageQuery); + } + + /** + * 导出订单详情列表 + */ + @SaCheckPermission("mall:orderItem:export") + @Log(title = "订单详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyOrderItemBo bo, HttpServletResponse response) { + List list = hyOrderItemService.queryList(bo); + ExcelUtil.exportExcel(list, "订单详情", HyOrderItemVo.class, response); + } + + /** + * 获取订单详情详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderItem:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyOrderItemService.queryById(id)); + } + + /** + * 修改订单详情 + */ + @SaCheckPermission("mall:orderItem:edit") + @Log(title = "订单详情", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyOrderItemBo bo) { + return toAjax(hyOrderItemService.updateByBo(bo)); + } + + /** + * 删除订单详情 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:orderItem:remove") + @Log(title = "订单详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyOrderItemService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 确认订单 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderItem:confirm") + @GetMapping("/confirm/{id}") + public R confirmOrder(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyOrderItemService.confirmOrder(id)); + } + + /** + * 订单退款 + */ + @SaCheckPermission("mall:orderItem:refund") + @Log(title = "订单退款", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/refund") + public R refund(@Validated(EditGroup.class) @RequestBody HyOrderItemBo bo) throws Exception { + return toAjax(hyOrderItemService.refund(bo)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderPaymentController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderPaymentController.java new file mode 100644 index 0000000..7ce205b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyOrderPaymentController.java @@ -0,0 +1,159 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyOrderPaymentBo; +import org.dromara.mall.domain.vo.HyOrderPaymenSumVo; +import org.dromara.mall.domain.vo.HyOrderPaymentVo; +import org.dromara.mall.service.IHyOrderPaymentService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单打款 + * + * @author Maosw + * @date 2024-12-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderPayment") +public class HyOrderPaymentController extends BaseController { + + private final IHyOrderPaymentService hyOrderPaymentService; + + /** + * 查询订单打款列表 + */ + @SaCheckPermission("mall:orderPayment:list") + @GetMapping("/list") + public TableDataInfo list(HyOrderPaymentBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return hyOrderPaymentService.queryPageList(bo, pageQuery); + } + + /** + * 查询订单打款统计信息 + */ + @SaCheckPermission("mall:orderPayment:list") + @GetMapping("/listSum") + public R listSum(HyOrderPaymentBo bo) { + return R.ok(hyOrderPaymentService.querySum(bo)); + } + + /** + * 导出订单打款列表 + */ + @SaCheckPermission("mall:orderPayment:export") + @Log(title = "订单打款", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyOrderPaymentBo bo, HttpServletResponse response) { + List list = hyOrderPaymentService.queryList(bo); + ExcelUtil.exportExcel(list, "订单打款", HyOrderPaymentVo.class, response); + } + + /** + * 获取订单打款详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderPayment:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyOrderPaymentService.queryById(id)); + } + + /** + * 新增订单打款 + */ + @SaCheckPermission("mall:orderPayment:add") + @Log(title = "订单打款", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyOrderPaymentBo bo) { + return toAjax(hyOrderPaymentService.insertByBo(bo)); + } + + /** + * 修改订单打款 + */ + @SaCheckPermission("mall:orderPayment:edit") + @Log(title = "订单打款", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyOrderPaymentBo bo) { + return toAjax(hyOrderPaymentService.updateByBo(bo)); + } + + /** + * 删除订单打款 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:orderPayment:remove") + @Log(title = "订单打款", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyOrderPaymentService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 租户提现 + * @param bo + * @return + */ + @SaCheckPermission("mall:orderPayment:withdrawal") + @Log(title = "租户提现", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/withdrawal") + public R withdrawal(@Validated(AddGroup.class) @RequestBody HyOrderPaymentBo bo) { + return toAjax(hyOrderPaymentService.withdrawal(bo)); + } + + /** + * 标记已打款 + */ + @SaCheckPermission("mall:orderPayment:edit") + @Log(title = "订单打款", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/mark") + public R mark(@Validated(EditGroup.class) @RequestBody HyOrderPaymentBo bo) { + return toAjax(hyOrderPaymentService.mark(bo)); + } + + /** + * 审核拒绝 + */ + @SaCheckPermission("mall:orderPayment:edit") + @Log(title = "审核拒绝", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/refuse") + public R refuse(@Validated(EditGroup.class) @RequestBody HyOrderPaymentBo bo) { + return toAjax(hyOrderPaymentService.refuse(bo)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterController.java new file mode 100644 index 0000000..9110e53 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterController.java @@ -0,0 +1,140 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyPromoterBo; +import org.dromara.mall.domain.vo.HyPromoterSumVo; +import org.dromara.mall.domain.vo.HyPromoterVo; +import org.dromara.mall.service.IHyPromoterService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 推广员 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/promoter") +public class HyPromoterController extends BaseController { + + private final IHyPromoterService hyPromoterService; + + /** + * 查询推广员列表 + */ + @SaCheckPermission("mall:promoter:list") + @GetMapping("/list") + public TableDataInfo list(HyPromoterBo bo, PageQuery pageQuery) { + return hyPromoterService.queryPageList(bo, pageQuery); + } + + /** + * 查询推广员统计信息 + */ + @SaCheckPermission("mall:promoter:list") + @GetMapping("/listSum") + public R listSum(HyPromoterBo bo) { + return R.ok(hyPromoterService.querySum(bo)); + } + + /** + * 查询渠道下单排行榜列表 + */ + @SaCheckPermission("mall:promoter:listChart") + @GetMapping("/listChart") + public TableDataInfo listChart(HyPromoterBo bo, PageQuery pageQuery) { + return hyPromoterService.queryPageListChart(bo, pageQuery); + } + + /** + * 导出推广员列表 + */ + @SaCheckPermission("mall:promoter:export") + @Log(title = "推广员", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyPromoterBo bo, HttpServletResponse response) { + List list = hyPromoterService.queryList(bo); + ExcelUtil.exportExcel(list, "推广员", HyPromoterVo.class, response); + } + + /** + * 获取推广员详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:promoter:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyPromoterService.queryById(id)); + } + + /** + * 新增推广员 + */ + @SaCheckPermission("mall:promoter:add") + @Log(title = "推广员", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyPromoterBo bo) { + // 验证手机号是否已注册 + if (hyPromoterService.checkPhoneUnique(bo.getPhone())) { + return R.fail("该手机号已注册"); + } + return toAjax(hyPromoterService.register(bo)); + } + + /** + * 修改推广员 + */ + @SaCheckPermission("mall:promoter:edit") + @Log(title = "推广员", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyPromoterBo bo) { + return toAjax(hyPromoterService.updateByBo(bo)); + } + + /** + * 重置密码 + */ + @SaCheckPermission("mall:promoter:resetPwd") + @Log(title = "推广员", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/resetPwd") + public R resetPwd(@Validated(EditGroup.class) @RequestBody HyPromoterBo bo) { + return toAjax(hyPromoterService.resetPasswordAdmin(bo)); + } + + /** + * 删除推广员 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:promoter:remove") + @Log(title = "推广员", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyPromoterService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterRecordController.java new file mode 100644 index 0000000..8410aea --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyPromoterRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyPromoterRecordBo; +import org.dromara.mall.domain.vo.HyPromoterRecordVo; +import org.dromara.mall.service.IHyPromoterRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 推广员资金记录 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/promoterRecord") +public class HyPromoterRecordController extends BaseController { + + private final IHyPromoterRecordService hyPromoterRecordService; + + /** + * 查询推广员资金记录列表 + */ + @SaCheckPermission("mall:promoterRecord:list") + @GetMapping("/list") + public TableDataInfo list(HyPromoterRecordBo bo, PageQuery pageQuery) { + return hyPromoterRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出推广员资金记录列表 + */ + @SaCheckPermission("mall:promoterRecord:export") + @Log(title = "推广员资金记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyPromoterRecordBo bo, HttpServletResponse response) { + List list = hyPromoterRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "推广员资金记录", HyPromoterRecordVo.class, response); + } + + /** + * 获取推广员资金记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:promoterRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyPromoterRecordService.queryById(id)); + } + + /** + * 新增推广员资金记录 + */ + @SaCheckPermission("mall:promoterRecord:add") + @Log(title = "推广员资金记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyPromoterRecordBo bo) { + return toAjax(hyPromoterRecordService.insertByBo(bo)); + } + + /** + * 修改推广员资金记录 + */ + @SaCheckPermission("mall:promoterRecord:edit") + @Log(title = "推广员资金记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyPromoterRecordBo bo) { + return toAjax(hyPromoterRecordService.updateByBo(bo)); + } + + /** + * 删除推广员资金记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:promoterRecord:remove") + @Log(title = "推广员资金记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyPromoterRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyUserRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyUserRecordController.java new file mode 100644 index 0000000..c40a898 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/HyUserRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.HyUserRecordBo; +import org.dromara.mall.domain.vo.HyUserRecordVo; +import org.dromara.mall.service.IHyUserRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户资金记录 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userRecord") +public class HyUserRecordController extends BaseController { + + private final IHyUserRecordService hyUserRecordService; + + /** + * 查询用户资金记录列表 + */ + @SaCheckPermission("mall:userRecord:list") + @GetMapping("/list") + public TableDataInfo list(HyUserRecordBo bo, PageQuery pageQuery) { + return hyUserRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户资金记录列表 + */ + @SaCheckPermission("mall:userRecord:export") + @Log(title = "用户资金记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HyUserRecordBo bo, HttpServletResponse response) { + List list = hyUserRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "用户资金记录", HyUserRecordVo.class, response); + } + + /** + * 获取用户资金记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:userRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(hyUserRecordService.queryById(id)); + } + + /** + * 新增用户资金记录 + */ + @SaCheckPermission("mall:userRecord:add") + @Log(title = "用户资金记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody HyUserRecordBo bo) { + return toAjax(hyUserRecordService.insertByBo(bo)); + } + + /** + * 修改用户资金记录 + */ + @SaCheckPermission("mall:userRecord:edit") + @Log(title = "用户资金记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody HyUserRecordBo bo) { + return toAjax(hyUserRecordService.updateByBo(bo)); + } + + /** + * 删除用户资金记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:userRecord:remove") + @Log(title = "用户资金记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(hyUserRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/LakalaController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/LakalaController.java new file mode 100644 index 0000000..7649fe9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/LakalaController.java @@ -0,0 +1,30 @@ +package org.dromara.mall.controller; + +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaBusinessUtils; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 拉卡拉接口 + * @author Maosw + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/Lakala") +@Tag(name = "拉卡拉接口") +public class LakalaController { + + @GetMapping("/getToken") + @Operation(summary = "获取SAAS商户Token信息" , description = "获取SAAS商户Token信息") + public R getToken() { + return R.ok(V3LakalaBusinessUtils.getAccessToken()); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAgreementController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAgreementController.java new file mode 100644 index 0000000..0c7f8ae --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAgreementController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzAgreementBo; +import org.dromara.mall.domain.vo.TzAgreementVo; +import org.dromara.mall.service.ITzAgreementService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 协议 + * + * @author Maosw + * @date 2024-12-26 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/agreement") +public class TzAgreementController extends BaseController { + + private final ITzAgreementService tzAgreementService; + + /** + * 查询协议列表 + */ + @SaCheckPermission("mall:agreement:list") + @GetMapping("/list") + public TableDataInfo list(TzAgreementBo bo, PageQuery pageQuery) { + return tzAgreementService.queryPageList(bo, pageQuery); + } + + /** + * 导出协议列表 + */ + @SaCheckPermission("mall:agreement:export") + @Log(title = "协议", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzAgreementBo bo, HttpServletResponse response) { + List list = tzAgreementService.queryList(bo); + ExcelUtil.exportExcel(list, "协议", TzAgreementVo.class, response); + } + + /** + * 获取协议详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:agreement:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzAgreementService.queryById(id)); + } + + /** + * 新增协议 + */ + @SaCheckPermission("mall:agreement:add") + @Log(title = "协议", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzAgreementBo bo) { + return toAjax(tzAgreementService.insertByBo(bo)); + } + + /** + * 修改协议 + */ + @SaCheckPermission("mall:agreement:edit") + @Log(title = "协议", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzAgreementBo bo) { + return toAjax(tzAgreementService.updateByBo(bo)); + } + + /** + * 删除协议 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:agreement:remove") + @Log(title = "协议", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzAgreementService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAreaController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAreaController.java new file mode 100644 index 0000000..d06cd4b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAreaController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzAreaBo; +import org.dromara.mall.domain.vo.TzAreaVo; +import org.dromara.mall.service.ITzAreaService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/area") +public class TzAreaController extends BaseController { + + private final ITzAreaService tzAreaService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:area:list") + @GetMapping("/list") + public TableDataInfo list(TzAreaBo bo, PageQuery pageQuery) { + return tzAreaService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:area:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzAreaBo bo, HttpServletResponse response) { + List list = tzAreaService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzAreaVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param areaId 主键 + */ + @SaCheckPermission("mall:area:query") + @GetMapping("/{areaId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long areaId) { + return R.ok(tzAreaService.queryById(areaId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:area:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzAreaBo bo) { + return toAjax(tzAreaService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:area:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzAreaBo bo) { + return toAjax(tzAreaService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param areaIds 主键串 + */ + @SaCheckPermission("mall:area:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{areaIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] areaIds) { + return toAjax(tzAreaService.deleteWithValidByIds(List.of(areaIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAttachFileController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAttachFileController.java new file mode 100644 index 0000000..591074b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzAttachFileController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzAttachFileVo; +import org.dromara.mall.domain.bo.TzAttachFileBo; +import org.dromara.mall.service.ITzAttachFileService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/attachFile") +public class TzAttachFileController extends BaseController { + + private final ITzAttachFileService tzAttachFileService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:attachFile:list") + @GetMapping("/list") + public TableDataInfo list(TzAttachFileBo bo, PageQuery pageQuery) { + return tzAttachFileService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:attachFile:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzAttachFileBo bo, HttpServletResponse response) { + List list = tzAttachFileService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzAttachFileVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param fileId 主键 + */ + @SaCheckPermission("mall:attachFile:query") + @GetMapping("/{fileId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long fileId) { + return R.ok(tzAttachFileService.queryById(fileId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:attachFile:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzAttachFileBo bo) { + return toAjax(tzAttachFileService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:attachFile:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzAttachFileBo bo) { + return toAjax(tzAttachFileService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param fileIds 主键串 + */ + @SaCheckPermission("mall:attachFile:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{fileIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] fileIds) { + return toAjax(tzAttachFileService.deleteWithValidByIds(List.of(fileIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBankCardController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBankCardController.java new file mode 100644 index 0000000..8ff9279 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBankCardController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzBankCardBo; +import org.dromara.mall.domain.vo.TzBankCardVo; +import org.dromara.mall.service.ITzBankCardService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 绑定银行卡信息 + * + * @author Maosw + * @date 2024-12-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/bankCard") +public class TzBankCardController extends BaseController { + + private final ITzBankCardService tzBankCardService; + + /** + * 查询绑定银行卡信息列表 + */ + @SaCheckPermission("mall:bankCard:list") + @GetMapping("/list") + public TableDataInfo list(TzBankCardBo bo, PageQuery pageQuery) { + return tzBankCardService.queryPageList(bo, pageQuery); + } + + /** + * 导出绑定银行卡信息列表 + */ + @SaCheckPermission("mall:bankCard:export") + @Log(title = "绑定银行卡信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzBankCardBo bo, HttpServletResponse response) { + List list = tzBankCardService.queryList(bo); + ExcelUtil.exportExcel(list, "绑定银行卡信息", TzBankCardVo.class, response); + } + + /** + * 获取绑定银行卡信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:bankCard:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzBankCardService.queryById(id)); + } + + /** + * 新增绑定银行卡信息 + */ + @SaCheckPermission("mall:bankCard:add") + @Log(title = "绑定银行卡信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzBankCardBo bo) { + return toAjax(tzBankCardService.insertByBo(bo)); + } + + /** + * 修改绑定银行卡信息 + */ + @SaCheckPermission("mall:bankCard:edit") + @Log(title = "绑定银行卡信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzBankCardBo bo) { + return toAjax(tzBankCardService.updateByBo(bo)); + } + + /** + * 删除绑定银行卡信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:bankCard:remove") + @Log(title = "绑定银行卡信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzBankCardService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBrandController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBrandController.java new file mode 100644 index 0000000..99d45b0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzBrandController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzBrandBo; +import org.dromara.mall.domain.vo.TzBrandVo; +import org.dromara.mall.service.ITzBrandService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 品牌 + * + * @author Maosw + * @date 2024-09-26 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/brand") +public class TzBrandController extends BaseController { + + private final ITzBrandService tzBrandService; + + /** + * 查询品牌列表 + */ + @SaCheckPermission("mall:brand:list") + @GetMapping("/list") + public TableDataInfo list(TzBrandBo bo, PageQuery pageQuery) { + return tzBrandService.queryPageList(bo, pageQuery); + } + + /** + * 导出品牌列表 + */ + @SaCheckPermission("mall:brand:export") + @Log(title = "品牌", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzBrandBo bo, HttpServletResponse response) { + List list = tzBrandService.queryList(bo); + ExcelUtil.exportExcel(list, "品牌", TzBrandVo.class, response); + } + + /** + * 获取品牌详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:brand:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzBrandService.queryById(id)); + } + + /** + * 新增品牌 + */ + @SaCheckPermission("mall:brand:add") + @Log(title = "品牌", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzBrandBo bo) { + return toAjax(tzBrandService.insertByBo(bo)); + } + + /** + * 修改品牌 + */ + @SaCheckPermission("mall:brand:edit") + @Log(title = "品牌", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzBrandBo bo) { + return toAjax(tzBrandService.updateByBo(bo)); + } + + /** + * 删除品牌 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:brand:remove") + @Log(title = "品牌", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzBrandService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryBrandController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryBrandController.java new file mode 100644 index 0000000..ea085a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryBrandController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzCategoryBrandVo; +import org.dromara.mall.domain.bo.TzCategoryBrandBo; +import org.dromara.mall.service.ITzCategoryBrandService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/categoryBrand") +public class TzCategoryBrandController extends BaseController { + + private final ITzCategoryBrandService tzCategoryBrandService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:categoryBrand:list") + @GetMapping("/list") + public TableDataInfo list(TzCategoryBrandBo bo, PageQuery pageQuery) { + return tzCategoryBrandService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:categoryBrand:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzCategoryBrandBo bo, HttpServletResponse response) { + List list = tzCategoryBrandService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzCategoryBrandVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:categoryBrand:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzCategoryBrandService.queryById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:categoryBrand:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzCategoryBrandBo bo) { + return toAjax(tzCategoryBrandService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:categoryBrand:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzCategoryBrandBo bo) { + return toAjax(tzCategoryBrandService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:categoryBrand:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzCategoryBrandService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryController.java new file mode 100644 index 0000000..6191564 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryController.java @@ -0,0 +1,114 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzCategoryBo; +import org.dromara.mall.domain.vo.TzCategoryVo; +import org.dromara.mall.service.ITzCategoryService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 产品类目 + * + * @author Lion Li + * @date 2024-07-31 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/category") +public class TzCategoryController extends BaseController { + + private final ITzCategoryService tzCategoryService; + + /** + * 查询产品类目列表 + */ + @SaCheckPermission("mall:category:list") + @GetMapping("/list") + public R> list(TzCategoryBo bo) { + List list = tzCategoryService.queryList(bo); + return R.ok(list); + } + + /** + * 查询产品类目全部列表 + */ + @GetMapping("/listAll") + public R> listAll(TzCategoryBo bo) { + List list = tzCategoryService.queryList(bo); + return R.ok(list); + } + + /** + * 导出产品类目列表 + */ + @SaCheckPermission("mall:category:export") + @Log(title = "产品类目", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzCategoryBo bo, HttpServletResponse response) { + List list = tzCategoryService.queryList(bo); + ExcelUtil.exportExcel(list, "产品类目", TzCategoryVo.class, response); + } + + /** + * 获取产品类目详细信息 + * + * @param categoryId 主键 + */ + @SaCheckPermission("mall:category:query") + @GetMapping("/{categoryId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long categoryId) { + return R.ok(tzCategoryService.queryById(categoryId)); + } + + /** + * 新增产品类目 + */ + @SaCheckPermission("mall:category:add") + @Log(title = "产品类目", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzCategoryBo bo) { + return toAjax(tzCategoryService.insertByBo(bo)); + } + + /** + * 修改产品类目 + */ + @SaCheckPermission("mall:category:edit") + @Log(title = "产品类目", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzCategoryBo bo) { + return toAjax(tzCategoryService.updateByBo(bo)); + } + + /** + * 删除产品类目 + * + * @param categoryIds 主键串 + */ + @SaCheckPermission("mall:category:remove") + @Log(title = "产品类目", businessType = BusinessType.DELETE) + @DeleteMapping("/{categoryIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] categoryIds) { + return toAjax(tzCategoryService.deleteWithValidByIds(List.of(categoryIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryPropController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryPropController.java new file mode 100644 index 0000000..668f59f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCategoryPropController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzCategoryPropVo; +import org.dromara.mall.domain.bo.TzCategoryPropBo; +import org.dromara.mall.service.ITzCategoryPropService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/categoryProp") +public class TzCategoryPropController extends BaseController { + + private final ITzCategoryPropService tzCategoryPropService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:categoryProp:list") + @GetMapping("/list") + public TableDataInfo list(TzCategoryPropBo bo, PageQuery pageQuery) { + return tzCategoryPropService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:categoryProp:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzCategoryPropBo bo, HttpServletResponse response) { + List list = tzCategoryPropService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzCategoryPropVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:categoryProp:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzCategoryPropService.queryById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:categoryProp:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzCategoryPropBo bo) { + return toAjax(tzCategoryPropService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:categoryProp:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzCategoryPropBo bo) { + return toAjax(tzCategoryPropService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:categoryProp:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzCategoryPropService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerController.java new file mode 100644 index 0000000..f43c292 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerController.java @@ -0,0 +1,146 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzCustomerBo; +import org.dromara.mall.domain.vo.TzCustomerSumVo; +import org.dromara.mall.domain.vo.TzCustomerVo; +import org.dromara.mall.service.ITzCustomerService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户 + * + * @author Maosw + * @date 2024-09-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/customer") +public class TzCustomerController extends BaseController { + + private final ITzCustomerService tzCustomerService; + + /** + * 查询客户列表 + */ + @SaCheckPermission("mall:customer:list") + @GetMapping("/list") + public TableDataInfo list(TzCustomerBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + return tzCustomerService.queryPageList(bo, pageQuery); + } + + /** + * 查询客户列表统计 + */ + @SaCheckPermission("mall:customer:count") + @GetMapping("/count") + public R queryListCount(TzCustomerBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + return R.ok(tzCustomerService.queryListCount(bo)); + } + + /** + * 导出客户列表 + */ + @SaCheckPermission("mall:customer:export") + @Log(title = "客户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzCustomerBo bo, HttpServletResponse response) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + List list = tzCustomerService.queryList(bo); + ExcelUtil.exportExcel(list, "客户", TzCustomerVo.class, response); + } + + /** + * 获取客户详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:customer:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzCustomerService.queryById(id)); + } + + /** + * 新增客户 + */ + @SaCheckPermission("mall:customer:add") + @Log(title = "客户", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzCustomerBo bo) { + return toAjax(tzCustomerService.insertByBo(bo)); + } + + /** + * 修改客户 + */ + @SaCheckPermission("mall:customer:edit") + @Log(title = "客户", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzCustomerBo bo) { + return toAjax(tzCustomerService.updateByBo(bo)); + } + + /** + * 删除客户 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:customer:remove") + @Log(title = "客户", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzCustomerService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 申请退款(客服) + */ + @SaCheckPermission("mall:customer:refund") + @Log(title = "申请退款", businessType = BusinessType.UPDATE) + @PostMapping("/refund") + public R refund(@RequestBody TzCustomerBo bo) { + return toAjax(tzCustomerService.refund(bo)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerRecordController.java new file mode 100644 index 0000000..725bf40 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzCustomerRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzCustomerRecordBo; +import org.dromara.mall.domain.vo.TzCustomerRecordVo; +import org.dromara.mall.service.ITzCustomerRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户资金记录 + * + * @author Maosw + * @date 2024-09-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/customerRecord") +public class TzCustomerRecordController extends BaseController { + + private final ITzCustomerRecordService tzCustomerRecordService; + + /** + * 查询客户资金记录列表 + */ + @SaCheckPermission("mall:customerRecord:list") + @GetMapping("/list") + public TableDataInfo list(TzCustomerRecordBo bo, PageQuery pageQuery) { + return tzCustomerRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户资金记录列表 + */ + @SaCheckPermission("mall:customerRecord:export") + @Log(title = "客户资金记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzCustomerRecordBo bo, HttpServletResponse response) { + List list = tzCustomerRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "客户资金记录", TzCustomerRecordVo.class, response); + } + + /** + * 获取客户资金记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:customerRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzCustomerRecordService.queryById(id)); + } + + /** + * 新增客户资金记录 + */ + @SaCheckPermission("mall:customerRecord:add") + @Log(title = "客户资金记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzCustomerRecordBo bo) { + return toAjax(tzCustomerRecordService.insertByBo(bo)); + } + + /** + * 修改客户资金记录 + */ + @SaCheckPermission("mall:customerRecord:edit") + @Log(title = "客户资金记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzCustomerRecordBo bo) { + return toAjax(tzCustomerRecordService.updateByBo(bo)); + } + + /** + * 删除客户资金记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:customerRecord:remove") + @Log(title = "客户资金记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzCustomerRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzDeliveryController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzDeliveryController.java new file mode 100644 index 0000000..4c2b31e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzDeliveryController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzDeliveryVo; +import org.dromara.mall.domain.bo.TzDeliveryBo; +import org.dromara.mall.service.ITzDeliveryService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 物流公司 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/delivery") +public class TzDeliveryController extends BaseController { + + private final ITzDeliveryService tzDeliveryService; + + /** + * 查询物流公司列表 + */ + @SaCheckPermission("mall:delivery:list") + @GetMapping("/list") + public TableDataInfo list(TzDeliveryBo bo, PageQuery pageQuery) { + return tzDeliveryService.queryPageList(bo, pageQuery); + } + + /** + * 导出物流公司列表 + */ + @SaCheckPermission("mall:delivery:export") + @Log(title = "物流公司", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzDeliveryBo bo, HttpServletResponse response) { + List list = tzDeliveryService.queryList(bo); + ExcelUtil.exportExcel(list, "物流公司", TzDeliveryVo.class, response); + } + + /** + * 获取物流公司详细信息 + * + * @param dvyId 主键 + */ + @SaCheckPermission("mall:delivery:query") + @GetMapping("/{dvyId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long dvyId) { + return R.ok(tzDeliveryService.queryById(dvyId)); + } + + /** + * 新增物流公司 + */ + @SaCheckPermission("mall:delivery:add") + @Log(title = "物流公司", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzDeliveryBo bo) { + return toAjax(tzDeliveryService.insertByBo(bo)); + } + + /** + * 修改物流公司 + */ + @SaCheckPermission("mall:delivery:edit") + @Log(title = "物流公司", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzDeliveryBo bo) { + return toAjax(tzDeliveryService.updateByBo(bo)); + } + + /** + * 删除物流公司 + * + * @param dvyIds 主键串 + */ + @SaCheckPermission("mall:delivery:remove") + @Log(title = "物流公司", businessType = BusinessType.DELETE) + @DeleteMapping("/{dvyIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] dvyIds) { + return toAjax(tzDeliveryService.deleteWithValidByIds(List.of(dvyIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzHotSearchController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzHotSearchController.java new file mode 100644 index 0000000..36e9c6f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzHotSearchController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzHotSearchVo; +import org.dromara.mall.domain.bo.TzHotSearchBo; +import org.dromara.mall.service.ITzHotSearchService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 热搜 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/hotSearch") +public class TzHotSearchController extends BaseController { + + private final ITzHotSearchService tzHotSearchService; + + /** + * 查询热搜列表 + */ + @SaCheckPermission("mall:hotSearch:list") + @GetMapping("/list") + public TableDataInfo list(TzHotSearchBo bo, PageQuery pageQuery) { + return tzHotSearchService.queryPageList(bo, pageQuery); + } + + /** + * 导出热搜列表 + */ + @SaCheckPermission("mall:hotSearch:export") + @Log(title = "热搜", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzHotSearchBo bo, HttpServletResponse response) { + List list = tzHotSearchService.queryList(bo); + ExcelUtil.exportExcel(list, "热搜", TzHotSearchVo.class, response); + } + + /** + * 获取热搜详细信息 + * + * @param hotSearchId 主键 + */ + @SaCheckPermission("mall:hotSearch:query") + @GetMapping("/{hotSearchId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long hotSearchId) { + return R.ok(tzHotSearchService.queryById(hotSearchId)); + } + + /** + * 新增热搜 + */ + @SaCheckPermission("mall:hotSearch:add") + @Log(title = "热搜", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzHotSearchBo bo) { + return toAjax(tzHotSearchService.insertByBo(bo)); + } + + /** + * 修改热搜 + */ + @SaCheckPermission("mall:hotSearch:edit") + @Log(title = "热搜", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzHotSearchBo bo) { + return toAjax(tzHotSearchService.updateByBo(bo)); + } + + /** + * 删除热搜 + * + * @param hotSearchIds 主键串 + */ + @SaCheckPermission("mall:hotSearch:remove") + @Log(title = "热搜", businessType = BusinessType.DELETE) + @DeleteMapping("/{hotSearchIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] hotSearchIds) { + return toAjax(tzHotSearchService.deleteWithValidByIds(List.of(hotSearchIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzIndexImgController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzIndexImgController.java new file mode 100644 index 0000000..0a4e405 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzIndexImgController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzIndexImgVo; +import org.dromara.mall.domain.bo.TzIndexImgBo; +import org.dromara.mall.service.ITzIndexImgService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 主页轮播图 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/indexImg") +public class TzIndexImgController extends BaseController { + + private final ITzIndexImgService tzIndexImgService; + + /** + * 查询主页轮播图列表 + */ + @SaCheckPermission("mall:indexImg:list") + @GetMapping("/list") + public TableDataInfo list(TzIndexImgBo bo, PageQuery pageQuery) { + return tzIndexImgService.queryPageList(bo, pageQuery); + } + + /** + * 导出主页轮播图列表 + */ + @SaCheckPermission("mall:indexImg:export") + @Log(title = "主页轮播图", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzIndexImgBo bo, HttpServletResponse response) { + List list = tzIndexImgService.queryList(bo); + ExcelUtil.exportExcel(list, "主页轮播图", TzIndexImgVo.class, response); + } + + /** + * 获取主页轮播图详细信息 + * + * @param imgId 主键 + */ + @SaCheckPermission("mall:indexImg:query") + @GetMapping("/{imgId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long imgId) { + return R.ok(tzIndexImgService.queryById(imgId)); + } + + /** + * 新增主页轮播图 + */ + @SaCheckPermission("mall:indexImg:add") + @Log(title = "主页轮播图", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzIndexImgBo bo) { + return toAjax(tzIndexImgService.insertByBo(bo)); + } + + /** + * 修改主页轮播图 + */ + @SaCheckPermission("mall:indexImg:edit") + @Log(title = "主页轮播图", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzIndexImgBo bo) { + return toAjax(tzIndexImgService.updateByBo(bo)); + } + + /** + * 删除主页轮播图 + * + * @param imgIds 主键串 + */ + @SaCheckPermission("mall:indexImg:remove") + @Log(title = "主页轮播图", businessType = BusinessType.DELETE) + @DeleteMapping("/{imgIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] imgIds) { + return toAjax(tzIndexImgService.deleteWithValidByIds(List.of(imgIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceApplyController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceApplyController.java new file mode 100644 index 0000000..bd19158 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceApplyController.java @@ -0,0 +1,116 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzInvoiceApplyBo; +import org.dromara.mall.domain.vo.TzInvoicApplySumVo; +import org.dromara.mall.domain.vo.TzInvoiceApplyVo; +import org.dromara.mall.service.ITzInvoiceApplyService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 发票申请记录 + * + * @author Maosw + * @date 2024-12-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/invoiceApply") +public class TzInvoiceApplyController extends BaseController { + + private final ITzInvoiceApplyService tzInvoiceApplyService; + + /** + * 查询发票申请记录列表 + */ + @SaCheckPermission("mall:invoiceApply:list") + @GetMapping("/list") + public TableDataInfo list(TzInvoiceApplyBo bo, PageQuery pageQuery) { + return tzInvoiceApplyService.queryPageList(bo, pageQuery); + } + + /** + * 查询发票申请记录统计信息 + */ + @SaCheckPermission("mall:invoiceApply:list") + @GetMapping("/listSum") + public R listSum(TzInvoiceApplyBo bo) { + return R.ok(tzInvoiceApplyService.querySum(bo)); + } + + /** + * 导出发票申请记录列表 + */ + @SaCheckPermission("mall:invoiceApply:export") + @Log(title = "发票申请记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzInvoiceApplyBo bo, HttpServletResponse response) { + List list = tzInvoiceApplyService.queryList(bo); + ExcelUtil.exportExcel(list, "发票申请记录", TzInvoiceApplyVo.class, response); + } + + /** + * 获取发票申请记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:invoiceApply:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzInvoiceApplyService.queryById(id)); + } + + /** + * 新增发票申请记录 + */ + @SaCheckPermission("mall:invoiceApply:add") + @Log(title = "发票申请记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzInvoiceApplyBo bo) { + return toAjax(tzInvoiceApplyService.insertByBo(bo)); + } + + /** + * 修改发票申请记录 + */ + @SaCheckPermission("mall:invoiceApply:edit") + @Log(title = "发票申请记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzInvoiceApplyBo bo) { + return toAjax(tzInvoiceApplyService.updateByBo(bo)); + } + + /** + * 删除发票申请记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:invoiceApply:remove") + @Log(title = "发票申请记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzInvoiceApplyService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceTitleController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceTitleController.java new file mode 100644 index 0000000..744b48d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzInvoiceTitleController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzInvoiceTitleBo; +import org.dromara.mall.domain.vo.TzInvoiceTitleVo; +import org.dromara.mall.service.ITzInvoiceTitleService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 发票抬头信息 + * + * @author Maosw + * @date 2024-12-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/invoiceTitle") +public class TzInvoiceTitleController extends BaseController { + + private final ITzInvoiceTitleService tzInvoiceTitleService; + + /** + * 查询发票抬头信息列表 + */ + @SaCheckPermission("mall:invoiceTitle:list") + @GetMapping("/list") + public TableDataInfo list(TzInvoiceTitleBo bo, PageQuery pageQuery) { + return tzInvoiceTitleService.queryPageList(bo, pageQuery); + } + + /** + * 导出发票抬头信息列表 + */ + @SaCheckPermission("mall:invoiceTitle:export") + @Log(title = "发票抬头信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzInvoiceTitleBo bo, HttpServletResponse response) { + List list = tzInvoiceTitleService.queryList(bo); + ExcelUtil.exportExcel(list, "发票抬头信息", TzInvoiceTitleVo.class, response); + } + + /** + * 获取发票抬头信息详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:invoiceTitle:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzInvoiceTitleService.queryById(id)); + } + + /** + * 新增发票抬头信息 + */ + @SaCheckPermission("mall:invoiceTitle:add") + @Log(title = "发票抬头信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzInvoiceTitleBo bo) { + return toAjax(tzInvoiceTitleService.insertByBo(bo)); + } + + /** + * 修改发票抬头信息 + */ + @SaCheckPermission("mall:invoiceTitle:edit") + @Log(title = "发票抬头信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzInvoiceTitleBo bo) { + return toAjax(tzInvoiceTitleService.updateByBo(bo)); + } + + /** + * 删除发票抬头信息 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:invoiceTitle:remove") + @Log(title = "发票抬头信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzInvoiceTitleService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzMessageController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzMessageController.java new file mode 100644 index 0000000..fbf900a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzMessageController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzMessageVo; +import org.dromara.mall.domain.bo.TzMessageBo; +import org.dromara.mall.service.ITzMessageService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/message") +public class TzMessageController extends BaseController { + + private final ITzMessageService tzMessageService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:message:list") + @GetMapping("/list") + public TableDataInfo list(TzMessageBo bo, PageQuery pageQuery) { + return tzMessageService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:message:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzMessageBo bo, HttpServletResponse response) { + List list = tzMessageService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzMessageVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:message:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzMessageService.queryById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:message:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzMessageBo bo) { + return toAjax(tzMessageService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:message:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzMessageBo bo) { + return toAjax(tzMessageService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:message:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzMessageService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzNoticeController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzNoticeController.java new file mode 100644 index 0000000..928471f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzNoticeController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzNoticeBo; +import org.dromara.mall.domain.vo.TzNoticeVo; +import org.dromara.mall.service.ITzNoticeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 公告 + * + * @author Maosw + * @date 2025-01-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/notice") +public class TzNoticeController extends BaseController { + + private final ITzNoticeService tzNoticeService; + + /** + * 查询公告列表 + */ + @SaCheckPermission("mall:notice:list") + @GetMapping("/list") + public TableDataInfo list(TzNoticeBo bo, PageQuery pageQuery) { + return tzNoticeService.queryPageList(bo, pageQuery); + } + + /** + * 导出公告列表 + */ + @SaCheckPermission("mall:notice:export") + @Log(title = "公告", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzNoticeBo bo, HttpServletResponse response) { + List list = tzNoticeService.queryList(bo); + ExcelUtil.exportExcel(list, "公告", TzNoticeVo.class, response); + } + + /** + * 获取公告详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:notice:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzNoticeService.queryById(id)); + } + + /** + * 新增公告 + */ + @SaCheckPermission("mall:notice:add") + @Log(title = "公告", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzNoticeBo bo) { + return toAjax(tzNoticeService.insertByBo(bo)); + } + + /** + * 修改公告 + */ + @SaCheckPermission("mall:notice:edit") + @Log(title = "公告", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzNoticeBo bo) { + return toAjax(tzNoticeService.updateByBo(bo)); + } + + /** + * 删除公告 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:notice:remove") + @Log(title = "公告", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzNoticeService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderAllController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderAllController.java new file mode 100644 index 0000000..6c2e268 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderAllController.java @@ -0,0 +1,115 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderAllBo; +import org.dromara.mall.domain.vo.TzOrderAllVo; +import org.dromara.mall.service.ITzOrderAllService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单汇总 + * + * @author Maosw + * @date 2024-09-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderAll") +public class TzOrderAllController extends BaseController { + + private final ITzOrderAllService tzOrderAllService; + + /** + * 查询订单汇总列表 + */ + @SaCheckPermission("mall:orderAll:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderAllBo bo, PageQuery pageQuery) { + return tzOrderAllService.queryPageList(bo, pageQuery); + } + + /** + * 导出订单汇总列表 + */ + @SaCheckPermission("mall:orderAll:export") + @Log(title = "订单汇总", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderAllBo bo, HttpServletResponse response) { + List list = tzOrderAllService.queryList(bo); + ExcelUtil.exportExcel(list, "订单汇总", TzOrderAllVo.class, response); + } + + /** + * 获取订单汇总详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderAll:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzOrderAllService.queryById(id)); + } + + /** + * 新增订单汇总 + */ + @SaCheckPermission("mall:orderAll:add") + @Log(title = "订单汇总", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderAllBo bo) { + return toAjax(tzOrderAllService.insertByBo(bo)); + } + + /** + * 修改订单汇总 + */ + @SaCheckPermission("mall:orderAll:edit") + @Log(title = "订单汇总", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderAllBo bo) { + return toAjax(tzOrderAllService.updateByBo(bo)); + } + + /** + * 总订单确认 + */ + @SaCheckPermission("mall:orderAll:confirm") + @Log(title = "总订单确认", businessType = BusinessType.UPDATE) + @GetMapping("confirm/{id}") + public R confirm(@NotNull(message = "主键不能为空")@PathVariable Long id) { + return toAjax(tzOrderAllService.confirm(id)); + } + + /** + * 关闭订单汇总 + * + * @param id 主键串 + */ + @SaCheckPermission("mall:orderAll:remove") + @Log(title = "关闭订单汇总", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return toAjax(tzOrderAllService.deleteWithValidByIds(id)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderBuyerController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderBuyerController.java new file mode 100644 index 0000000..f04301c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderBuyerController.java @@ -0,0 +1,229 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.dto.RoleDTO; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderBo; +import org.dromara.mall.domain.vo.TzOrderSumVo; +import org.dromara.mall.domain.vo.TzOrderVo; +import org.dromara.mall.service.ITzOrderService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单(采购员) + * + * @author Maosw + * @date 2024-08-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderBuyer") +@Tag(name = "订单(采购员)") +public class TzOrderBuyerController extends BaseController { + + private final ITzOrderService tzOrderService; + + /** + * 查询订单列表 + */ + @SaCheckPermission("mall:orderBuyer:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("zh_user".equals(loginUser.getUserType())){ + bo.setTenantId(loginUser.getTenantId()); + }else if("cg_user".equals(loginUser.getUserType())){ + List list = loginUser.getRoles(); + boolean isRole = list.stream().anyMatch(role -> role.getRoleId() == 6); + if(!isRole){ + bo.setBuyerId(loginUser.getUserId()); + } + } + } + return tzOrderService.queryPageList(bo, pageQuery); + } + + /** + * 查询订单列表统计(采购) + * @param bo + * @return + */ + @SaCheckPermission("mall:orderBuyer:count") + @GetMapping("/count") + public R queryListCount(TzOrderBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("zh_user".equals(loginUser.getUserType())){ + bo.setTenantId(loginUser.getTenantId()); + }else if("cg_user".equals(loginUser.getUserType())){ + List list = loginUser.getRoles(); + boolean isRole = list.stream().anyMatch(role -> role.getRoleId() == 6); + if(!isRole){ + bo.setBuyerId(loginUser.getUserId()); + } + } + } + return R.ok(tzOrderService.queryListCountCG(bo)); + } + + /** + * 导出订单列表 + */ + @SaCheckPermission("mall:orderBuyer:export") + @Log(title = "订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderBo bo, HttpServletResponse response) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("zh_user".equals(loginUser.getUserType())){ + bo.setTenantId(loginUser.getTenantId()); + } + } + List list = tzOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "订单", TzOrderVo.class, response); + } + + /** + * 获取订单详细信息 + * + * @param orderId 主键 + */ + @SaCheckPermission("mall:orderBuyer:query") + @GetMapping("/{orderId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long orderId) { + return R.ok(tzOrderService.queryById(orderId)); + } + + /** + * 修改订单 + */ + @SaCheckPermission("mall:orderBuyer:edit") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.updateByBo(bo)); + } + + + /** + * 修改发货地址 + */ + @SaCheckPermission("mall:orderBuyer:editAddress") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/editAddress") + public R editAddress(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.editAddress(bo)); + } + + + /** + * 订单指派 + */ + @SaCheckPermission("mall:orderBuyer:assign") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/assign") + public R assign(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.assign(bo)); + } + + + /** + * 发货 + */ + @SaCheckPermission("mall:orderBuyer:deliverGoods") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/deliverGoods") + public R deliverGoods(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.deliverGoods(bo)); + } + + + /** + * 修改快递单号 + */ + @SaCheckPermission("mall:orderBuyer:editExpress") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/editExpress") + public R editExpress(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.editExpress(bo)); + } + + + /** + * 标记已签收 + */ + @SaCheckPermission("mall:orderBuyer:signFeceipt") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @PostMapping("/signFeceipt") + public R signFeceipt(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.signFeceipt(bo)); + } + + + /** + * 标记已处理 + */ + @SaCheckPermission("mall:orderBuyer:processed") + @Log(title = "标记已处理", businessType = BusinessType.UPDATE) + @PostMapping("/processed") + public R processed(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.processed(bo)); + } + + + /** + * 标记已采购 + */ + @SaCheckPermission("mall:orderBuyer:purchased") + @Log(title = "标记已采购", businessType = BusinessType.UPDATE) + @PostMapping("/purchased") + public R purchased(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.purchased(bo)); + } + + + /** + * 提交打款信息(采购) + */ + @SaCheckPermission("mall:orderBuyer:remitInfo") + @Log(title = "提交打款信息(采购)", businessType = BusinessType.UPDATE) + @PostMapping("/remitInfo") + public R remitInfo(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.remitInfo(bo)); + } + + + /** + * 关闭订单 + */ + @SaCheckPermission("mall:orderBuyer:close") + @Log(title = "订单", businessType = BusinessType.UPDATE) + @GetMapping("/close/{orderId}") + public R close(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] orderId) { + return toAjax(tzOrderService.closeOrder(orderId)); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderReceiveController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderReceiveController.java new file mode 100644 index 0000000..3b05846 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderReceiveController.java @@ -0,0 +1,168 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderReceiveBo; +import org.dromara.mall.domain.vo.TzOrderReceiveSumVo; +import org.dromara.mall.domain.vo.TzOrderReceiveVo; +import org.dromara.mall.service.ITzOrderReceiveService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单汇款 + * + * @author Maosw + * @date 2024-09-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderReceive") +public class TzOrderReceiveController extends BaseController { + + private final ITzOrderReceiveService tzOrderReceiveService; + + /** + * 查询订单汇款列表 + */ + @SaCheckPermission("mall:orderReceive:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderReceiveBo bo, PageQuery pageQuery) { + return tzOrderReceiveService.queryPageList(bo, pageQuery); + } + + + /** + * 查询订单汇款列表统计 + */ + @SaCheckPermission("mall:orderReceive:count") + @GetMapping("/count") + public R count(TzOrderReceiveBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + return R.ok(tzOrderReceiveService.queryListCount(bo)); + } + + /** + * 导出订单汇款列表 + */ + @SaCheckPermission("mall:orderReceive:export") + @Log(title = "订单汇款", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderReceiveBo bo, HttpServletResponse response) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + List list = tzOrderReceiveService.queryList(bo); + ExcelUtil.exportExcel(list, "订单汇款", TzOrderReceiveVo.class, response); + } + + /** + * 获取订单汇款详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderReceive:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzOrderReceiveService.queryById(id)); + } + + /** + * 新增订单汇款 + */ + @SaCheckPermission("mall:orderReceive:add") + @Log(title = "订单汇款", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderReceiveBo bo) { + return toAjax(tzOrderReceiveService.insertByBo(bo)); + } + + /** + * 修改订单汇款 + */ + @SaCheckPermission("mall:orderReceive:edit") + @Log(title = "订单汇款", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderReceiveBo bo) { + return toAjax(tzOrderReceiveService.updateByBo(bo)); + } + + /** + * 作废汇款(财务) + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:orderReceive:remove") + @Log(title = "作废汇款(财务)", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzOrderReceiveService.deleteWithValidByIds(List.of(ids), true)); + } + + + /** + * 领取汇款(客服) + * @param bo + * @return + */ + @SaCheckPermission("mall:orderReceive:receive") + @Log(title = "领取汇款(客服)", businessType = BusinessType.UPDATE) + @PostMapping("/receive") + public R examine(@RequestBody TzOrderReceiveBo bo) { + return toAjax(tzOrderReceiveService.receive(bo)); + } + + + /** + * 回退汇款(财务) + * @param bo + * @return + */ +// @SaCheckPermission("mall:orderReceive:fallback") + @Log(title = "回退汇款(财务)", businessType = BusinessType.UPDATE) + @PostMapping("/fallback") + public R fallback(@RequestBody TzOrderReceiveBo bo) { + return toAjax(tzOrderReceiveService.fallback(bo)); + } + + + /** + * 审核汇款(财务) + */ +// @SaCheckPermission("mall:orderReceive:examine") +// @Log(title = "审核汇款(财务)", businessType = BusinessType.OTHER) +// @PutMapping("/examine") +// public R examine(@Validated(EditGroup.class) @RequestBody TzOrderReceiveBo bo) { +// return toAjax(tzOrderReceiveService.examine(bo)); +// } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRecordController.java new file mode 100644 index 0000000..49f67b7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderRecordBo; +import org.dromara.mall.domain.vo.TzOrderRecordVo; +import org.dromara.mall.service.ITzOrderRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单修改记录 + * + * @author Lion Li + * @date 2024-08-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderRecord") +public class TzOrderRecordController extends BaseController { + + private final ITzOrderRecordService tzOrderRecordService; + + /** + * 查询订单修改记录列表 + */ + @SaCheckPermission("mall:orderRecord:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderRecordBo bo, PageQuery pageQuery) { + return tzOrderRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出订单修改记录列表 + */ + @SaCheckPermission("mall:orderRecord:export") + @Log(title = "订单修改记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderRecordBo bo, HttpServletResponse response) { + List list = tzOrderRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "订单修改记录", TzOrderRecordVo.class, response); + } + + /** + * 获取订单修改记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzOrderRecordService.queryById(id)); + } + + /** + * 新增订单修改记录 + */ + @SaCheckPermission("mall:orderRecord:add") + @Log(title = "订单修改记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderRecordBo bo) { + return toAjax(tzOrderRecordService.insertByBo(bo)); + } + + /** + * 修改订单修改记录 + */ + @SaCheckPermission("mall:orderRecord:edit") + @Log(title = "订单修改记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderRecordBo bo) { + return toAjax(tzOrderRecordService.updateByBo(bo)); + } + + /** + * 删除订单修改记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:orderRecord:remove") + @Log(title = "订单修改记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzOrderRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRefundController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRefundController.java new file mode 100644 index 0000000..f7281b8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderRefundController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzOrderRefundVo; +import org.dromara.mall.domain.bo.TzOrderRefundBo; +import org.dromara.mall.service.ITzOrderRefundService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderRefund") +public class TzOrderRefundController extends BaseController { + + private final ITzOrderRefundService tzOrderRefundService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:orderRefund:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderRefundBo bo, PageQuery pageQuery) { + return tzOrderRefundService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:orderRefund:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderRefundBo bo, HttpServletResponse response) { + List list = tzOrderRefundService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzOrderRefundVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param refundId 主键 + */ + @SaCheckPermission("mall:orderRefund:query") + @GetMapping("/{refundId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long refundId) { + return R.ok(tzOrderRefundService.queryById(refundId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:orderRefund:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderRefundBo bo) { + return toAjax(tzOrderRefundService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:orderRefund:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderRefundBo bo) { + return toAjax(tzOrderRefundService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param refundIds 主键串 + */ + @SaCheckPermission("mall:orderRefund:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{refundIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] refundIds) { + return toAjax(tzOrderRefundService.deleteWithValidByIds(List.of(refundIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSaleController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSaleController.java new file mode 100644 index 0000000..2f3de37 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSaleController.java @@ -0,0 +1,224 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderBo; +import org.dromara.mall.domain.vo.TzCustomerVo; +import org.dromara.mall.domain.vo.TzOrderSumVo; +import org.dromara.mall.domain.vo.TzOrderVo; +import org.dromara.mall.service.ITzCustomerService; +import org.dromara.mall.service.ITzOrderService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 订单(客服) + * + * @author Maosw + * @date 2024-08-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderSale") +@Tag(name = "订单(客服)") +public class TzOrderSaleController extends BaseController { + + private final ITzOrderService tzOrderService; + + private final ITzCustomerService tzCustomerService; + + /** + * 查询订单列表 + */ + @SaCheckPermission("mall:orderSale:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderBo bo, PageQuery pageQuery) { + /*LoginUser loginUser = LoginHelper.getLoginUser(); + List list = loginUser.getRoles(); + boolean isRole = list.stream().anyMatch(role -> role.getRoleId() == 1 || role.getRoleId() == 2); + if(!isRole){ + bo.setSaleId(loginUser.getUserId()); + }*/ + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setSaleId(loginUser.getUserId()); + } + } + return tzOrderService.queryPageList(bo, pageQuery); + } + + /** + * 查询订单列表统计 + * @param bo + * @return + */ + @SaCheckPermission("mall:orderSale:count") + @GetMapping("/count") + public R queryListCount(TzOrderBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setSaleId(loginUser.getUserId()); + } + } + return R.ok(tzOrderService.queryListCount(bo)); + } + + /** + * 导出订单列表 + */ + @SaCheckPermission("mall:orderSale:export") + @Log(title = "订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderBo bo, HttpServletResponse response) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setSaleId(loginUser.getUserId()); + } + } + List list = tzOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "订单", TzOrderVo.class, response); + } + + /** + * 获取订单详细信息 + * + * @param orderId 主键 + */ + @SaCheckPermission("mall:orderSale:query") + @GetMapping("/{orderId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long orderId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzOrderVo tzOrderVo = tzOrderService.queryById(orderId); + if(ObjectUtil.notEqual(tzOrderVo.getSaleId(), loginUser.getUserId())){ + R.fail("您没有权限获取该订单信息"); + } + return R.ok(tzOrderVo); + } + + /** + * 新增订单 + */ + @SaCheckPermission("mall:orderSale:add") + @Log(title = "订单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.insertByBo(bo)); + } + + /** + * 修改订单 + */ + @SaCheckPermission("mall:orderSale:edit") + @Log(title = "修改订单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.updateByBo(bo)); + } + + /** + * 改价 + */ + @SaCheckPermission("mall:orderSale:editPrice") + @Log(title = "改价", businessType = BusinessType.UPDATE) + @PostMapping("/editPrice") + public R editPrice(@RequestBody TzOrderBo bo) { + TzOrderVo tzOrderVo = tzOrderService.queryById(bo.getOrderId()); + if("4".equals(tzOrderVo.getStatus()) || "5".equals(tzOrderVo.getStatus()) || "6".equals(tzOrderVo.getStatus()) || "7".equals(tzOrderVo.getStatus())){ + R.fail("该订单状态不可改价"); + } + return toAjax(tzOrderService.updateGJ(bo)); + } + + + /** + * 获取客户信息和余额 + * @param type + * @param orderId + * @return + */ + @SaCheckPermission("mall:orderSale:pay") + @PostMapping("/getUserInfo") + @Parameters({ + @Parameter(name = "type", description = "类型 1:汇总订单 2:子订单", required = true), + @Parameter(name = "orderId", description = "订单ID", required = true) + }) + public R getUserInfo(@RequestParam(value = "type") Integer type,@RequestParam(value = "orderId") Integer orderId) { + return R.ok(tzOrderService.getUserInfo(type,orderId)); + } + + + /** + * 订单支付 + */ + @SaCheckPermission("mall:orderSale:pay") + @Log(title = "订单支付", businessType = BusinessType.UPDATE) + @PostMapping("/payOrder") + public R payOrder(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.payOrder(bo)); + } + + + /** + * 定金采购 + */ + @SaCheckPermission("mall:orderSale:depositPurchase") + @Log(title = "定金采购", businessType = BusinessType.UPDATE) + @PostMapping("/depositPurchase") + public R depositPurchase(@RequestBody TzOrderBo bo) { + return toAjax(tzOrderService.depositPurchase(bo)); + } + + + /** + * 关闭订单 + */ + @SaCheckPermission("mall:orderSale:close") + @Log(title = "关闭订单", businessType = BusinessType.UPDATE) + @GetMapping("/close/{orderId}") + public R close(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] orderId) { + return toAjax(tzOrderService.closeOrder(orderId)); + } + + /** + * 删除 + * + * @param orderId 主键串 + */ + @SaCheckPermission("mall:orderRefund:remove") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{orderId}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] orderId) { + return toAjax(tzOrderService.deleteWithValidByIds(List.of(orderId), true)); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSettlementController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSettlementController.java new file mode 100644 index 0000000..84b4c48 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderSettlementController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzOrderSettlementVo; +import org.dromara.mall.domain.bo.TzOrderSettlementBo; +import org.dromara.mall.service.ITzOrderSettlementService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderSettlement") +public class TzOrderSettlementController extends BaseController { + + private final ITzOrderSettlementService tzOrderSettlementService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:orderSettlement:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderSettlementBo bo, PageQuery pageQuery) { + return tzOrderSettlementService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:orderSettlement:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderSettlementBo bo, HttpServletResponse response) { + List list = tzOrderSettlementService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzOrderSettlementVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param settlementId 主键 + */ + @SaCheckPermission("mall:orderSettlement:query") + @GetMapping("/{settlementId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long settlementId) { + return R.ok(tzOrderSettlementService.queryById(settlementId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:orderSettlement:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderSettlementBo bo) { + return toAjax(tzOrderSettlementService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:orderSettlement:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderSettlementBo bo) { + return toAjax(tzOrderSettlementService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param settlementIds 主键串 + */ + @SaCheckPermission("mall:orderSettlement:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{settlementIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] settlementIds) { + return toAjax(tzOrderSettlementService.deleteWithValidByIds(List.of(settlementIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderShareController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderShareController.java new file mode 100644 index 0000000..ae6319a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzOrderShareController.java @@ -0,0 +1,133 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzOrderShareBo; +import org.dromara.mall.domain.vo.TzOrderShareVo; +import org.dromara.mall.service.ITzOrderShareService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +/** + * 订单分享 + * + * @author Maosw + * @date 2024-09-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/orderShare") +public class TzOrderShareController extends BaseController { + + private final ITzOrderShareService tzOrderShareService; + + /** + * 查询订单分享列表 + */ + @SaCheckPermission("mall:orderShare:list") + @GetMapping("/list") + public TableDataInfo list(TzOrderShareBo bo, PageQuery pageQuery) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("cg_user".equals(loginUser.getUserType())) { + bo.setUserId(loginUser.getUserId()); + } + return tzOrderShareService.queryPageList(bo, pageQuery); + } + + /** + * 导出订单分享列表 + */ + @SaCheckPermission("mall:orderShare:export") + @Log(title = "订单分享", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzOrderShareBo bo, HttpServletResponse response) { + List list = tzOrderShareService.queryList(bo); + ExcelUtil.exportExcel(list, "订单分享", TzOrderShareVo.class, response); + } + + /** + * 获取订单分享详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:orderShare:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzOrderShareService.queryById(id)); + } + + /** + * 获取订单分享详细信息 + * + * @param id 主键 + */ + @GetMapping("getOrderShare/{id}") + public R getOrderShare(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + TzOrderShareVo orderShareVo = tzOrderShareService.queryById(id); + if (ObjectUtil.isEmpty(orderShareVo)){ + return R.fail(-2,"当前链接已失效"); + } + if(orderShareVo.getExpireTime().getTime() < new Date().getTime()){ + return R.fail(-1,"当前链接已过期"); + } + return R.ok(orderShareVo); + } + + + /** + * 新增订单分享 + */ + @SaCheckPermission("mall:orderShare:add") + @Log(title = "订单分享", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzOrderShareBo bo) { + return R.ok(tzOrderShareService.insertByBo(bo)); + } + + /** + * 修改订单分享 + */ + @SaCheckPermission("mall:orderShare:edit") + @Log(title = "订单分享", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzOrderShareBo bo) { + return toAjax(tzOrderShareService.updateByBo(bo)); + } + + /** + * 删除订单分享 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:orderShare:remove") + @Log(title = "订单分享", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzOrderShareService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPickAddrController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPickAddrController.java new file mode 100644 index 0000000..d8a617a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPickAddrController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzPickAddrVo; +import org.dromara.mall.domain.bo.TzPickAddrBo; +import org.dromara.mall.service.ITzPickAddrService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户配送地址 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/pickAddr") +public class TzPickAddrController extends BaseController { + + private final ITzPickAddrService tzPickAddrService; + + /** + * 查询用户配送地址列表 + */ + @SaCheckPermission("mall:pickAddr:list") + @GetMapping("/list") + public TableDataInfo list(TzPickAddrBo bo, PageQuery pageQuery) { + return tzPickAddrService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户配送地址列表 + */ + @SaCheckPermission("mall:pickAddr:export") + @Log(title = "用户配送地址", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzPickAddrBo bo, HttpServletResponse response) { + List list = tzPickAddrService.queryList(bo); + ExcelUtil.exportExcel(list, "用户配送地址", TzPickAddrVo.class, response); + } + + /** + * 获取用户配送地址详细信息 + * + * @param addrId 主键 + */ + @SaCheckPermission("mall:pickAddr:query") + @GetMapping("/{addrId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long addrId) { + return R.ok(tzPickAddrService.queryById(addrId)); + } + + /** + * 新增用户配送地址 + */ + @SaCheckPermission("mall:pickAddr:add") + @Log(title = "用户配送地址", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzPickAddrBo bo) { + return toAjax(tzPickAddrService.insertByBo(bo)); + } + + /** + * 修改用户配送地址 + */ + @SaCheckPermission("mall:pickAddr:edit") + @Log(title = "用户配送地址", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzPickAddrBo bo) { + return toAjax(tzPickAddrService.updateByBo(bo)); + } + + /** + * 删除用户配送地址 + * + * @param addrIds 主键串 + */ + @SaCheckPermission("mall:pickAddr:remove") + @Log(title = "用户配送地址", businessType = BusinessType.DELETE) + @DeleteMapping("/{addrIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] addrIds) { + return toAjax(tzPickAddrService.deleteWithValidByIds(List.of(addrIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPictureAlbumController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPictureAlbumController.java new file mode 100644 index 0000000..e9477de --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzPictureAlbumController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzPictureAlbumBo; +import org.dromara.mall.domain.vo.TzPictureAlbumVo; +import org.dromara.mall.service.ITzPictureAlbumService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 画册 + * + * @author Maosw + * @date 2024-10-04 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/pictureAlbum") +public class TzPictureAlbumController extends BaseController { + + private final ITzPictureAlbumService tzPictureAlbumService; + + /** + * 查询画册列表 + */ + @SaCheckPermission("mall:pictureAlbum:list") + @GetMapping("/list") + public TableDataInfo list(TzPictureAlbumBo bo, PageQuery pageQuery) { + return tzPictureAlbumService.queryPageList(bo, pageQuery); + } + + /** + * 导出画册列表 + */ + @SaCheckPermission("mall:pictureAlbum:export") + @Log(title = "画册", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzPictureAlbumBo bo, HttpServletResponse response) { + List list = tzPictureAlbumService.queryList(bo); + ExcelUtil.exportExcel(list, "画册", TzPictureAlbumVo.class, response); + } + + /** + * 获取画册详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:pictureAlbum:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzPictureAlbumService.queryById(id)); + } + + /** + * 新增画册 + */ + @SaCheckPermission("mall:pictureAlbum:add") + @Log(title = "画册", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzPictureAlbumBo bo) { + return toAjax(tzPictureAlbumService.insertByBo(bo)); + } + + /** + * 修改画册 + */ + @SaCheckPermission("mall:pictureAlbum:edit") + @Log(title = "画册", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzPictureAlbumBo bo) { + return toAjax(tzPictureAlbumService.updateByBo(bo)); + } + + /** + * 删除画册 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:pictureAlbum:remove") + @Log(title = "画册", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzPictureAlbumService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdBrowseController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdBrowseController.java new file mode 100644 index 0000000..88d7005 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdBrowseController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzProdBrowseVo; +import org.dromara.mall.domain.bo.TzProdBrowseBo; +import org.dromara.mall.service.ITzProdBrowseService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 商品浏览 + * + * @author Maosw + * @date 2024-08-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodBrowse") +public class TzProdBrowseController extends BaseController { + + private final ITzProdBrowseService tzProdBrowseService; + + /** + * 查询商品浏览列表 + */ + @SaCheckPermission("mall:prodBrowse:list") + @GetMapping("/list") + public TableDataInfo list(TzProdBrowseBo bo, PageQuery pageQuery) { + return tzProdBrowseService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品浏览列表 + */ + @SaCheckPermission("mall:prodBrowse:export") + @Log(title = "商品浏览", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdBrowseBo bo, HttpServletResponse response) { + List list = tzProdBrowseService.queryList(bo); + ExcelUtil.exportExcel(list, "商品浏览", TzProdBrowseVo.class, response); + } + + /** + * 获取商品浏览详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:prodBrowse:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzProdBrowseService.queryById(id)); + } + + /** + * 新增商品浏览 + */ + @SaCheckPermission("mall:prodBrowse:add") + @Log(title = "商品浏览", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdBrowseBo bo) { + return toAjax(tzProdBrowseService.insertByBo(bo)); + } + + /** + * 修改商品浏览 + */ + @SaCheckPermission("mall:prodBrowse:edit") + @Log(title = "商品浏览", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdBrowseBo bo) { + return toAjax(tzProdBrowseService.updateByBo(bo)); + } + + /** + * 删除商品浏览 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:prodBrowse:remove") + @Log(title = "商品浏览", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzProdBrowseService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdCommController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdCommController.java new file mode 100644 index 0000000..d2867eb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdCommController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzProdCommVo; +import org.dromara.mall.domain.bo.TzProdCommBo; +import org.dromara.mall.service.ITzProdCommService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 商品评论 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodComm") +public class TzProdCommController extends BaseController { + + private final ITzProdCommService tzProdCommService; + + /** + * 查询商品评论列表 + */ + @SaCheckPermission("mall:prodComm:list") + @GetMapping("/list") + public TableDataInfo list(TzProdCommBo bo, PageQuery pageQuery) { + return tzProdCommService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品评论列表 + */ + @SaCheckPermission("mall:prodComm:export") + @Log(title = "商品评论", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdCommBo bo, HttpServletResponse response) { + List list = tzProdCommService.queryList(bo); + ExcelUtil.exportExcel(list, "商品评论", TzProdCommVo.class, response); + } + + /** + * 获取商品评论详细信息 + * + * @param prodCommId 主键 + */ + @SaCheckPermission("mall:prodComm:query") + @GetMapping("/{prodCommId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long prodCommId) { + return R.ok(tzProdCommService.queryById(prodCommId)); + } + + /** + * 新增商品评论 + */ + @SaCheckPermission("mall:prodComm:add") + @Log(title = "商品评论", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdCommBo bo) { + return toAjax(tzProdCommService.insertByBo(bo)); + } + + /** + * 修改商品评论 + */ + @SaCheckPermission("mall:prodComm:edit") + @Log(title = "商品评论", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdCommBo bo) { + return toAjax(tzProdCommService.updateByBo(bo)); + } + + /** + * 删除商品评论 + * + * @param prodCommIds 主键串 + */ + @SaCheckPermission("mall:prodComm:remove") + @Log(title = "商品评论", businessType = BusinessType.DELETE) + @DeleteMapping("/{prodCommIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] prodCommIds) { + return toAjax(tzProdCommService.deleteWithValidByIds(List.of(prodCommIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java new file mode 100644 index 0000000..02f2654 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdController.java @@ -0,0 +1,191 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdBo; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.domain.vo.TzProdSumVo; +import org.dromara.mall.domain.vo.TzProdVo; +import org.dromara.mall.service.ITzProdService; +import org.dromara.mall.service.ITzSkuService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 商品 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prod") +public class TzProdController extends BaseController { + + private final ITzProdService tzProdService; + + private final ITzSkuService tzSkuService; + + /** + * 查询商品列表 + */ + @SaCheckPermission("mall:prod:list") + @GetMapping("/list") + public TableDataInfo list(TzProdBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return tzProdService.queryPageList(bo, pageQuery); + } + + /** + * 查询商品销量排行榜列表 + */ + @SaCheckPermission("mall:prod:listChart") + @GetMapping("/listChart") + public TableDataInfo listChart(TzProdBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return tzProdService.queryPageListChart(bo, pageQuery); + } + + /** + * 查询商品列表统计 + * @param bo + * @return + */ + @SaCheckPermission("mall:prod:count") + @GetMapping("/count") + public R queryListCount(TzProdBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return R.ok(tzProdService.queryListCount(bo)); + } + + /** + * 查询全部商品列表 + */ + @SaCheckPermission("mall:prod:listAll") + @GetMapping("/listAll") + public TableDataInfo listAll(TzProdBo bo, PageQuery pageQuery) { + return tzProdService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品列表 + */ + @SaCheckPermission("mall:prod:export") + @Log(title = "商品", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdBo bo, HttpServletResponse response) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } +// TenantHelper.setDynamic(bo.getTenantId()); + List list = tzProdService.queryList(bo); + ExcelUtil.exportExcel(list, "商品", TzProdVo.class, response); + } + + /** + * 获取商品详细信息 + * + * @param prodId 主键 + */ + @SaCheckPermission("mall:prod:query") + @GetMapping("/{prodId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long prodId) { + return R.ok(tzProdService.queryById(prodId)); + } + + /** + * 新增商品 + */ + @SaCheckPermission("mall:prod:add") + @Log(title = "商品", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdBo bo) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } +// TenantHelper.setDynamic(bo.getTenantId()); + return toAjax(tzProdService.insertByBo(bo)); + } + + /** + * 检测sku是否为空 + * @param bo + */ + private void checkParam(TzProdBo bo) { + List skuList = bo.getSkuList(); + boolean isAllUnUse = true; + for (TzSkuBo sku : skuList) { + if (sku.getStatus() == 1) { + isAllUnUse = false; + } + } + if (isAllUnUse) { + throw new RuntimeException("至少要启用一种商品规格"); + } + } + + /** + * 修改商品 + */ + @SaCheckPermission("mall:prod:edit") + @Log(title = "商品", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdBo bo) { + return toAjax(tzProdService.updateByBo(bo)); + } + + /** + * 删除商品 + * + * @param prodIds 主键串 + */ + @SaCheckPermission("mall:prod:remove") + @Log(title = "商品", businessType = BusinessType.DELETE) + @DeleteMapping("/{prodIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] prodIds) { + return toAjax(tzProdService.deleteWithValidByIds(List.of(prodIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdFavoriteController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdFavoriteController.java new file mode 100644 index 0000000..16b2c19 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdFavoriteController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzProdFavoriteVo; +import org.dromara.mall.domain.bo.TzProdFavoriteBo; +import org.dromara.mall.service.ITzProdFavoriteService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 商品收藏 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodFavorite") +public class TzProdFavoriteController extends BaseController { + + private final ITzProdFavoriteService tzProdFavoriteService; + + /** + * 查询商品收藏列表 + */ + @SaCheckPermission("mall:prodFavorite:list") + @GetMapping("/list") + public TableDataInfo list(TzProdFavoriteBo bo, PageQuery pageQuery) { + return tzProdFavoriteService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品收藏列表 + */ + @SaCheckPermission("mall:prodFavorite:export") + @Log(title = "商品收藏", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdFavoriteBo bo, HttpServletResponse response) { + List list = tzProdFavoriteService.queryList(bo); + ExcelUtil.exportExcel(list, "商品收藏", TzProdFavoriteVo.class, response); + } + + /** + * 获取商品收藏详细信息 + * + * @param favoriteId 主键 + */ + @SaCheckPermission("mall:prodFavorite:query") + @GetMapping("/{favoriteId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long favoriteId) { + return R.ok(tzProdFavoriteService.queryById(favoriteId)); + } + + /** + * 新增商品收藏 + */ + @SaCheckPermission("mall:prodFavorite:add") + @Log(title = "商品收藏", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdFavoriteBo bo) { + return toAjax(tzProdFavoriteService.insertByBo(bo)); + } + + /** + * 修改商品收藏 + */ + @SaCheckPermission("mall:prodFavorite:edit") + @Log(title = "商品收藏", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdFavoriteBo bo) { + return toAjax(tzProdFavoriteService.updateByBo(bo)); + } + + /** + * 删除商品收藏 + * + * @param favoriteIds 主键串 + */ + @SaCheckPermission("mall:prodFavorite:remove") + @Log(title = "商品收藏", businessType = BusinessType.DELETE) + @DeleteMapping("/{favoriteIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] favoriteIds) { + return toAjax(tzProdFavoriteService.deleteWithValidByIds(List.of(favoriteIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropController.java new file mode 100644 index 0000000..54dfc54 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropController.java @@ -0,0 +1,119 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdPropBo; +import org.dromara.mall.domain.vo.TzProdPropVo; +import org.dromara.mall.service.ITzProdPropService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 商品规格 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodProp") +public class TzProdPropController extends BaseController { + + private final ITzProdPropService tzProdPropService; + + /** + * 查询商品规格列表 + */ + @SaCheckPermission("mall:prodProp:list") + @GetMapping("/list") + public TableDataInfo list(TzProdPropBo bo, PageQuery pageQuery) { + TenantHelper.setDynamic(bo.getTenantId()); + return tzProdPropService.queryPageList(bo, pageQuery); + } + + /** + * 查询商品规格列表 + */ + @GetMapping("/listAll") + public TableDataInfo listAll(TzProdPropBo bo, PageQuery pageQuery) { + TenantHelper.setDynamic(bo.getTenantId()); + return tzProdPropService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品规格列表 + */ + @SaCheckPermission("mall:prodProp:export") + @Log(title = "导出商品规格列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdPropBo bo, HttpServletResponse response) { + TenantHelper.setDynamic(bo.getTenantId()); + List list = tzProdPropService.queryList(bo); + ExcelUtil.exportExcel(list, "商品规格", TzProdPropVo.class, response); + } + + /** + * 获取商品规格详细信息 + * + * @param propId 主键 + */ + @SaCheckPermission("mall:prodProp:query") + @GetMapping("/{propId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long propId) { + return R.ok(tzProdPropService.queryById(propId)); + } + + /** + * 新增商品规格 + */ + @SaCheckPermission("mall:prodProp:add") + @Log(title = "新增商品规格", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdPropBo bo) { + TenantHelper.setDynamic(bo.getTenantId()); + return toAjax(tzProdPropService.insertByBo(bo)); + } + + /** + * 修改商品规格 + */ + @SaCheckPermission("mall:prodProp:edit") + @Log(title = "修改商品规格", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdPropBo bo) { + return toAjax(tzProdPropService.updateByBo(bo)); + } + + /** + * 删除商品规格 + * + * @param propIds 主键串 + */ + @SaCheckPermission("mall:prodProp:remove") + @Log(title = "删除商品规格", businessType = BusinessType.DELETE) + @DeleteMapping("/{propIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] propIds) { + return toAjax(tzProdPropService.deleteWithValidByIds(List.of(propIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropValueController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropValueController.java new file mode 100644 index 0000000..072d3a1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdPropValueController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdPropValueBo; +import org.dromara.mall.domain.vo.TzProdPropValueVo; +import org.dromara.mall.service.ITzProdPropValueService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 商品规格值表 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodPropValue") +public class TzProdPropValueController extends BaseController { + + private final ITzProdPropValueService tzProdPropValueService; + + /** + * 查询商品规格值表列表 + */ + @SaCheckPermission("mall:prodPropValue:list") + @GetMapping("/list") + public TableDataInfo list(TzProdPropValueBo bo, PageQuery pageQuery) { + return tzProdPropValueService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品规格值表列表 + */ + @SaCheckPermission("mall:prodPropValue:export") + @Log(title = "商品规格值表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdPropValueBo bo, HttpServletResponse response) { + List list = tzProdPropValueService.queryList(bo); + ExcelUtil.exportExcel(list, "商品规格值表", TzProdPropValueVo.class, response); + } + + /** + * 获取商品规格值表详细信息 + * + * @param valueId 主键 + */ + @SaCheckPermission("mall:prodPropValue:query") + @GetMapping("/{valueId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long valueId) { + return R.ok(tzProdPropValueService.queryById(valueId)); + } + + /** + * 新增商品规格值表 + */ + @SaCheckPermission("mall:prodPropValue:add") + @Log(title = "商品规格值表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdPropValueBo bo) { + return toAjax(tzProdPropValueService.insertByBo(bo)); + } + + /** + * 修改商品规格值表 + */ + @SaCheckPermission("mall:prodPropValue:edit") + @Log(title = "商品规格值表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdPropValueBo bo) { + return toAjax(tzProdPropValueService.updateByBo(bo)); + } + + /** + * 删除商品规格值表 + * + * @param valueIds 主键串 + */ + @SaCheckPermission("mall:prodPropValue:remove") + @Log(title = "商品规格值表", businessType = BusinessType.DELETE) + @DeleteMapping("/{valueIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] valueIds) { + return toAjax(tzProdPropValueService.deleteWithValidByIds(List.of(valueIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRecordController.java new file mode 100644 index 0000000..244370e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRecordController.java @@ -0,0 +1,106 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdRecordBo; +import org.dromara.mall.domain.vo.TzProdRecordVo; +import org.dromara.mall.service.ITzProdRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 产品价格记录 + * + * @author Maosw + * @date 2024-09-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodRecord") +public class TzProdRecordController extends BaseController { + + private final ITzProdRecordService tzProdRecordService; + + /** + * 查询产品价格记录列表 + */ + @SaCheckPermission("mall:prodRecord:list") + @GetMapping("/list") + public TableDataInfo list(TzProdRecordBo bo, PageQuery pageQuery) { + return tzProdRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出产品价格记录列表 + */ + @SaCheckPermission("mall:prodRecord:export") + @Log(title = "产品价格记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdRecordBo bo, HttpServletResponse response) { + List list = tzProdRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "产品价格记录", TzProdRecordVo.class, response); + } + + /** + * 获取产品价格记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:prodRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzProdRecordService.queryById(id)); + } + + /** + * 新增产品价格记录 + */ + @SaCheckPermission("mall:prodRecord:add") + @Log(title = "产品价格记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdRecordBo bo) { + return toAjax(tzProdRecordService.insertByBo(bo)); + } + + /** + * 修改产品价格记录 + */ + @SaCheckPermission("mall:prodRecord:edit") + @Log(title = "产品价格记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdRecordBo bo) { + return toAjax(tzProdRecordService.updateByBo(bo)); + } + + /** + * 删除产品价格记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:prodRecord:remove") + @Log(title = "产品价格记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzProdRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRelationController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRelationController.java new file mode 100644 index 0000000..fc63d64 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdRelationController.java @@ -0,0 +1,136 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdRelationBo; +import org.dromara.mall.domain.vo.TzProdRelationVo; +import org.dromara.mall.domain.vo.TzProdVo; +import org.dromara.mall.service.ITzProdRelationService; +import org.dromara.mall.service.ITzProdService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 商品推荐关联 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodRelation") +public class TzProdRelationController extends BaseController { + + private final ITzProdRelationService tzProdRelationService; + + private final ITzProdService tzProdService; + + /** + * 查询商品推荐关联列表 + */ + @SaCheckPermission("mall:prodRelation:list") + @GetMapping("/list") + public TableDataInfo list(TzProdRelationBo bo, PageQuery pageQuery) { + return tzProdService.getRelatedProducts(bo.getProdId(), pageQuery); + } + + /** + * 导出商品推荐关联列表 + */ + @SaCheckPermission("mall:prodRelation:export") + @Log(title = "商品推荐关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdRelationBo bo, HttpServletResponse response) { + List list = tzProdRelationService.queryList(bo); + ExcelUtil.exportExcel(list, "商品推荐关联", TzProdRelationVo.class, response); + } + + /** + * 获取商品推荐关联详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:prodRelation:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzProdRelationService.queryById(id)); + } + + /** + * 新增商品推荐关联 + */ + @SaCheckPermission("mall:prodRelation:add") + @Log(title = "商品推荐关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdRelationBo bo) { + // 查询是否已存在相同的商品关联 + TzProdRelationBo queryBo = new TzProdRelationBo(); + queryBo.setProdId(bo.getProdId()); + queryBo.setGlProdId(bo.getGlProdId()); + List existList = tzProdRelationService.queryList(queryBo); + if (!existList.isEmpty()) { + throw new ServiceException("该商品已经关联过了"); + } + return toAjax(tzProdRelationService.insertByBo(bo)); + } + + /** + * 修改商品推荐关联 + */ + @SaCheckPermission("mall:prodRelation:edit") + @Log(title = "商品推荐关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdRelationBo bo) { + return toAjax(tzProdRelationService.updateByBo(bo)); + } + + /** + * 删除商品推荐关联 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:prodRelation:remove") + @Log(title = "商品推荐关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzProdRelationService.deleteWithValidByIds(List.of(ids), true)); + } + + @SaCheckPermission("mall:prodRelation:remove") + @Log(title = "删除关联商品", businessType = BusinessType.DELETE) + @PostMapping("/delete") + public R delete(@RequestBody TzProdRelationBo bo) { + // 查询是否已存在相同的商品关联 + TzProdRelationBo queryBo = new TzProdRelationBo(); + queryBo.setProdId(bo.getProdId()); + queryBo.setGlProdId(bo.getGlProdId()); + List existList = tzProdRelationService.queryList(queryBo); + if (!existList.isEmpty()) { + Long[] ids = existList.stream().map(TzProdRelationVo::getId).toArray(Long[]::new); + return toAjax(tzProdRelationService.deleteWithValidByIds(List.of(ids), true)); + } + return R.warn("该商品没有关联"); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagController.java new file mode 100644 index 0000000..6573a25 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzProdTagVo; +import org.dromara.mall.domain.bo.TzProdTagBo; +import org.dromara.mall.service.ITzProdTagService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 商品分组 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodTag") +public class TzProdTagController extends BaseController { + + private final ITzProdTagService tzProdTagService; + + /** + * 查询商品分组列表 + */ + @SaCheckPermission("mall:prodTag:list") + @GetMapping("/list") + public TableDataInfo list(TzProdTagBo bo, PageQuery pageQuery) { + return tzProdTagService.queryPageList(bo, pageQuery); + } + + /** + * 导出商品分组列表 + */ + @SaCheckPermission("mall:prodTag:export") + @Log(title = "商品分组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdTagBo bo, HttpServletResponse response) { + List list = tzProdTagService.queryList(bo); + ExcelUtil.exportExcel(list, "商品分组", TzProdTagVo.class, response); + } + + /** + * 获取商品分组详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:prodTag:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzProdTagService.queryById(id)); + } + + /** + * 新增商品分组 + */ + @SaCheckPermission("mall:prodTag:add") + @Log(title = "商品分组", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdTagBo bo) { + return toAjax(tzProdTagService.insertByBo(bo)); + } + + /** + * 修改商品分组 + */ + @SaCheckPermission("mall:prodTag:edit") + @Log(title = "商品分组", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdTagBo bo) { + return toAjax(tzProdTagService.updateByBo(bo)); + } + + /** + * 删除商品分组 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:prodTag:remove") + @Log(title = "商品分组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzProdTagService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagReferenceController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagReferenceController.java new file mode 100644 index 0000000..f4dfdac --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdTagReferenceController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzProdTagReferenceVo; +import org.dromara.mall.domain.bo.TzProdTagReferenceBo; +import org.dromara.mall.service.ITzProdTagReferenceService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/prodTagReference") +public class TzProdTagReferenceController extends BaseController { + + private final ITzProdTagReferenceService tzProdTagReferenceService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:prodTagReference:list") + @GetMapping("/list") + public TableDataInfo list(TzProdTagReferenceBo bo, PageQuery pageQuery) { + return tzProdTagReferenceService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:prodTagReference:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdTagReferenceBo bo, HttpServletResponse response) { + List list = tzProdTagReferenceService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzProdTagReferenceVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param referenceId 主键 + */ + @SaCheckPermission("mall:prodTagReference:query") + @GetMapping("/{referenceId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long referenceId) { + return R.ok(tzProdTagReferenceService.queryById(referenceId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:prodTagReference:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdTagReferenceBo bo) { + return toAjax(tzProdTagReferenceService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:prodTagReference:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdTagReferenceBo bo) { + return toAjax(tzProdTagReferenceService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param referenceIds 主键串 + */ + @SaCheckPermission("mall:prodTagReference:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{referenceIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] referenceIds) { + return toAjax(tzProdTagReferenceService.deleteWithValidByIds(List.of(referenceIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdWishlistController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdWishlistController.java new file mode 100644 index 0000000..4db1d7d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzProdWishlistController.java @@ -0,0 +1,104 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzProdWishlistBo; +import org.dromara.mall.domain.vo.TzProdWishlistVo; +import org.dromara.mall.service.ITzProdWishlistService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 心愿单管理 + * + * @author Lion Li + * @date 2024-01-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/wishlist") +public class TzProdWishlistController extends BaseController { + + private final ITzProdWishlistService wishlistService; + + /** + * 查询心愿单列表 + */ + @SaCheckPermission("mall:wishlist:list") + @GetMapping("/list") + public TableDataInfo list(TzProdWishlistBo bo, PageQuery pageQuery) { + return wishlistService.queryPageList(bo, pageQuery); + } + + /** + * 导出心愿单列表 + */ + @SaCheckPermission("mall:wishlist:export") + @Log(title = "心愿单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzProdWishlistBo bo, HttpServletResponse response) { + List list = wishlistService.queryList(bo); + ExcelUtil.exportExcel(list, "心愿单", TzProdWishlistVo.class, response); + } + + /** + * 获取心愿单详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:wishlist:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + return R.ok(wishlistService.queryById(id)); + } + + /** + * 新增心愿单 + */ + @SaCheckPermission("mall:wishlist:add") + @Log(title = "心愿单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzProdWishlistBo bo) { + return toAjax(wishlistService.insertByBo(bo)); + } + + /** + * 修改心愿单 + */ + @SaCheckPermission("mall:wishlist:edit") + @Log(title = "心愿单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzProdWishlistBo bo) { + return toAjax(wishlistService.updateByBo(bo)); + } + + /** + * 删除心愿单 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:wishlist:remove") + @Log(title = "心愿单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + return toAjax(wishlistService.deleteWithValidByIds(List.of(ids), true)); + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzShopDetailController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzShopDetailController.java new file mode 100644 index 0000000..d64dccc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzShopDetailController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzShopDetailVo; +import org.dromara.mall.domain.bo.TzShopDetailBo; +import org.dromara.mall.service.ITzShopDetailService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/shopDetail") +public class TzShopDetailController extends BaseController { + + private final ITzShopDetailService tzShopDetailService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:shopDetail:list") + @GetMapping("/list") + public TableDataInfo list(TzShopDetailBo bo, PageQuery pageQuery) { + return tzShopDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:shopDetail:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzShopDetailBo bo, HttpServletResponse response) { + List list = tzShopDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzShopDetailVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param shopId 主键 + */ + @SaCheckPermission("mall:shopDetail:query") + @GetMapping("/{shopId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long shopId) { + return R.ok(tzShopDetailService.queryById(shopId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:shopDetail:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzShopDetailBo bo) { + return toAjax(tzShopDetailService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:shopDetail:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzShopDetailBo bo) { + return toAjax(tzShopDetailService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param shopIds 主键串 + */ + @SaCheckPermission("mall:shopDetail:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{shopIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] shopIds) { + return toAjax(tzShopDetailService.deleteWithValidByIds(List.of(shopIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSkuController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSkuController.java new file mode 100644 index 0000000..f2557ee --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSkuController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzSkuVo; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.service.ITzSkuService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 单品SKU + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/sku") +public class TzSkuController extends BaseController { + + private final ITzSkuService tzSkuService; + + /** + * 查询单品SKU列表 + */ + @SaCheckPermission("mall:sku:list") + @GetMapping("/list") + public TableDataInfo list(TzSkuBo bo, PageQuery pageQuery) { + return tzSkuService.queryPageList(bo, pageQuery); + } + + /** + * 导出单品SKU列表 + */ + @SaCheckPermission("mall:sku:export") + @Log(title = "单品SKU", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzSkuBo bo, HttpServletResponse response) { + List list = tzSkuService.queryList(bo); + ExcelUtil.exportExcel(list, "单品SKU", TzSkuVo.class, response); + } + + /** + * 获取单品SKU详细信息 + * + * @param skuId 主键 + */ + @SaCheckPermission("mall:sku:query") + @GetMapping("/{skuId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long skuId) { + return R.ok(tzSkuService.queryById(skuId)); + } + + /** + * 新增单品SKU + */ + @SaCheckPermission("mall:sku:add") + @Log(title = "单品SKU", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzSkuBo bo) { + return toAjax(tzSkuService.insertByBo(bo)); + } + + /** + * 修改单品SKU + */ + @SaCheckPermission("mall:sku:edit") + @Log(title = "单品SKU", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzSkuBo bo) { + return toAjax(tzSkuService.updateByBo(bo)); + } + + /** + * 删除单品SKU + * + * @param skuIds 主键串 + */ + @SaCheckPermission("mall:sku:remove") + @Log(title = "单品SKU", businessType = BusinessType.DELETE) + @DeleteMapping("/{skuIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] skuIds) { + return toAjax(tzSkuService.deleteWithValidByIds(List.of(skuIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSmsLogController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSmsLogController.java new file mode 100644 index 0000000..707fe02 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzSmsLogController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzSmsLogVo; +import org.dromara.mall.domain.bo.TzSmsLogBo; +import org.dromara.mall.service.ITzSmsLogService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 短信记录 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/smsLog") +public class TzSmsLogController extends BaseController { + + private final ITzSmsLogService tzSmsLogService; + + /** + * 查询短信记录列表 + */ + @SaCheckPermission("mall:smsLog:list") + @GetMapping("/list") + public TableDataInfo list(TzSmsLogBo bo, PageQuery pageQuery) { + return tzSmsLogService.queryPageList(bo, pageQuery); + } + + /** + * 导出短信记录列表 + */ + @SaCheckPermission("mall:smsLog:export") + @Log(title = "短信记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzSmsLogBo bo, HttpServletResponse response) { + List list = tzSmsLogService.queryList(bo); + ExcelUtil.exportExcel(list, "短信记录", TzSmsLogVo.class, response); + } + + /** + * 获取短信记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:smsLog:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzSmsLogService.queryById(id)); + } + + /** + * 新增短信记录 + */ + @SaCheckPermission("mall:smsLog:add") + @Log(title = "短信记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzSmsLogBo bo) { + return toAjax(tzSmsLogService.insertByBo(bo)); + } + + /** + * 修改短信记录 + */ + @SaCheckPermission("mall:smsLog:edit") + @Log(title = "短信记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzSmsLogBo bo) { + return toAjax(tzSmsLogService.updateByBo(bo)); + } + + /** + * 删除短信记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:smsLog:remove") + @Log(title = "短信记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzSmsLogService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTenantRecordController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTenantRecordController.java new file mode 100644 index 0000000..8835850 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTenantRecordController.java @@ -0,0 +1,114 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzTenantRecordBo; +import org.dromara.mall.domain.vo.TzTenantRecordVo; +import org.dromara.mall.service.ITzTenantRecordService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 租户资金记录 + * + * @author Maosw + * @date 2024-12-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/tenantRecord") +public class TzTenantRecordController extends BaseController { + + private final ITzTenantRecordService tzTenantRecordService; + + /** + * 查询租户资金记录列表 + */ + @SaCheckPermission("mall:tenantRecord:list") + @GetMapping("/list") + public TableDataInfo list(TzTenantRecordBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if ("zh_user".equals(loginUser.getUserType())) { + bo.setTenantId(loginUser.getTenantId()); + } + } + return tzTenantRecordService.queryPageList(bo, pageQuery); + } + + /** + * 导出租户资金记录列表 + */ + @SaCheckPermission("mall:tenantRecord:export") + @Log(title = "租户资金记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTenantRecordBo bo, HttpServletResponse response) { + List list = tzTenantRecordService.queryList(bo); + ExcelUtil.exportExcel(list, "租户资金记录", TzTenantRecordVo.class, response); + } + + /** + * 获取租户资金记录详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:tenantRecord:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzTenantRecordService.queryById(id)); + } + + /** + * 新增租户资金记录 + */ + @SaCheckPermission("mall:tenantRecord:add") + @Log(title = "租户资金记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTenantRecordBo bo) { + return toAjax(tzTenantRecordService.insertByBo(bo)); + } + + /** + * 修改租户资金记录 + */ + @SaCheckPermission("mall:tenantRecord:edit") + @Log(title = "租户资金记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTenantRecordBo bo) { + return toAjax(tzTenantRecordService.updateByBo(bo)); + } + + /** + * 删除租户资金记录 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:tenantRecord:remove") + @Log(title = "租户资金记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzTenantRecordService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityController.java new file mode 100644 index 0000000..11b45a9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzTranscityVo; +import org.dromara.mall.domain.bo.TzTranscityBo; +import org.dromara.mall.service.ITzTranscityService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/transcity") +public class TzTranscityController extends BaseController { + + private final ITzTranscityService tzTranscityService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transcity:list") + @GetMapping("/list") + public TableDataInfo list(TzTranscityBo bo, PageQuery pageQuery) { + return tzTranscityService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transcity:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTranscityBo bo, HttpServletResponse response) { + List list = tzTranscityService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzTranscityVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param transcityId 主键 + */ + @SaCheckPermission("mall:transcity:query") + @GetMapping("/{transcityId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transcityId) { + return R.ok(tzTranscityService.queryById(transcityId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:transcity:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTranscityBo bo) { + return toAjax(tzTranscityService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:transcity:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTranscityBo bo) { + return toAjax(tzTranscityService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param transcityIds 主键串 + */ + @SaCheckPermission("mall:transcity:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{transcityIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transcityIds) { + return toAjax(tzTranscityService.deleteWithValidByIds(List.of(transcityIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityFreeController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityFreeController.java new file mode 100644 index 0000000..39d5969 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTranscityFreeController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzTranscityFreeVo; +import org.dromara.mall.domain.bo.TzTranscityFreeBo; +import org.dromara.mall.service.ITzTranscityFreeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/transcityFree") +public class TzTranscityFreeController extends BaseController { + + private final ITzTranscityFreeService tzTranscityFreeService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transcityFree:list") + @GetMapping("/list") + public TableDataInfo list(TzTranscityFreeBo bo, PageQuery pageQuery) { + return tzTranscityFreeService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transcityFree:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTranscityFreeBo bo, HttpServletResponse response) { + List list = tzTranscityFreeService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzTranscityFreeVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param transcityFreeId 主键 + */ + @SaCheckPermission("mall:transcityFree:query") + @GetMapping("/{transcityFreeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transcityFreeId) { + return R.ok(tzTranscityFreeService.queryById(transcityFreeId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:transcityFree:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTranscityFreeBo bo) { + return toAjax(tzTranscityFreeService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:transcityFree:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTranscityFreeBo bo) { + return toAjax(tzTranscityFreeService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param transcityFreeIds 主键串 + */ + @SaCheckPermission("mall:transcityFree:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{transcityFreeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transcityFreeIds) { + return toAjax(tzTranscityFreeService.deleteWithValidByIds(List.of(transcityFreeIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeController.java new file mode 100644 index 0000000..e66c046 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzTransfeeVo; +import org.dromara.mall.domain.bo.TzTransfeeBo; +import org.dromara.mall.service.ITzTransfeeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/transfee") +public class TzTransfeeController extends BaseController { + + private final ITzTransfeeService tzTransfeeService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transfee:list") + @GetMapping("/list") + public TableDataInfo list(TzTransfeeBo bo, PageQuery pageQuery) { + return tzTransfeeService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transfee:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTransfeeBo bo, HttpServletResponse response) { + List list = tzTransfeeService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzTransfeeVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param transfeeId 主键 + */ + @SaCheckPermission("mall:transfee:query") + @GetMapping("/{transfeeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transfeeId) { + return R.ok(tzTransfeeService.queryById(transfeeId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:transfee:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTransfeeBo bo) { + return toAjax(tzTransfeeService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:transfee:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTransfeeBo bo) { + return toAjax(tzTransfeeService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param transfeeIds 主键串 + */ + @SaCheckPermission("mall:transfee:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{transfeeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transfeeIds) { + return toAjax(tzTransfeeService.deleteWithValidByIds(List.of(transfeeIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeFreeController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeFreeController.java new file mode 100644 index 0000000..34f0cf1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransfeeFreeController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzTransfeeFreeVo; +import org.dromara.mall.domain.bo.TzTransfeeFreeBo; +import org.dromara.mall.service.ITzTransfeeFreeService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/transfeeFree") +public class TzTransfeeFreeController extends BaseController { + + private final ITzTransfeeFreeService tzTransfeeFreeService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transfeeFree:list") + @GetMapping("/list") + public TableDataInfo list(TzTransfeeFreeBo bo, PageQuery pageQuery) { + return tzTransfeeFreeService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transfeeFree:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTransfeeFreeBo bo, HttpServletResponse response) { + List list = tzTransfeeFreeService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzTransfeeFreeVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param transfeeFreeId 主键 + */ + @SaCheckPermission("mall:transfeeFree:query") + @GetMapping("/{transfeeFreeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transfeeFreeId) { + return R.ok(tzTransfeeFreeService.queryById(transfeeFreeId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:transfeeFree:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTransfeeFreeBo bo) { + return toAjax(tzTransfeeFreeService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:transfeeFree:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTransfeeFreeBo bo) { + return toAjax(tzTransfeeFreeService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param transfeeFreeIds 主键串 + */ + @SaCheckPermission("mall:transfeeFree:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{transfeeFreeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transfeeFreeIds) { + return toAjax(tzTransfeeFreeService.deleteWithValidByIds(List.of(transfeeFreeIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransportController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransportController.java new file mode 100644 index 0000000..3ed9c7b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzTransportController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzTransportVo; +import org.dromara.mall.domain.bo.TzTransportBo; +import org.dromara.mall.service.ITzTransportService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/transport") +public class TzTransportController extends BaseController { + + private final ITzTransportService tzTransportService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transport:list") + @GetMapping("/list") + public TableDataInfo list(TzTransportBo bo, PageQuery pageQuery) { + return tzTransportService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:transport:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzTransportBo bo, HttpServletResponse response) { + List list = tzTransportService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzTransportVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param transportId 主键 + */ + @SaCheckPermission("mall:transport:query") + @GetMapping("/{transportId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transportId) { + return R.ok(tzTransportService.queryById(transportId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:transport:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzTransportBo bo) { + return toAjax(tzTransportService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:transport:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzTransportBo bo) { + return toAjax(tzTransportService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param transportIds 主键串 + */ + @SaCheckPermission("mall:transport:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{transportIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transportIds) { + return toAjax(tzTransportService.deleteWithValidByIds(List.of(transportIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrController.java new file mode 100644 index 0000000..3749151 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzUserAddrVo; +import org.dromara.mall.domain.bo.TzUserAddrBo; +import org.dromara.mall.service.ITzUserAddrService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户配送地址 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userAddr") +public class TzUserAddrController extends BaseController { + + private final ITzUserAddrService tzUserAddrService; + + /** + * 查询用户配送地址列表 + */ + @SaCheckPermission("mall:userAddr:list") + @GetMapping("/list") + public TableDataInfo list(TzUserAddrBo bo, PageQuery pageQuery) { + return tzUserAddrService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户配送地址列表 + */ + @SaCheckPermission("mall:userAddr:export") + @Log(title = "用户配送地址", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserAddrBo bo, HttpServletResponse response) { + List list = tzUserAddrService.queryList(bo); + ExcelUtil.exportExcel(list, "用户配送地址", TzUserAddrVo.class, response); + } + + /** + * 获取用户配送地址详细信息 + * + * @param addrId 主键 + */ + @SaCheckPermission("mall:userAddr:query") + @GetMapping("/{addrId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long addrId) { + return R.ok(tzUserAddrService.queryById(addrId)); + } + + /** + * 新增用户配送地址 + */ + @SaCheckPermission("mall:userAddr:add") + @Log(title = "用户配送地址", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserAddrBo bo) { + return toAjax(tzUserAddrService.insertByBo(bo)); + } + + /** + * 修改用户配送地址 + */ + @SaCheckPermission("mall:userAddr:edit") + @Log(title = "用户配送地址", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserAddrBo bo) { + return toAjax(tzUserAddrService.updateByBo(bo)); + } + + /** + * 删除用户配送地址 + * + * @param addrIds 主键串 + */ + @SaCheckPermission("mall:userAddr:remove") + @Log(title = "用户配送地址", businessType = BusinessType.DELETE) + @DeleteMapping("/{addrIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] addrIds) { + return toAjax(tzUserAddrService.deleteWithValidByIds(List.of(addrIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrOrderController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrOrderController.java new file mode 100644 index 0000000..8f9b431 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddrOrderController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzUserAddrOrderVo; +import org.dromara.mall.domain.bo.TzUserAddrOrderBo; +import org.dromara.mall.service.ITzUserAddrOrderService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户订单配送地址 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userAddrOrder") +public class TzUserAddrOrderController extends BaseController { + + private final ITzUserAddrOrderService tzUserAddrOrderService; + + /** + * 查询用户订单配送地址列表 + */ + @SaCheckPermission("mall:userAddrOrder:list") + @GetMapping("/list") + public TableDataInfo list(TzUserAddrOrderBo bo, PageQuery pageQuery) { + return tzUserAddrOrderService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户订单配送地址列表 + */ + @SaCheckPermission("mall:userAddrOrder:export") + @Log(title = "用户订单配送地址", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserAddrOrderBo bo, HttpServletResponse response) { + List list = tzUserAddrOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "用户订单配送地址", TzUserAddrOrderVo.class, response); + } + + /** + * 获取用户订单配送地址详细信息 + * + * @param addrOrderId 主键 + */ + @SaCheckPermission("mall:userAddrOrder:query") + @GetMapping("/{addrOrderId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long addrOrderId) { + return R.ok(tzUserAddrOrderService.queryById(addrOrderId)); + } + + /** + * 新增用户订单配送地址 + */ + @SaCheckPermission("mall:userAddrOrder:add") + @Log(title = "用户订单配送地址", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserAddrOrderBo bo) { + return toAjax(tzUserAddrOrderService.insertByBo(bo)); + } + + /** + * 修改用户订单配送地址 + */ + @SaCheckPermission("mall:userAddrOrder:edit") + @Log(title = "用户订单配送地址", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserAddrOrderBo bo) { + return toAjax(tzUserAddrOrderService.updateByBo(bo)); + } + + /** + * 删除用户订单配送地址 + * + * @param addrOrderIds 主键串 + */ + @SaCheckPermission("mall:userAddrOrder:remove") + @Log(title = "用户订单配送地址", businessType = BusinessType.DELETE) + @DeleteMapping("/{addrOrderIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] addrOrderIds) { + return toAjax(tzUserAddrOrderService.deleteWithValidByIds(List.of(addrOrderIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddressController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddressController.java new file mode 100644 index 0000000..e327ad8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserAddressController.java @@ -0,0 +1,101 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzUserAddressBo; +import org.dromara.mall.domain.vo.TzUserAddressVo; +import org.dromara.mall.service.ITzUserAddressService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户地址 + * + * @author Maosw + * @date 2024-09-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userAddress") +public class TzUserAddressController extends BaseController { + + private final ITzUserAddressService tzUserAddressService; + + /** + * 查询客户地址列表 + */ + @GetMapping("/list") + public TableDataInfo list(TzUserAddressBo bo, PageQuery pageQuery) { + return tzUserAddressService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户地址列表 + */ + @SaCheckPermission("mall:userAddress:export") + @Log(title = "客户地址", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserAddressBo bo, HttpServletResponse response) { + List list = tzUserAddressService.queryList(bo); + ExcelUtil.exportExcel(list, "客户地址", TzUserAddressVo.class, response); + } + + /** + * 获取客户地址详细信息 + * + * @param id 主键 + */ + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzUserAddressService.queryById(id)); + } + + /** + * 新增客户地址 + */ + @Log(title = "客户地址", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserAddressBo bo) { + return toAjax(tzUserAddressService.insertByBo(bo)); + } + + /** + * 修改客户地址 + */ + @Log(title = "客户地址", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserAddressBo bo) { + return toAjax(tzUserAddressService.updateByBo(bo)); + } + + /** + * 删除客户地址 + * + * @param ids 主键串 + */ + @Log(title = "客户地址", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzUserAddressService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserCollectionController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserCollectionController.java new file mode 100644 index 0000000..fb02a77 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserCollectionController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzUserCollectionVo; +import org.dromara.mall.domain.bo.TzUserCollectionBo; +import org.dromara.mall.service.ITzUserCollectionService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userCollection") +public class TzUserCollectionController extends BaseController { + + private final ITzUserCollectionService tzUserCollectionService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("mall:userCollection:list") + @GetMapping("/list") + public TableDataInfo list(TzUserCollectionBo bo, PageQuery pageQuery) { + return tzUserCollectionService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("mall:userCollection:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserCollectionBo bo, HttpServletResponse response) { + List list = tzUserCollectionService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", TzUserCollectionVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:userCollection:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzUserCollectionService.queryById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("mall:userCollection:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserCollectionBo bo) { + return toAjax(tzUserCollectionService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("mall:userCollection:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserCollectionBo bo) { + return toAjax(tzUserCollectionService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:userCollection:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzUserCollectionService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserController.java new file mode 100644 index 0000000..27ea98c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserController.java @@ -0,0 +1,143 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzUserBo; +import org.dromara.mall.domain.vo.TzUserSumVo; +import org.dromara.mall.domain.vo.TzUserVo; +import org.dromara.mall.service.ITzUserService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户 + * + * @author Lion Li + * @date 2024-07-30 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/user") +public class TzUserController extends BaseController { + + private final ITzUserService tzUserService; + + /** + * 查询用户列表 + */ + @SaCheckPermission("mall:user:list") + @GetMapping("/list") + public TableDataInfo list(TzUserBo bo, PageQuery pageQuery) { + return tzUserService.queryPageList(bo, pageQuery); + } + + /** + * 查询用户统计信息 + */ + @SaCheckPermission("mall:user:list") + @GetMapping("/listSum") + public R listSum(TzUserBo bo) { + return R.ok(tzUserService.querySum(bo)); + } + + /** + * 查询用户下单排行榜列表 + */ + @SaCheckPermission("mall:user:listChart") + @GetMapping("/listChart") + public TableDataInfo listChart(TzUserBo bo, PageQuery pageQuery) { + return tzUserService.queryPageListChart(bo, pageQuery); + } + + /** + * 导出用户列表 + */ + @SaCheckPermission("mall:user:export") + @Log(title = "用户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserBo bo, HttpServletResponse response) { + List list = tzUserService.queryList(bo); + ExcelUtil.exportExcel(list, "用户", TzUserVo.class, response); + } + + /** + * 获取用户详细信息 + * + * @param userId 主键 + */ + @SaCheckPermission("mall:user:query") + @GetMapping("/{userId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long userId) { + return R.ok(tzUserService.queryById(userId)); + } + + /** + * 开启设计师开关 + * + * @param userPhone 主键 + */ + @SaCheckPermission("mall:user:switch") + @PostMapping("/switch") + @Parameters({ + @Parameter(name = "userPhone", description = "手机号码", required = true), + @Parameter(name = "status", description = "状态 1-开启 2-关闭", required = true) + }) + public R getInfo(@RequestParam(value = "userPhone") String userPhone, @RequestParam(value = "status") Integer status) { + return toAjax(tzUserService.queryByUserPhone(userPhone,status)); + } + + + /** + * 新增用户 + */ + @SaCheckPermission("mall:user:add") + @Log(title = "用户", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserBo bo) { + return toAjax(tzUserService.insertByBo(bo)); + } + + /** + * 修改用户 + */ + @SaCheckPermission("mall:user:edit") + @Log(title = "用户", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserBo bo) { + return toAjax(tzUserService.updateByBo(bo)); + } + + /** + * 删除用户 + * + * @param userIds 主键串 + */ + @SaCheckPermission("mall:user:remove") + @Log(title = "用户", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] userIds) { + return toAjax(tzUserService.deleteWithValidByIds(List.of(userIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserSearchController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserSearchController.java new file mode 100644 index 0000000..127fdf0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzUserSearchController.java @@ -0,0 +1,105 @@ +package org.dromara.mall.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.mall.domain.vo.TzUserSearchVo; +import org.dromara.mall.domain.bo.TzUserSearchBo; +import org.dromara.mall.service.ITzUserSearchService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 用户搜索 + * + * @author Maosw + * @date 2024-08-09 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/userSearch") +public class TzUserSearchController extends BaseController { + + private final ITzUserSearchService tzUserSearchService; + + /** + * 查询用户搜索列表 + */ + @SaCheckPermission("mall:userSearch:list") + @GetMapping("/list") + public TableDataInfo list(TzUserSearchBo bo, PageQuery pageQuery) { + return tzUserSearchService.queryPageList(bo, pageQuery); + } + + /** + * 导出用户搜索列表 + */ + @SaCheckPermission("mall:userSearch:export") + @Log(title = "用户搜索", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzUserSearchBo bo, HttpServletResponse response) { + List list = tzUserSearchService.queryList(bo); + ExcelUtil.exportExcel(list, "用户搜索", TzUserSearchVo.class, response); + } + + /** + * 获取用户搜索详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:userSearch:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzUserSearchService.queryById(id)); + } + + /** + * 新增用户搜索 + */ + @SaCheckPermission("mall:userSearch:add") + @Log(title = "用户搜索", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzUserSearchBo bo) { + return toAjax(tzUserSearchService.insertByBo(bo)); + } + + /** + * 修改用户搜索 + */ + @SaCheckPermission("mall:userSearch:edit") + @Log(title = "用户搜索", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzUserSearchBo bo) { + return toAjax(tzUserSearchService.updateByBo(bo)); + } + + /** + * 删除用户搜索 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:userSearch:remove") + @Log(title = "用户搜索", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzUserSearchService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzWithdrawRequestController.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzWithdrawRequestController.java new file mode 100644 index 0000000..6fd0a79 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/TzWithdrawRequestController.java @@ -0,0 +1,141 @@ +package org.dromara.mall.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.alibaba.fastjson2.JSONObject; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.mall.domain.bo.TzWithdrawRequestBo; +import org.dromara.mall.domain.vo.TzWithdrawRequestVo; +import org.dromara.mall.domain.vo.TzWithdrawSumVo; +import org.dromara.mall.service.ITzWithdrawRequestService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 提现申请 + * + * @author Maosw + * @date 2024-12-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/mall/withdrawRequest") +public class TzWithdrawRequestController extends BaseController { + + private final ITzWithdrawRequestService tzWithdrawRequestService; + + /** + * 查询提现申请列表 + */ + @SaCheckPermission("mall:withdrawRequest:list") + @GetMapping("/list") + public TableDataInfo list(TzWithdrawRequestBo bo, PageQuery pageQuery) { + return tzWithdrawRequestService.queryPageList(bo, pageQuery); + } + + /** + * 查询提现申请统计信息 + */ + @SaCheckPermission("mall:withdrawRequest:list") + @GetMapping("/listSum") + public R listSum(TzWithdrawRequestBo bo) { + return R.ok(tzWithdrawRequestService.querySum(bo)); + } + + /** + * 导出提现申请列表 + */ + @SaCheckPermission("mall:withdrawRequest:export") + @Log(title = "提现申请", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzWithdrawRequestBo bo, HttpServletResponse response) { + List list = tzWithdrawRequestService.queryList(bo); + ExcelUtil.exportExcel(list, "提现申请", TzWithdrawRequestVo.class, response); + } + + /** + * 获取提现申请详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("mall:withdrawRequest:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzWithdrawRequestService.queryById(id)); + } + + /** + * 新增提现申请 + */ + @SaCheckPermission("mall:withdrawRequest:add") + @Log(title = "提现申请", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzWithdrawRequestBo bo) { + return toAjax(tzWithdrawRequestService.insertByBo(bo)); + } + + /** + * 修改提现申请 + */ + @SaCheckPermission("mall:withdrawRequest:edit") + @Log(title = "提现申请", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzWithdrawRequestBo bo) { + return toAjax(tzWithdrawRequestService.updateByBo(bo)); + } + + /** + * 删除提现申请 + * + * @param ids 主键串 + */ + @SaCheckPermission("mall:withdrawRequest:remove") + @Log(title = "提现申请", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzWithdrawRequestService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 审核提现 + */ + @SaCheckPermission("mall:withdrawRequest:examine") + @Log(title = "审核提现", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/examine") + public R examine(@RequestBody TzWithdrawRequestBo bo) throws Exception { + return toAjax(tzWithdrawRequestService.examine(bo)); + } + + /** + * 查询拉卡拉分账结果 + * + * @param id 主键 + */ + @SaCheckPermission("mall:withdrawRequest:query") + @GetMapping("/queryPlus/{id}") + public R queryPlus(@NotNull(message = "主键不能为空") + @PathVariable Long id) throws Exception { + return R.ok(tzWithdrawRequestService.queryPlus(id)); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyBasket.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyBasket.java new file mode 100644 index 0000000..f19b731 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyBasket.java @@ -0,0 +1,68 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 购物车对象 hy_basket + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_basket") +public class HyBasket extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 产品ID + */ + private Long prodId; + + /** + * SkuID + */ + private Long skuId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 产品个数 + */ + private Long num; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Long delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCodeOrder.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCodeOrder.java new file mode 100644 index 0000000..00a8c3d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCodeOrder.java @@ -0,0 +1,103 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 会员码订单对象 hy_code_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_code_order") +public class HyCodeOrder extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 设计师ID + */ + private Long userId; + + /** + * 邀请人ID + */ + private Long inviteUserId; + + /** + * 购买商户ID + */ + private Long merchantId; + + /** + * 推广员ID + */ + private Long promoterId; + + /** + * 购买数量 + */ + private Long num; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 订单金额 + */ + private BigDecimal orderAmount; + + /** + * 订单状态: 1-待支付, 2-已支付, 3-已取消, 4-待结算, 5-已结算 + */ + private Integer orderStatus; + + /** + * 支付时间 + */ + private Date paymentTime; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + private Integer type; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Long delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 拉卡拉平台订单号 + */ + private String payOrderNo; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCouponRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCouponRecord.java new file mode 100644 index 0000000..15d625c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyCouponRecord.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_coupon_record") +public class HyCouponRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** 主键 */ + @TableId(value = "id") + private Long id; + + /** 用户ID */ + private Long userId; + + /** 购买手机号码 */ + private String phone; + + /** 变动金额(正数增加,负数减少) */ + private BigDecimal amount; + + /** 变动后余额 */ + private BigDecimal balance; + + /** 变动类型: 1-增加, 2-扣除, 3-退回 */ + private Integer type; + + /** 订单ID */ + private Long orderId; + + /** 订单编号 */ + private String orderNum; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyMemberCode.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyMemberCode.java new file mode 100644 index 0000000..c46c338 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyMemberCode.java @@ -0,0 +1,114 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 会员码兑换对象 hy_member_code + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_member_code") +public class HyMemberCode extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 设计师ID + */ + private Long userId; + + /** + * 购买商户ID + */ + private Long merchantId; + + /** + * 推广员ID + */ + private Long promoterId; + + /** + * 兑换时间 + */ + private Date redeemTime; + + /** + * 兑换码有效期开始 + */ + private Date validFrom; + + /** + * 兑换码有效期结束 + */ + private Date validTo; + + /** + * 购买价格 + */ + private BigDecimal price; + + /** + * 会员ID + */ + private Long memberId; + + /** + * 会员兑换手机号码 + */ + private String memberPhone; + + /** + * 兑换码 + */ + private String code; + + /** + * 兑换状态: 1-未兑换, 2-已兑换 + */ + private Integer status; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + private Integer type; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + + /** + * 是否复制 1-未复制 2-已复制 + */ + private Integer isCopy; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrder.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrder.java new file mode 100644 index 0000000..47c6af4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrder.java @@ -0,0 +1,163 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 总订单对象 hy_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_order") +public class HyOrder extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订单商品总数 + */ + private Long num; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + private Integer payState; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + private Integer status; + + /** + * 收货人姓名 + */ + private String clientName; + + /** + * 收货人电话 + */ + private String clientPhone; + + /** + * 收货地址 + */ + private String clientAddress; + + /** + * 付款时间 + */ + private Date payTime; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + private Long refundSts; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + private Long closeType; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Long delFlag; + + /** + * 拉卡拉平台订单号 + */ + private String payOrderNo; + + /** + * 交易流水号 + */ + private String tradeNo; + + /** + * 交易流水号 + */ + private String logNo; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderItem.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderItem.java new file mode 100644 index 0000000..dc16242 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderItem.java @@ -0,0 +1,228 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单详情对象 hy_order_item + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_order_item") +public class HyOrderItem extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 订单汇总ID + */ + private Long orderId; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 产品编码 + */ + private String prodCode; + + /** + * 产品名称 + */ + private String prodName; + + /** + * skuID + */ + private Long skuId; + + /** + * sku编码 + */ + private String skuCode; + + /** + * sku厂家编码 + */ + private String skuFactoryCode; + + /** + * sku名称 + */ + private String skuName; + + /** + * sku图片路径 + */ + private String pic; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订单商品总数 + */ + private Long num; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + private Integer payState; + + /** + * 支付类型 0:手动代付 1: 微信支付 2:支付宝 + */ + private Integer payType; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + private Integer status; + + /** + * 物流单号 + */ + private String dvyFlowId; + + /** + * 订单运费 + */ + private Long dvyPrice; + + /** + * 发货地 + */ + private String deliveryLocat; + + /** + * 收货人姓名 + */ + private String clientName; + + /** + * 收货人电话 + */ + private String clientPhone; + + /** + * 收货地址 + */ + private String clientAddress; + + /** + * 付款时间 + */ + private Date payTime; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + private Long refundSts; + + /** + * 1:未评价 2:已评价 + */ + private Long appraisalFlag; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + private Long closeType; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 是否开票 1:未开票 2:已开票 + */ + private Integer isSfkp; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderPayment.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderPayment.java new file mode 100644 index 0000000..a898769 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyOrderPayment.java @@ -0,0 +1,119 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单打款对象 hy_order_payment + * + * @author Maosw + * @date 2024-12-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_order_payment") +public class HyOrderPayment extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单ID集合 + */ +// private String orderIds; + + /** + * 订单编号集合 + */ +// private String orderNums; + + /** + * 财务ID + */ + private Long cwId; + + /** + * 财务姓名 + */ + private String cwName; + + /** + * 付款金额 + */ + private BigDecimal total; + + /** + * 提现前余额 + */ + private BigDecimal currentBalance; + + /** + * 状态 1:待付款 2:已付款 3:审核拒绝 + */ + private Integer status; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 描述 + */ + private String depict; + + /** + * 收款人姓名 + */ + private String payeeName; + + /** + * 收款银行名称 + */ + private String payeeBank; + + /** + * 收款银行卡号 + */ + private String payeeBankNum; + + /** + * 打款时间 + */ + private Date payTime; + + /** + * 1:打款给厂家 2:退款给买家 + */ + private Integer type; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 发票链接 + */ + private String invoiceUrl; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoter.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoter.java new file mode 100644 index 0000000..99810aa --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoter.java @@ -0,0 +1,123 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 推广员对象 hy_promoter + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_promoter") +public class HyPromoter extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 推广员名称 + */ + private String name; + + /** + * 推广员编号 + */ + private String code; + + /** + * 联系方式 + */ + private String phone; + + /** + * 登录密码 + */ + private String password; + + /** + * 推广人数 + */ + private Long num; + + /** + * 标识: 1-企业, 2-个人 + */ + private Integer typeFlag; + + /** + * 个人所属企业ID + */ + private Long parentId; + + /** + * 账户余额 + */ + private BigDecimal balance; + + /** + * 状态: 1-启用, 2-禁用 + */ + private Integer status; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer examineFlag; + + + /** + * 实名认证信息 + */ + private String realName; + + /** + * 身份证 + */ + private String idCard; + + /** + * 身份证正面 + */ + private String frontCard; + + /** + * 身份证反面 + */ + private String reverseCard; + + /** + * 拉卡拉用户ID + */ + private String custId; + + /** + * 证件起止日期 + */ + private String certExpirationDate; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoterRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoterRecord.java new file mode 100644 index 0000000..50da0b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyPromoterRecord.java @@ -0,0 +1,68 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 推广员资金记录对象 hy_promoter_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_promoter_record") +public class HyPromoterRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @TableId(value = "id") + private Long id; + + /** + * 推广员ID + */ + private Long promoterId; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyUserRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyUserRecord.java new file mode 100644 index 0000000..f7c0bf7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/HyUserRecord.java @@ -0,0 +1,112 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 用户资金记录对象 hy_user_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("hy_user_record") +public class HyUserRecord extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订购用户手机号 + */ + private String userPhone; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 个税税率 + */ + private BigDecimal taxRate; + + /** + * 个税税金 + */ + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + private BigDecimal sxfTaxAmount; + + /** + * 税后金额 + */ + private BigDecimal afterTaxAmount; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAgreement.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAgreement.java new file mode 100644 index 0000000..f1a81fc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAgreement.java @@ -0,0 +1,57 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 协议对象 tz_agreement + * + * @author Maosw + * @date 2024-12-26 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_agreement") +public class TzAgreement extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * code值 + */ + private String code; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzArea.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzArea.java new file mode 100644 index 0000000..4b0b1d0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzArea.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 地区对象 tz_area + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_area") +public class TzArea extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "area_id") + private Long areaId; + + /** + * + */ + private String areaName; + + /** + * + */ + private Long parentId; + + /** + * + */ + private Long level; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAttachFile.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAttachFile.java new file mode 100644 index 0000000..db538a6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzAttachFile.java @@ -0,0 +1,63 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_attach_file + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_attach_file") +public class TzAttachFile extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "file_id") + private Long fileId; + + /** + * 文件路径 + */ + private String filePath; + + /** + * 文件类型 + */ + private String fileType; + + /** + * 文件大小 + */ + private Integer fileSize; + + /** + * 上传时间 + */ + private Date uploadTime; + + /** + * 文件关联的表主键id + */ + private Long fileJoinId; + + /** + * 文件关联表类型:1 商品表 FileJoinType + */ + private Integer fileJoinType; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBankCard.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBankCard.java new file mode 100644 index 0000000..e03aad0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBankCard.java @@ -0,0 +1,107 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 绑定银行卡信息对象 tz_bank_card + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_bank_card") +public class TzBankCard extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 银行卡信息ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + private Long userId; + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + private Integer roleType; + + /** + * 持卡人姓名 + */ + private String cardHolderName; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 银行卡号 + */ + private String cardNumber; + + /** + * 卡类型: 1-借记卡, 2-信用卡 + */ + private Integer cardType; + + /** + * 是否默认: 1-是,2-否 + */ + private Integer isDefault; + + /** + * 状态: 1-正常, 2-停用 + */ + private Integer status; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 拉卡拉订单编号 + */ + private String orderNo; + + /** + * 拉卡拉接收方编号 + */ + private String receiverNo; + + /** + * 拉卡拉绑定订单编号 + */ + private String bdOrderNo; + + /** + * 拉卡拉受理编号 + */ + private String applyId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBasket.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBasket.java new file mode 100644 index 0000000..6301a15 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBasket.java @@ -0,0 +1,73 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 购物车对象 tz_basket + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_basket") +public class TzBasket extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "basket_id") + private Long basketId; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 产品ID + */ + private Long prodId; + + /** + * SkuID + */ + private Long skuId; + + /** + * 用户ID + */ + private String userId; + + /** + * 购物车产品个数 + */ + private Long basketCount; + + /** + * 购物时间 + */ + private Date basketDate; + + /** + * 满减活动ID + */ + private Long discountId; + + /** + * 分销推广人卡号 + */ + private String distributionCardNo; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBrand.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBrand.java new file mode 100644 index 0000000..ba69ed0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzBrand.java @@ -0,0 +1,57 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 品牌对象 tz_brand + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_brand") +public class TzBrand extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 品牌名称 + */ + private String name; + + /** + * 图片路径 + */ + private String pic; + + /** + * 备注 + */ + private String remark; + + /** + * 顺序 + */ + private Long seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategory.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategory.java new file mode 100644 index 0000000..724a5c7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategory.java @@ -0,0 +1,83 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 产品类目对象 tz_category + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_category") +public class TzCategory extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类目ID + */ + @TableId(value = "category_id") + private Long categoryId; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 父节点 + */ + private Long parentId; + + /** + * 产品类目名称 + */ + private String categoryName; + + /** + * 类目图标 + */ + private String icon; + + /** + * 类目的显示图片 + */ + private String pic; + + /** + * 排序 + */ + private Integer seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + private Integer status; + + /** + * 记录时间 + */ + private Date recTime; + + /** + * 分类层级 + */ + private Integer grade; + + /** + * 是否有子集 0:没有 1:有 + */ + private Integer subset; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryBrand.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryBrand.java new file mode 100644 index 0000000..fbb0483 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryBrand.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_category_brand + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_category_brand") +public class TzCategoryBrand extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 分类id + */ + private Long categoryId; + + /** + * 品牌id + */ + private Long brandId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryProp.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryProp.java new file mode 100644 index 0000000..9de2306 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCategoryProp.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_category_prop + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_category_prop") +public class TzCategoryProp extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 分类id + */ + private Long categoryId; + + /** + * 商品属性id即表tz_prod_prop中的prop_id + */ + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomer.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomer.java new file mode 100644 index 0000000..a047b45 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomer.java @@ -0,0 +1,112 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 客户对象 tz_customer + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_customer") +public class TzCustomer { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 客服ID + */ + private Long userId; + + /** + * 客服编号 + */ + private String userCode; + + /** + * 客服姓名 + */ + private String userName; + + /** + * 客户编号 + */ + private String code; + + /** + * 客户姓名 + */ + private String name; + + /** + * 电话号码 + */ + private String phone; + + /** + * 余额 + */ + private BigDecimal balance; + + /** + * 性别 0:女 1:男 + */ + private Integer sex; + + /** + * 客户类型 + */ + private Integer type; + + /** + * 状态(0正常 1禁用) + */ + private Integer state; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志(0代表存在 1代表删除) + */ + private Integer delFlag; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomerRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomerRecord.java new file mode 100644 index 0000000..c08e75e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzCustomerRecord.java @@ -0,0 +1,71 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 客户资金记录对象 tz_customer_record + * + * @author Maosw + * @date 2024-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_customer_record") +public class TzCustomerRecord { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 客户ID + */ + private Long userId; + + /** + * 客户姓名 + */ + private String userName; + + /** + * 账变类型1:充值 2:支出 3:退款 + */ + private Integer type; + + /** + * 变动金额 + */ + private BigDecimal price; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 描述 + */ + private String depict; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzDelivery.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzDelivery.java new file mode 100644 index 0000000..e2decf8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzDelivery.java @@ -0,0 +1,49 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 物流公司对象 tz_delivery + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_delivery") +public class TzDelivery extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 物流公司名称 + */ + private String name; + + /** + * 删除标志: 1-存在, 2-删除 + */ + @TableLogic + private Long delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzHotSearch.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzHotSearch.java new file mode 100644 index 0000000..acb85ba --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzHotSearch.java @@ -0,0 +1,68 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 热搜对象 tz_hot_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_hot_search") +public class TzHotSearch extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "hot_search_id") + private Long hotSearchId; + + /** + * 店铺ID 0为全局热搜 + */ + private Long shopId; + + /** + * 热搜标题 + */ + private String title; + + /** + * 搜索次数 + */ + private Long num; + + /** + * 状态 0下线 1上线 + */ + private Integer status; + + /** + * 内容 + */ + private String content; + + /** + * 顺序 + */ + private Integer seq; + + /** + * 录入时间 + */ + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzIndexImg.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzIndexImg.java new file mode 100644 index 0000000..dd57641 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzIndexImg.java @@ -0,0 +1,77 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 主页轮播图对象 tz_index_img + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_index_img") +public class TzIndexImg { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "img_id") + private Long imgId; + + /** + * 图片 + */ + private String imgUrl; + + /** + * 说明文字,描述 + */ + private String des; + + /** + * 标题 + */ + private String title; + + /** + * 链接 + */ + private String link; + + /** + * 状态 1:未上架 2:已上架 + */ + private Integer status; + + /** + * 顺序 + */ + private Integer seq; + + /** + * 上传时间 + */ + private Date uploadTime; + + /** + * 关联 + */ + private Long relation; + + /** + * 类型 + */ + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceApply.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceApply.java new file mode 100644 index 0000000..97d8d61 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceApply.java @@ -0,0 +1,114 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 发票申请记录对象 tz_invoice_apply + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_invoice_apply") +public class TzInvoiceApply extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 发票申请编号 + */ + private String invoiceNo; + + /** + * 用户id + */ + private Long userId; + + /** + * 发票抬头id + */ + private Long invoiceTitleId; + + /** + * 发票抬头信息JSON + */ + private String invoiceTitleJson; + + /** + * 发票类型(1-电子普票,2-电子专票) + */ + private Integer invoiceType; + + /** + * 发票内容 + */ + private String invoiceContent; + + /** + * 开票金额 + */ + private BigDecimal invoiceAmount; + + /** + * 关联订单号(多个逗号分隔) + */ + private String orderIds; + + /** + * 关联订单编号(多个逗号分隔) + */ + private String orderNos; + + /** + * 接收邮箱 + */ + private String email; + + /** + * 开票状态(1-待开票,2-开票中,3-已开票,4-开票失败,5-已取消) + */ + private Integer status; + + /** + * 电子发票下载地址 + */ + private String invoiceUrl; + + /** + * 失败原因 + */ + private String failReason; + + /** + * 开票时间 + */ + private Date invoiceTime; + + /** + * 删除标志(1代表存在 2代表删除) + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceTitle.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceTitle.java new file mode 100644 index 0000000..8f62b61 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzInvoiceTitle.java @@ -0,0 +1,92 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 发票抬头信息对象 tz_invoice_title + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_invoice_title") +public class TzInvoiceTitle extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 用户id + */ + private Long userId; + + /** + * 抬头类型(1-个人,2-企业) + */ + private Integer type; + + /** + * 发票抬头名称 + */ + private String titleName; + + /** + * 税号 + */ + private String taxNumber; + + /** + * 单位地址 + */ + private String companyAddress; + + /** + * 单位电话 + */ + private String companyPhone; + + /** + * 开户银行 + */ + private String bankName; + + /** + * 银行账号 + */ + private String bankAccount; + + /** + * 是否默认(1-是,2-否) + */ + private Integer isDefault; + + /** + * 接收邮箱 + */ + private String email; + + /** + * 删除标志(1代表存在 2代表删除) + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzMessage.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzMessage.java new file mode 100644 index 0000000..5977756 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzMessage.java @@ -0,0 +1,62 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 消息对象 tz_message + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_message") +public class TzMessage extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 姓名 + */ + private String userName; + + /** + * 邮箱 + */ + private String email; + + /** + * 联系方式 + */ + private String contact; + + /** + * 留言内容 + */ + private String content; + + /** + * 留言回复 + */ + private String reply; + + /** + * 状态:0:未审核 1审核通过 + */ + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzNotice.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzNotice.java new file mode 100644 index 0000000..98074fe --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzNotice.java @@ -0,0 +1,57 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 公告对象 tz_notice + * + * @author Maosw + * @date 2025-01-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_notice") +public class TzNotice extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 公告id + */ + @TableId(value = "id") + private Long id; + + /** + * 公告标题 + */ + private String title; + + /** + * 公告内容 + */ + private String content; + + /** + * 状态(0:未发布,1:已发布) + */ + private Integer status; + + /** + * 是否置顶(0:未置顶,1:已置顶) + */ + private Integer isTop; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrder.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrder.java new file mode 100644 index 0000000..6d80d29 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrder.java @@ -0,0 +1,269 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单对象 tz_order + * + * @author Maosw + * @date 2024-08-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order") +public class TzOrder extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @TableId(value = "order_id") + private Long orderId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 订单汇总ID + */ + private Long allId; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 产品编码 + */ + private String prodCode; + + /** + * 产品名称 + */ + private String prodName; + + /** + * skuID + */ + private Long skuId; + + /** + * SKU编码 + */ + private String skuCode; + + /** + * sku厂家编码 + */ + private String skuFactoryCode; + + /** + * SKU名称 + */ + private String skuName; + + /** + * sku图片路径 + */ + private String pic; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + *付款金额 + */ + private BigDecimal payPrice; + + /** + * 尾款金额 + */ + private BigDecimal endPrice; + + /** + * 成本付款金额 + */ + private BigDecimal actualPayPrice; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + private Integer payState; + + /** + * 成本支付状态 1:待打款 2未付清 3:已付清 + */ + private Integer actualPayState; + + /** + * 支付方式 0 手动代付 1 微信支付 2 支付宝 + */ + private Integer payType; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已完成 6:已关闭 7:订单关闭 + */ + private Integer status; + + /** + * 配送ID + */ + private String dvyId; + + /** + * 重量或体积 + */ + private String dvyType; + + /** + * 运费金额 + */ + private BigDecimal dvyPrice; + + /** + * 物流单号 + */ + private String dvyFlowId; + + /** + * 订单运费 + */ + private BigDecimal freightAmount; + + /** + * 发货地 + */ + private String deliveryLocat; + + /** + * 收货人姓名 + */ + private String userName; + + /** + * 收货人电话 + */ + private String userPhone; + + /** + * 收货地址 + */ + private String userAddress; + + /** + * 订单商品总数 + */ + private Integer productNums; + + /** + * 付款时间 + */ + private Date payTime; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 是否已经打款给厂家 0:待录入 1:未打款 2:已打款 + */ + private Integer isPayed; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + private Integer refundSts; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 拒绝原因 + */ + private String reason; + + /** + * 优惠总额 + */ + private BigDecimal reduceAmount; + + /** + * 订单类型 + */ + private Integer orderType; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + private Integer deleteStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderAll.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderAll.java new file mode 100644 index 0000000..073da5c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderAll.java @@ -0,0 +1,144 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单汇总对象 tz_order_all + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order_all") +public class TzOrderAll extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String cName; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + private BigDecimal payPrice; + + /** + * 尾款金额 + */ + private BigDecimal endPrice; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + private Integer payState; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:交易中 3:交易成功 4:订单关闭 + */ + private Integer status; + + /** + * 收货人姓名 + */ + private String userName; + + /** + * 收货人电话 + */ + private String userPhone; + + /** + * 收货地址 + */ + private String userAddress; + + /** + * 订单商品总数 + */ + private Integer productNums; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + private Integer refundSts; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + private Integer deleteStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderItem.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderItem.java new file mode 100644 index 0000000..ac2f16d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderItem.java @@ -0,0 +1,109 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 订单项对象 tz_order_item + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order_item") +public class TzOrderItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单项ID + */ + @TableId(value = "order_item_id") + private Long orderItemId; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 订单order_number + */ + private String orderNumber; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 产品SkuID + */ + private Long skuId; + + /** + * 购物车产品个数 + */ + private Long prodCount; + + /** + * 产品名称 + */ + private String prodName; + + /** + * sku名称 + */ + private String skuName; + + /** + * 产品主图片路径 + */ + private String pic; + + /** + * 产品价格 + */ + private BigDecimal price; + + /** + * 用户Id + */ + private String userId; + + /** + * 商品总金额 + */ + private BigDecimal productTotalAmount; + + /** + * 购物时间 + */ + private Date recTime; + + /** + * 评论状态: 0 未评价 1 已评价 + */ + private Integer commSts; + + /** + * 推广员使用的推销卡号 + */ + private String distributionCardNo; + + /** + * 加入购物车时间 + */ + private Date basketDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderReceive.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderReceive.java new file mode 100644 index 0000000..20eddae --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderReceive.java @@ -0,0 +1,96 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单汇款对象 tz_order_receive + * + * @author Maosw + * @date 2024-09-03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_order_receive") +public class TzOrderReceive { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 客户ID + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long cId; + + /** + * 客服ID + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long userId; + + /** + * 财务ID + */ + private Long cwId; + + /** + * 汇款金额 + */ + private BigDecimal total; + + /** + * 状态 1:待领款 2:已领款 + */ + private Integer status; + + /** + * 描述 + */ + private String depict; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 收款信息 + */ + private String receiveInfo; + + /** + * 1:汇款 + */ + private Integer type; + + /** + * 删除标志 0:正常 1:删除 + */ + private Integer delFlag; + + /** + * 认领时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date adoptTime; + + /** + * 创建时间 + */ + private Date createTime; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRecord.java new file mode 100644 index 0000000..49ec0a2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRecord.java @@ -0,0 +1,80 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 订单历史记录对象 tz_order_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_order_record") +public class TzOrderRecord { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 订单汇总ID + */ + private Long allId; + + /** + * 订单ID + */ + private String orderId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 操作类型 + */ + private String type; + + /** + * 操作内容 + */ + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + private Long state; + + /** + * 修改前json + */ + private String oldJson; + + /** + * 修改后json + */ + private String newJson; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRefund.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRefund.java new file mode 100644 index 0000000..8c96707 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderRefund.java @@ -0,0 +1,168 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 订单资金对象 tz_order_refund + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order_refund") +public class TzOrderRefund extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @TableId(value = "refund_id") + private Long refundId; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 订单流水号 + */ + private String orderNumber; + + /** + * 订单总金额 + */ + private Long orderAmount; + + /** + * 订单项ID 全部退款是0 + */ + private Long orderItemId; + + /** + * 退款编号 + */ + private String refundSn; + + /** + * 订单支付流水号 + */ + private String flowTradeNo; + + /** + * 第三方退款单号(微信退款单号) + */ + private String outRefundNo; + + /** + * 订单支付方式 1 微信支付 2 支付宝 + */ + private Long payType; + + /** + * 订单支付名称 + */ + private String payTypeName; + + /** + * 买家ID + */ + private String userId; + + /** + * 退货数量 + */ + private Long goodsNum; + + /** + * 退款金额 + */ + private Long refundAmount; + + /** + * 申请类型:1,仅退款,2退款退货 + */ + private Long applyType; + + /** + * 处理状态:1为待审核,2为同意,3为不同意 + */ + private Long refundSts; + + /** + * 处理退款状态: 0:退款处理中 1:退款成功 -1:退款失败 + */ + private Long returnMoneySts; + + /** + * 申请时间 + */ + private Date applyTime; + + /** + * 卖家处理时间 + */ + private Date handelTime; + + /** + * 退款时间 + */ + private Date refundTime; + + /** + * 文件凭证json + */ + private String photoFiles; + + /** + * 申请原因 + */ + private String buyerMsg; + + /** + * 卖家备注 + */ + private String sellerMsg; + + /** + * 物流公司名称 + */ + private String expressName; + + /** + * 物流单号 + */ + private String expressNo; + + /** + * 发货时间 + */ + private Date shipTime; + + /** + * 收货时间 + */ + private Date receiveTime; + + /** + * 收货备注 + */ + private String receiveMessage; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderSettlement.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderSettlement.java new file mode 100644 index 0000000..8e64424 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderSettlement.java @@ -0,0 +1,90 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_order_settlement + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order_settlement") +public class TzOrderSettlement extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 支付结算单据ID + */ + @TableId(value = "settlement_id") + private Long settlementId; + + /** + * 支付单号 + */ + private String payNo; + + /** + * 外部订单流水号 + */ + private String bizPayNo; + + /** + * order表中的订单号 + */ + private String orderNumber; + + /** + * 支付方式 1 微信支付 2 支付宝 + */ + private Integer payType; + + /** + * 支付方式名称 + */ + private String payTypeName; + + /** + * 支付金额 + */ + private BigDecimal payAmount; + + /** + * 是否清算 0:否 1:是 + */ + private Integer isClearing; + + /** + * 用户ID + */ + private String userId; + + /** + * 清算时间 + */ + private Date clearingTime; + + /** + * 版本号 + */ + @Version + private Long version; + + /** + * 支付状态 + */ + private Integer payStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderShare.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderShare.java new file mode 100644 index 0000000..664fe80 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzOrderShare.java @@ -0,0 +1,53 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 订单分享对象 tz_order_share + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_order_share") +public class TzOrderShare extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 采购ID + */ + private Long userId; + + /** + * 订单内容 + */ + private String content; + + /** + * 备注 + */ + private String remark; + + /** + * 过期时间 + */ + private Date expireTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPickAddr.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPickAddr.java new file mode 100644 index 0000000..16babee --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPickAddr.java @@ -0,0 +1,81 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户配送地址对象 tz_pick_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_pick_addr") +public class TzPickAddr extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "addr_id") + private Long addrId; + + /** + * 自提点名称 + */ + private String addrName; + + /** + * 地址 + */ + private String addr; + + /** + * 手机 + */ + private String mobile; + + /** + * 省份ID + */ + private Long provinceId; + + /** + * 省份 + */ + private String province; + + /** + * 城市ID + */ + private Long cityId; + + /** + * 城市 + */ + private String city; + + /** + * 区/县ID + */ + private Long areaId; + + /** + * 区/县 + */ + private String area; + + /** + * 店铺id + */ + private Long shopId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPictureAlbum.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPictureAlbum.java new file mode 100644 index 0000000..9263751 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzPictureAlbum.java @@ -0,0 +1,67 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 画册对象 tz_picture_album + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_picture_album") +public class TzPictureAlbum extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 分类字典值 + */ + private String type; + + /** + * 标题 + */ + private String title; + + /** + * 封面图片 + */ + private String icon; + + /** + * 文件地址 + */ + private String url; + + /** + * 状态(1正常 0关闭) + */ + private Long status; + + /** + * 排序 + */ + private Long sort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java new file mode 100644 index 0000000..a96a0ca --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProd.java @@ -0,0 +1,215 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 产品对象 tz_prod + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_prod") +public class TzProd extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 产品ID + */ + @TableId(value = "prod_id") + private Long prodId; + + /** + * 品牌ID + */ + private Long brandId; + + /** + * 商品厂家编号 + */ + private String prodFactoryCode; + + /** + * 商品编号 + */ + private String prodCode; + + /** + * 商品名称 + */ + private String prodName; + + /** + * 商品指导价 + */ + private BigDecimal guidingPrice; + + /** + * 商品展示价 + */ + private BigDecimal price; + + /** + * 商品成本价 + */ + private BigDecimal oriPrice; + + /** + * 单位 + */ + private String unit; + + /** + * 简要描述,卖点等 + */ + private String brief; + + /** + * 详细描述 + */ + private String content; + + /** + * 工厂展示 + */ + private String factory; + + /** + * 售后保障 + */ + private String afterSales; + + /** + * 场景展示 + */ + private String cjzs; + + /** + * 工艺流程展示 + */ + private String gylczs; + + /** + * 商品主图 + */ + private String pic; + + /** + * 商品图片,以,分割 + */ + private String imgs; + + /** + * 视频地址 + */ + private String video; + + /** + * 默认是1,表示正常状态, -1表示删除, 0下架 + */ + private Long status; + + /** + * 商品分类 + */ + private Long categoryId; + + /** + * 商品参数json + */ + private String prodParame; + + /** + * 产地 + */ + private String factoryAddress; + + /** + * 销量 + */ + private Long soldNum; + + /** + * 总库存 + */ + private Long totalStocks; + + /** + * 配送方式json见TransportModeVO + */ + private String deliveryMode; + + /** + * 上架时间 + */ + private Date putawayTime; + + /** + * 版本 乐观锁 + */ + @Version + private Long version; + + /** + * 浏览量 + */ + private Long browseNum; + + /** + * 收藏量 + */ + private Long collectNum; + + /** + * 规格JSON + */ + private String prodProp; + + /** + * 装箱率 + */ + private Long packingRate; + + /** + * 是否特价 1:是 2:否 + */ + private Long isFloor; + + /** + * 配送方式 1:物流点自提 2:配送上门 + */ + private Long isDvy; + + /** + * 发货天数 + */ + private Long dvyDay; + + /** + * 审核状态 1:待审核 2:已通过 3:已拒绝 + */ + private Long examineFlag; + + /** + * 标签 0:默认 1:性价比 2:品质款 3:旗舰款 + */ + private Integer label; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdBrowse.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdBrowse.java new file mode 100644 index 0000000..b0ad688 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdBrowse.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 商品浏览对象 tz_prod_browse + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_browse") +public class TzProdBrowse { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 用户ID + */ + private Long userId; + + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdComm.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdComm.java new file mode 100644 index 0000000..970d158 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdComm.java @@ -0,0 +1,87 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 商品评论对象 tz_prod_comm + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_prod_comm") +public class TzProdComm extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 订单 ID + */ + private Long orderId; + + /** + * 订单项ID + */ + private Long orderItemId; + + /** + * 评论用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 评论内容 + */ + private String content; + + /** + * 得分,0-5分 + */ + private Long score; + + /** + * 晒图的json字符串 + */ + private String pics; + + /** + * 是否匿名(1:是 0:否) + */ + private Long isAnonymous; + + /** + * 是否显示,1:为显示,0:待审核, -1:不通过审核,不显示。 如果需要审核评论,则是0,,否则1 + */ + private Long status; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Long delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdFavorite.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdFavorite.java new file mode 100644 index 0000000..ca62150 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdFavorite.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 商品收藏对象 tz_prod_favorite + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_favorite") +public class TzProdFavorite { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "favorite_id") + private Long favoriteId; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 收藏时间 + */ + private Date recTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdProp.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdProp.java new file mode 100644 index 0000000..10affdf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdProp.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 商品规格对象 tz_prod_prop + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_prop") +public class TzProdProp { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 属性id + */ + @TableId(value = "prop_id") + private Long propId; + + /** + * 属性名称 + */ + private String propName; + + /** + * ProdPropRule 1:销售属性(规格); 2:参数属性; + */ + private Long rule; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 租户编号 + */ + private String tenantId; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdPropValue.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdPropValue.java new file mode 100644 index 0000000..b826634 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdPropValue.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 商品规格子规格对象 tz_prod_prop_value + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_prop_value") +public class TzProdPropValue { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 属性值ID + */ + @TableId(value = "value_id") + private Long valueId; + + /** + * 属性值名称 + */ + private String propValue; + + /** + * 属性ID + */ + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRecord.java new file mode 100644 index 0000000..7aca391 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRecord.java @@ -0,0 +1,85 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 产品价格记录对象 tz_prod_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_record") +public class TzProdRecord { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 单品ID + */ + private Long skuId; + + /** + * 修改人ID + */ + private Long userId; + + /** + * 修改人姓名 + */ + private String userName; + + /** + * 修改人类型1:商家 2:采购员 + */ + private Integer type; + + /** + * 修改前价格 + */ + private BigDecimal oldPrice; + + /** + * 修改后价格 + */ + private BigDecimal newPrice; + + /** + * 操作内容 + */ + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + private Integer state; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRelation.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRelation.java new file mode 100644 index 0000000..a33587b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdRelation.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 商品推荐关联对象 tz_prod_relation + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_prod_relation") +public class TzProdRelation { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 关联商品ID + */ + private Long glProdId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTag.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTag.java new file mode 100644 index 0000000..23255c7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTag.java @@ -0,0 +1,73 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 商品分组对象 tz_prod_tag + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_prod_tag") +public class TzProdTag extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 分组标签id + */ + @TableId(value = "id") + private Long id; + + /** + * 分组标题 + */ + private String title; + + /** + * 店铺Id + */ + private Long shopId; + + /** + * 状态(1为正常,0为删除) + */ + private Integer status; + + /** + * 默认类型(0:商家自定义,1:系统默认) + */ + private Integer isDefault; + + /** + * 商品数量 + */ + private Long prodCount; + + /** + * 列表样式(0:一列一个,1:一列两个,2:一列三个) + */ + private Integer style; + + /** + * 排序 + */ + private Integer seq; + + /** + * 删除时间 + */ + private Date deleteTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTagReference.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTagReference.java new file mode 100644 index 0000000..f46cbf9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdTagReference.java @@ -0,0 +1,51 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_prod_tag_reference + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_prod_tag_reference") +public class TzProdTagReference extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 分组引用id + */ + @TableId(value = "reference_id") + private Long referenceId; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 标签id + */ + private Long tagId; + + /** + * 商品id + */ + private Long prodId; + + /** + * 状态(1:正常,0:删除) + */ + private Integer status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdWishlist.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdWishlist.java new file mode 100644 index 0000000..1713dfd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzProdWishlist.java @@ -0,0 +1,71 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 心愿单对象 tz_prod_wishlist + * + * @author Lion Li + * @date 2024-01-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_prod_wishlist") +public class TzProdWishlist extends BaseEntity { + + /** + * 心愿单记录ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 用户姓名 + */ + private String userName; + + /** + * 用户号码 + */ + private String userPhone; + + /** + * 产品名称 + */ + private String prodName; + + /** + * 产品图片 + */ + private String prodPic; + + /** + * 产品描述 + */ + private String prodDescription; + + /** + * 产品类别 + */ + private String category; + + /** + * 状态: 1-已提交, 2-已采纳, 3-已上货, 4-未找到货源 + */ + private Integer status; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzShopDetail.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzShopDetail.java new file mode 100644 index 0000000..1e27e27 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzShopDetail.java @@ -0,0 +1,152 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_shop_detail + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_shop_detail") +public class TzShopDetail extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 店铺id + */ + @TableId(value = "shop_id") + private Long shopId; + + /** + * 店铺名称(数字、中文,英文(可混合,不可有特殊字符),可修改)、不唯一 + */ + private String shopName; + + /** + * 店长用户id + */ + private String userId; + + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * 店铺简介(可修改) + */ + private String intro; + + /** + * 店铺公告(可修改) + */ + private String shopNotice; + + /** + * 店铺行业(餐饮、生鲜果蔬、鲜花等) + */ + private Integer shopIndustry; + + /** + * 店长 + */ + private String shopOwner; + + /** + * 店铺绑定的手机(登录账号:唯一) + */ + private String mobile; + + /** + * 店铺联系电话 + */ + private String tel; + + /** + * 店铺所在纬度(可修改) + */ + private String shopLat; + + /** + * 店铺所在经度(可修改) + */ + private String shopLng; + + /** + * 店铺详细地址 + */ + private String shopAddress; + + /** + * 店铺所在省份(描述) + */ + private String province; + + /** + * 店铺所在城市(描述) + */ + private String city; + + /** + * 店铺所在区域(描述) + */ + private String area; + + /** + * 店铺省市区代码,用于回显 + */ + private String pcaCode; + + /** + * 店铺logo(可修改) + */ + private String shopLogo; + + /** + * 店铺相册 + */ + private String shopPhotos; + + /** + * 每天营业时间段(可修改) + */ + private String openTime; + + /** + * 店铺状态(-1:未开通 0: 停业中 1:营业中),可修改 + */ + private Integer shopStatus; + + /** + * 0:商家承担运费; 1:买家承担运费 + */ + private Integer transportType; + + /** + * 固定运费 + */ + private BigDecimal fixedFreight; + + /** + * 满X包邮 + */ + private BigDecimal fullFreeShipping; + + /** + * 分销开关(0:开启 1:关闭) + */ + private Integer isDistribution; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSku.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSku.java new file mode 100644 index 0000000..d97a82f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSku.java @@ -0,0 +1,136 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 单品SKU对象 tz_sku + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_sku") +public class TzSku extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 单品ID + */ + @TableId(value = "sku_id") + private Long skuId; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 销售属性组合字符串 + */ + private String properties; + + /** + * 指导价 + */ + private BigDecimal guidingPrice; + + /** + * 商品成本价 + */ + private BigDecimal oriPrice; + + /** + * 商品展示价 + */ + private BigDecimal price; + + /** + * 商品在付款减库存的状态下,该sku上未付款的订单数量 + */ + private Long stocks; + + /** + * 实际库存 + */ + private Long actualStocks; + + /** + * 记录时间 + */ + private Date recTime; + + /** + * 商家编码 + */ + private String partyCode; + + /** + * 商品条形码 + */ + private String modelId; + + /** + * sku图片 + */ + private String pic; + + /** + * sku编号 + */ + private String skuCode; + + /** + * sku名称 + */ + private String skuName; + + /** + * sku厂家编号 + */ + private String skuFactoryCode; + + /** + * 商品名称 + */ + private String prodName; + + /** + * 版本号 + */ + @Version + private Long version; + + /** + * 商品重量 + */ + private Long weight; + + /** + * 商品体积 + */ + private Long volume; + + /** + * 0 禁用 1 启用 + */ + private Long status; + + /** + * 0 正常 1 已被删除 + */ + private Long isDelete; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSmsLog.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSmsLog.java new file mode 100644 index 0000000..1315e39 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzSmsLog.java @@ -0,0 +1,73 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 短信记录对象 tz_sms_log + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_sms_log") +public class TzSmsLog extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户id + */ + private String userId; + + /** + * 手机号码 + */ + private String userPhone; + + /** + * 短信内容 + */ + private String content; + + /** + * 手机验证码 + */ + private String mobileCode; + + /** + * 短信类型 1:注册 2:验证 + */ + private Long type; + + /** + * 发送时间 + */ + private Date recDate; + + /** + * 发送短信返回码 + */ + private String responseCode; + + /** + * 状态 1:有效 0:失效 + */ + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTenantRecord.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTenantRecord.java new file mode 100644 index 0000000..26f24cc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTenantRecord.java @@ -0,0 +1,78 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * 租户资金记录对象 tz_tenant_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_tenant_record") +public class TzTenantRecord extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @TableId(value = "id") + private Long id; + + /** + * 租户名称 + */ + private String tenantName; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 子订单项ID + */ + private Long orderItemId; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 金额类型: 1-可用余额, 2-冻结余额 + */ + private Integer amountType; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscity.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscity.java new file mode 100644 index 0000000..6a903be --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscity.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_transcity + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_transcity") +public class TzTranscity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "transcity_id") + private Long transcityId; + + /** + * 运费项id + */ + private Long transfeeId; + + /** + * 城市id + */ + private Long cityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscityFree.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscityFree.java new file mode 100644 index 0000000..6ec3a7a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTranscityFree.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_transcity_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_transcity_free") +public class TzTranscityFree extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 指定条件包邮城市项id + */ + @TableId(value = "transcity_free_id") + private Long transcityFreeId; + + /** + * 指定条件包邮项id + */ + private Long transfeeFreeId; + + /** + * 城市id + */ + private Long freeCityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfee.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfee.java new file mode 100644 index 0000000..252667b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfee.java @@ -0,0 +1,57 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_transfee + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_transfee") +public class TzTransfee extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 运费项id + */ + @TableId(value = "transfee_id") + private Long transfeeId; + + /** + * 运费模板id + */ + private Long transportId; + + /** + * 续件数量 + */ + private BigDecimal continuousPiece; + + /** + * 首件数量 + */ + private BigDecimal firstPiece; + + /** + * 续件费用 + */ + private BigDecimal continuousFee; + + /** + * 首件费用 + */ + private BigDecimal firstFee; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfeeFree.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfeeFree.java new file mode 100644 index 0000000..c8d833d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransfeeFree.java @@ -0,0 +1,52 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.math.BigDecimal; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_transfee_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_transfee_free") +public class TzTransfeeFree extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 指定条件包邮项id + */ + @TableId(value = "transfee_free_id") + private Long transfeeFreeId; + + /** + * 运费模板id + */ + private Long transportId; + + /** + * 包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮) + */ + private Integer freeType; + + /** + * 需满金额 + */ + private BigDecimal amount; + + /** + * 包邮x件/重量/体积 + */ + private BigDecimal piece; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransport.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransport.java new file mode 100644 index 0000000..f3e9ed4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzTransport.java @@ -0,0 +1,56 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_transport + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_transport") +public class TzTransport extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 运费模板id + */ + @TableId(value = "transport_id") + private Long transportId; + + /** + * 运费模板名称 + */ + private String transName; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 收费方式(0 按件数,1 按重量 2 按体积) + */ + private Integer chargeType; + + /** + * 是否包邮 0:不包邮 1:包邮 + */ + private Integer isFreeFee; + + /** + * 是否含有包邮条件 0 否 1是 + */ + private Integer hasFreeCondition; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUser.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUser.java new file mode 100644 index 0000000..608a57e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUser.java @@ -0,0 +1,201 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 用户对象 tz_user + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_user") +public class TzUser { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "user_id") + private Long userId; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 用户邮箱 + */ + private String userMail; + + /** + * 登录密码 + */ + private String loginPassword; + + /** + * 支付密码 + */ + private String payPassword; + + /** + * 手机号码 + */ + private String userMobile; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 身份证正面 + */ + private String frontCard; + + /** + * 身份证反面 + */ + private String reverseCard; + + /** + * 余额 + */ + private BigDecimal balance; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 修改时间 + */ + private Date modifyTime; + + /** + * 注册时间 + */ + private Date userRegtime; + + /** + * 注册IP + */ + private String userRegip; + + /** + * 最后登录时间 + */ + private Date userLasttime; + + /** + * 最后登录IP + */ + private String userLastip; + + /** + * 备注 + */ + private String userMemo; + + /** + * M(男) or F(女) + */ + private String sex; + + /** + * 例如:2009-11-27 + */ + private String birthDate; + + /** + * 头像图片路径 + */ + private String pic; + + /** + * 状态 1 正常 0 无效 + */ + private Integer status; + + /** + * 用户积分 + */ + private Long score; + + /** + * 微信openId + */ + private String openId; + + /** + * 是否设计师 1:是 0:否 + */ + private Integer isDesigner; + + /** + * 设计师认证信息 + */ + private String sjsJson; + + /** + * 设计师审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer sjsFlag; + + /** + * 实名审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer examineFlag; + + /** + * 价格开关是否打开 1:打开 0:关闭 + */ + private Integer priceFlag; + + /** + * 是否是会员 1:是 0:否 + */ + private Integer isMember; + + /** + * 会员有效期结束 + */ + private Date validTo; + + /** + * 调价比例 + */ + private String ratio; + + /** + * 拉卡拉用户ID + */ + private String custId; + + /** + * 证件起止日期 + */ + private String certExpirationDate; + + /** + * 创建时间 + */ + private Date createTime; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddr.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddr.java new file mode 100644 index 0000000..1956b98 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddr.java @@ -0,0 +1,102 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户配送地址对象 tz_user_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_user_addr") +public class TzUserAddr extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "addr_id") + private Long addrId; + + /** + * 用户ID + */ + private String userId; + + /** + * 收货人 + */ + private String receiver; + + /** + * 省ID + */ + private Long provinceId; + + /** + * 省 + */ + private String province; + + /** + * 城市 + */ + private String city; + + /** + * 城市ID + */ + private Long cityId; + + /** + * 区 + */ + private String area; + + /** + * 区ID + */ + private Long areaId; + + /** + * 邮编 + */ + private String postCode; + + /** + * 地址 + */ + private String addr; + + /** + * 手机 + */ + private String mobile; + + /** + * 状态,1正常,0无效 + */ + private Integer status; + + /** + * 是否默认地址 1是 + */ + private Integer commonAddr; + + /** + * 版本号 + */ + @Version + private Integer version; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddrOrder.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddrOrder.java new file mode 100644 index 0000000..84078e6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddrOrder.java @@ -0,0 +1,97 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 用户订单配送地址对象 tz_user_addr_order + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_user_addr_order") +public class TzUserAddrOrder extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "addr_order_id") + private Long addrOrderId; + + /** + * 地址ID + */ + private Long addrId; + + /** + * 用户ID + */ + private String userId; + + /** + * 收货人 + */ + private String receiver; + + /** + * 省ID + */ + private Long provinceId; + + /** + * 省 + */ + private String province; + + /** + * 区域ID + */ + private Long areaId; + + /** + * 区 + */ + private String area; + + /** + * 城市ID + */ + private Long cityId; + + /** + * 城市 + */ + private String city; + + /** + * 地址 + */ + private String addr; + + /** + * 邮编 + */ + private String postCode; + + /** + * 手机 + */ + private String mobile; + + /** + * 版本号 + */ + @Version + private Integer version; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddress.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddress.java new file mode 100644 index 0000000..63b5365 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserAddress.java @@ -0,0 +1,62 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 客户地址对象 tz_user_address + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("tz_user_address") +public class TzUserAddress { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 客户ID + */ + private Long userId; + + /** + * 收货人姓名 + */ + private String userName; + + /** + * 收货人电话 + */ + private String userPhone; + + /** + * 收货地址 + */ + private String userAddress; + + /** + * 是否默认 1:默认 2:非默认 + */ + private Integer isDefault; + + /** + * 创建时间 + */ + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserCollection.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserCollection.java new file mode 100644 index 0000000..ff3dab3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserCollection.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 【请填写功能名称】对象 tz_user_collection + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_user_collection") +public class TzUserCollection extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 收藏表 + */ + @TableId(value = "id") + private Long id; + + /** + * 商品id + */ + private Long prodId; + + /** + * 用户id + */ + private String userId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserSearch.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserSearch.java new file mode 100644 index 0000000..b233497 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzUserSearch.java @@ -0,0 +1,53 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 用户搜索对象 tz_user_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_user_search") +public class TzUserSearch extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 搜索标题 + */ + private String title; + + /** + * 搜索次数 + */ + private Long num; + + /** + * 录入时间 + */ + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzWithdrawRequest.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzWithdrawRequest.java new file mode 100644 index 0000000..e9f9fe2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/TzWithdrawRequest.java @@ -0,0 +1,162 @@ +package org.dromara.mall.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 提现申请对象 tz_withdraw_request + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_withdraw_request") +public class TzWithdrawRequest extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 提现申请ID + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + private Long userId; + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + private Integer roleType; + + /** + * 提现金额 + */ + private BigDecimal withdrawAmount; + + /** + * 提现前余额 + */ + private BigDecimal currentBalance; + + /** + * 提现状态: 1-待审核, 2-审核通过, 3-打款成功, 4-打款失败,5-审核拒绝 + */ + private Integer withdrawStatus; + + /** + * 支付方式(如银行卡/支付宝/微信) + */ + private String paymentMethod; + + /** + * 持卡人姓名 + */ + private String cardHolderName; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 银行卡号 + */ + private String cardNumber; + + /** + * 审核时间 + */ + private Date approveTime; + + /** + * 审核备注 + */ + private String remark; + + /** + * 审核人 + */ + private String approveBy; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 个税税率 + */ + private BigDecimal taxRate; + + /** + * 个税税金 + */ + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + private BigDecimal sxfTaxAmount; + + /** + * 税后金额 + */ + private BigDecimal afterTaxAmount; + + /** + * 分账系统生成唯一流水 + */ + private String separateNo; + + /** + * 商户外部订单号 + */ + private String outSeparateNo; + + /** + * 分账接收方 + */ + private String receiverNo; + + /** + * 开票类型 1-开票,2-不开票 + */ + private Integer invoiceType; + + /** + * 发票链接 + */ + private String invoiceUrl; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/BasketBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/BasketBo.java new file mode 100644 index 0000000..d19a66c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/BasketBo.java @@ -0,0 +1,41 @@ +package org.dromara.mall.domain.bo; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class BasketBo { + + /** + * 购物车商品列表 + */ + private List basketBoList; + + /** + * 收货人姓名 + */ + private String clientName; + + /** + * 收货人电话 + */ + private String clientPhone; + + /** + * 收货地址 + */ + private String clientAddress; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyBasketBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyBasketBo.java new file mode 100644 index 0000000..0779ec0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyBasketBo.java @@ -0,0 +1,77 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyBasket; + +import java.math.BigDecimal; + +/** + * 购物车业务对象 hy_basket + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyBasket.class, reverseConvertGenerate = false) +public class HyBasketBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 产品ID + */ + @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * SkuID + */ + @NotNull(message = "SkuID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long skuId; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 产品个数 + */ + @NotNull(message = "产品个数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long num; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCodeOrderBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCodeOrderBo.java new file mode 100644 index 0000000..896a0d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCodeOrderBo.java @@ -0,0 +1,119 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyCodeOrder; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 会员码订单业务对象 hy_code_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyCodeOrder.class, reverseConvertGenerate = false) +public class HyCodeOrderBo extends BaseEntity { + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 设计师ID + */ + @NotNull(message = "设计师ID不能为空", groups = { EditGroup.class }) + private Long userId; + + /** + * 邀请人ID + */ + private Long inviteUserId; + + /** + * 购买商户ID + */ + private Long merchantId; + + /** + * 推广员ID + */ + private Long promoterId; + + /** + * 购买数量 + */ + @NotNull(message = "购买数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long num; + + /** + * 单价 + */ + @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal price; + + /** + * 订单金额 + */ + private BigDecimal orderAmount; + + /** + * 订单状态: 1-待支付, 2-已支付, 3-已取消 + */ + private Integer orderStatus; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + private Integer type; + + /** + * 支付时间 + */ + private Date paymentTime; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 拉卡拉平台订单号 + */ + private String payOrderNo; + + /** + * 推广员手机号 + */ + private String tgyPhone; + + /** + * 设计师手机号 + */ + private String sjsPhone; + + /** + * 邀请人手机号 + */ + private String yqrPhone; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCouponRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCouponRecordBo.java new file mode 100644 index 0000000..f02143a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyCouponRecordBo.java @@ -0,0 +1,67 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyCouponRecord; + +import java.math.BigDecimal; + +/** + * 会员券抵金记录业务对象 + * @author admin + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyCouponRecord.class, reverseConvertGenerate = false) +public class HyCouponRecordBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 购买手机号码 + */ + private String phone; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-退回 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyMemberCodeBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyMemberCodeBo.java new file mode 100644 index 0000000..841fb68 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyMemberCodeBo.java @@ -0,0 +1,123 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyMemberCode; + +import java.util.Date; + +/** + * 会员码兑换业务对象 hy_member_code + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyMemberCode.class, reverseConvertGenerate = false) +public class HyMemberCodeBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderId; + + /** + * 设计师ID + */ + private Long userId; + + /** + * 购买商户ID + */ + private Long merchantId; + + /** + * 推广员ID + */ + private Long promoterId; + + /** + * 兑换时间 + */ + private Date redeemTime; + + /** + * 兑换码有效期开始 + */ + private Date validFrom; + + /** + * 兑换码有效期结束 + */ + private Date validTo; + + /** + * 购买价格 + */ + private Long price; + + /** + * 会员ID + */ + private Long memberId; + + /** + * 会员兑换手机号码 + */ + private String memberPhone; + + /** + * 兑换码 + */ + private String code; + + /** + * 兑换状态: 1-未兑换, 2-已兑换 + */ + private Long status; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 是否复制 1-未复制 2-已复制 + */ + private Integer isCopy; + + /** + * 推广员手机号 + */ + private String tgyPhone; + + /** + * 设计师手机号 + */ + private String sjsPhone; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderBo.java new file mode 100644 index 0000000..eb42ba8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderBo.java @@ -0,0 +1,146 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyOrder; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 总订单业务对象 hy_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyOrder.class, reverseConvertGenerate = false) +public class HyOrderBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户号码 + */ + private String userPhone; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订单商品总数 + */ + private Long num; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + private Long payState; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + private Long status; + + /** + * 收货人姓名 + */ + private String clientName; + + /** + * 收货人电话 + */ + private String clientPhone; + + /** + * 收货地址 + */ + private String clientAddress; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + private Long refundSts; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + private Long closeType; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderItemBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderItemBo.java new file mode 100644 index 0000000..9522d7f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderItemBo.java @@ -0,0 +1,229 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.mall.domain.HyOrderItem; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单详情业务对象 hy_order_item + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyOrderItem.class, reverseConvertGenerate = false) +public class HyOrderItemBo extends TenantEntity { + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 订单汇总ID + */ + private Long orderId; + + /** + * 产品ID + */ + @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 产品编码 + */ + private String prodCode; + + /** + * 产品名称 + */ + private String prodName; + + /** + * skuID + */ + @NotNull(message = "skuID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long skuId; + + /** + * sku编码 + */ + private String skuCode; + + /** + * sku厂家编码 + */ + private String skuFactoryCode; + + /** + * sku名称 + */ + private String skuName; + + /** + * sku图片路径 + */ + private String pic; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订单商品总数 + */ + private Long num; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + private Long payState; + + /** + * 支付类型 0:手动代付 1:微信支付 2:支付宝 + */ + private Long payType; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + private Long status; + + /** + * 物流单号 + */ + private String dvyFlowId; + + /** + * 订单运费 + */ + private Long dvyPrice; + + /** + * 发货地 + */ + private String deliveryLocat; + + /** + * 收货人姓名 + */ + private String clientName; + + /** + * 收货人电话 + */ + private String clientPhone; + + /** + * 收货地址 + */ + private String clientAddress; + + /** + * 付款时间 + */ + private Date payTime; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + private Long refundSts; + + /** + * 1:未评价 2:已评价 + */ + private Long appraisalFlag; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + private Long closeType; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 是否开票 1:未开票 2:已开票 + */ + private Integer isSfkp; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderPaymentBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderPaymentBo.java new file mode 100644 index 0000000..7d3b7ff --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyOrderPaymentBo.java @@ -0,0 +1,117 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.mall.domain.HyOrderPayment; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 订单打款业务对象 hy_order_payment + * + * @author Maosw + * @date 2024-12-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyOrderPayment.class, reverseConvertGenerate = false) +public class HyOrderPaymentBo extends TenantEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单ID集合 + */ +// private String orderIds; + + /** + * 订单编号集合 + */ +// private String orderNums; + + /** + * 租户名称 + */ + private String tenantName; + + /** + * 财务ID + */ + private Long cwId; + + /** + * 财务姓名 + */ + private String cwName; + + /** + * 付款金额 + */ + private BigDecimal total; + + /** + * 提现前余额 + */ + private BigDecimal currentBalance; + + /** + * 状态 1:待付款 2:已付款 3:审核拒绝 + */ + private Integer status; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 描述 + */ + private String depict; + + /** + * 收款人姓名 + */ + private String payeeName; + + /** + * 收款银行名称 + */ + private String payeeBank; + + /** + * 收款银行卡号 + */ + private String payeeBankNum; + + /** + * 打款时间 + */ + private Date payTime; + + /** + * 1:打款给厂家 2:退款给买家 + */ + private Integer type; + + /** + * 备注 + */ + private String remark; + + /** + * 发票链接 + */ + private String invoiceUrl; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterBo.java new file mode 100644 index 0000000..69d5ebc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterBo.java @@ -0,0 +1,119 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyPromoter; + +import java.math.BigDecimal; + +/** + * 推广员业务对象 hy_promoter + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyPromoter.class, reverseConvertGenerate = false) +public class HyPromoterBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 推广员名称 + */ + @NotBlank(message = "推广员名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 推广员编号 + */ + private String code; + + /** + * 联系方式 + */ + private String phone; + + /** + * 登录密码 + */ + @NotBlank(message = "登录密码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String password; + + /** + * 推广人数 + */ + @NotNull(message = "推广人数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long num; + + /** + * 标识: 1-企业, 2-个人 + */ + @NotNull(message = "标识: 1-企业, 2-个人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer typeFlag; + + /** + * 个人所属企业ID + */ + private Long parentId; + + /** + * 账户余额 + */ + @NotNull(message = "账户余额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal balance; + + /** + * 状态: 1-启用, 2-禁用 + */ + @NotNull(message = "状态: 1-启用, 2-禁用不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + /** + * 审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer examineFlag; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 身份证正面 + */ + private String frontCard; + + /** + * 身份证反面 + */ + private String reverseCard; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRecordBo.java new file mode 100644 index 0000000..1429c5a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRecordBo.java @@ -0,0 +1,69 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyPromoterRecord; + +import java.math.BigDecimal; + +/** + * 推广员资金记录业务对象 hy_promoter_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyPromoterRecord.class, reverseConvertGenerate = false) +public class HyPromoterRecordBo extends BaseEntity { + + /** + * 记录ID + */ + @NotNull(message = "记录ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 推广员ID + */ + @NotNull(message = "推广员ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long promoterId; + + /** + * 变动金额(正数增加,负数减少) + */ + @NotNull(message = "变动金额(正数增加,负数减少)不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal amount; + + /** + * 变动后余额 + */ + @NotNull(message = "变动后余额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + @NotNull(message = "变动类型: 1-增加, 2-扣除, 3-提现, 4-其他不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRegisterBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRegisterBo.java new file mode 100644 index 0000000..e3dd5b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyPromoterRegisterBo.java @@ -0,0 +1,32 @@ +package org.dromara.mall.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class HyPromoterRegisterBo { + + /** + * 推广员姓名 + */ + @NotBlank(message = "推广员姓名不能为空") + private String promoterName; + + /** + * 手机号码 + */ + @NotBlank(message = "手机号码不能为空") + private String phone; + + /** + * 密码 + */ + @NotBlank(message = "密码不能为空") + private String password; + + /** + * 身份证号 + */ + @NotBlank(message = "身份证号不能为空") + private String idCard; +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyUserRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyUserRecordBo.java new file mode 100644 index 0000000..0c491d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/HyUserRecordBo.java @@ -0,0 +1,112 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.HyUserRecord; + +import java.math.BigDecimal; + +/** + * 用户资金记录业务对象 hy_user_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = HyUserRecord.class, reverseConvertGenerate = false) +public class HyUserRecordBo extends BaseEntity { + + /** + * 记录ID + */ + @NotNull(message = "记录ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 订购用户手机号 + */ + private String userPhone; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 个税税率 + */ + private BigDecimal taxRate; + + /** + * 个税税金 + */ + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + private BigDecimal sxfTaxAmount; + + /** + * 税后金额 + */ + private BigDecimal afterTaxAmount; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/OrderPayBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/OrderPayBo.java new file mode 100644 index 0000000..81c063c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/OrderPayBo.java @@ -0,0 +1,37 @@ +package org.dromara.mall.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; + +import java.math.BigDecimal; + +/** + * 打款订单ID和金额 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class OrderPayBo { + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { AddGroup.class }) + private Long orderId; + + /** + * 成本金额 + */ + @NotNull(message = "成本金额不能为空", groups = { AddGroup.class }) + private BigDecimal payPrice; + + + /** + * 打款金额 + */ + @NotNull(message = "打款金额不能为空", groups = { AddGroup.class }) + private BigDecimal payoutsAmount; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAgreementBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAgreementBo.java new file mode 100644 index 0000000..dd5a477 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAgreementBo.java @@ -0,0 +1,54 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzAgreement; + +/** + * 协议业务对象 tz_agreement + * + * @author Maosw + * @date 2024-12-26 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzAgreement.class, reverseConvertGenerate = false) +public class TzAgreementBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 标题 + */ + private String title; + + /** + * 内容 + */ + private String content; + + /** + * code值 + */ + private String code; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAreaBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAreaBo.java new file mode 100644 index 0000000..4f6d931 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAreaBo.java @@ -0,0 +1,44 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzArea; + +/** + * 地区业务对象 tz_area + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzArea.class, reverseConvertGenerate = false) +public class TzAreaBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long areaId; + + /** + * + */ + private String areaName; + + /** + * + */ + private Long parentId; + + /** + * + */ + private Long level; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAttachFileBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAttachFileBo.java new file mode 100644 index 0000000..8bab6fb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzAttachFileBo.java @@ -0,0 +1,68 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzAttachFile; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 【请填写功能名称】业务对象 tz_attach_file + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzAttachFile.class, reverseConvertGenerate = false) +public class TzAttachFileBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long fileId; + + /** + * 文件路径 + */ + @NotBlank(message = "文件路径不能为空", groups = { AddGroup.class, EditGroup.class }) + private String filePath; + + /** + * 文件类型 + */ + @NotBlank(message = "文件类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fileType; + + /** + * 文件大小 + */ + @NotNull(message = "文件大小不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer fileSize; + + /** + * 上传时间 + */ + @NotNull(message = "上传时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date uploadTime; + + /** + * 文件关联的表主键id + */ + @NotNull(message = "文件关联的表主键id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long fileJoinId; + + /** + * 文件关联表类型:1 商品表 FileJoinType + */ + @NotNull(message = "文件关联表类型:1 商品表 FileJoinType不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer fileJoinType; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBankCardBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBankCardBo.java new file mode 100644 index 0000000..011dedf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBankCardBo.java @@ -0,0 +1,106 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzBankCard; + +/** + * 绑定银行卡信息业务对象 tz_bank_card + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzBankCard.class, reverseConvertGenerate = false) +public class TzBankCardBo extends BaseEntity { + + /** + * 银行卡信息ID + */ + @NotNull(message = "银行卡信息ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + @NotNull(message = "用户ID(租户/商户/推广员/会员)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + private Integer roleType; + + /** + * 持卡人姓名 + */ + private String cardHolderName; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 银行卡号 + */ + private String cardNumber; + + /** + * 卡类型: 1-借记卡, 2-信用卡 + */ + private Integer cardType; + + /** + * 是否默认: 1-是,2-否 + */ + private Integer isDefault; + + /** + * 状态: 1-正常, 2-停用 + */ + private Integer status; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + /** + * 拉卡拉订单编号 + */ + private String orderNo; + + /** + * 拉卡拉接收方编号 + */ + private String receiverNo; + + /** + * 拉卡拉绑定订单编号 + */ + private String bdOrderNo; + + /** + * 拉卡拉受理编号 + */ + private String applyId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBasketBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBasketBo.java new file mode 100644 index 0000000..7c5e054 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBasketBo.java @@ -0,0 +1,80 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzBasket; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 购物车业务对象 tz_basket + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzBasket.class, reverseConvertGenerate = false) +public class TzBasketBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long basketId; + + /** + * 店铺ID + */ + @NotNull(message = "店铺ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shopId; + + /** + * 产品ID + */ + @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * SkuID + */ + @NotNull(message = "SkuID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long skuId; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 购物车产品个数 + */ + @NotNull(message = "购物车产品个数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long basketCount; + + /** + * 购物时间 + */ + @NotNull(message = "购物时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date basketDate; + + /** + * 满减活动ID + */ + @NotNull(message = "满减活动ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long discountId; + + /** + * 分销推广人卡号 + */ + @NotBlank(message = "分销推广人卡号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String distributionCardNo; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBrandBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBrandBo.java new file mode 100644 index 0000000..c59db17 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzBrandBo.java @@ -0,0 +1,58 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzBrand; + +/** + * 品牌业务对象 tz_brand + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzBrand.class, reverseConvertGenerate = false) +public class TzBrandBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 品牌名称 + */ + @NotBlank(message = "品牌名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 图片路径 + */ + private String pic; + + /** + * 备注 + */ + private String remark; + + /** + * 顺序 + */ + private Long seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + @NotNull(message = "默认是1,表示正常状态,0为下线状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBo.java new file mode 100644 index 0000000..d14252f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBo.java @@ -0,0 +1,88 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzCategory; + +import java.util.Date; + +/** + * 产品类目业务对象 tz_category + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzCategory.class, reverseConvertGenerate = false) +public class TzCategoryBo extends BaseEntity { + + /** + * 类目ID + */ + @NotNull(message = "类目ID不能为空", groups = { EditGroup.class }) + private Long categoryId; + + /** + * 店铺ID + */ + private Long shopId; + + /** + * 父节点 + */ + @NotNull(message = "父节点不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long parentId; + + /** + * 产品类目名称 + */ + @NotBlank(message = "产品类目名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String categoryName; + + /** + * 类目图标 + */ + private String icon; + + /** + * 类目的显示图片 + */ + private String pic; + + /** + * 排序 + */ + @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + @NotNull(message = "默认是1,表示正常状态,0为下线状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 记录时间 + */ + @NotNull(message = "记录时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recTime; + + /** + * 分类层级 + */ + private Integer grade; + + /** + * 是否有子集 0:没有 1:有 + */ + private Integer subset; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBrandBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBrandBo.java new file mode 100644 index 0000000..609b4b3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryBrandBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzCategoryBrand; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_category_brand + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzCategoryBrand.class, reverseConvertGenerate = false) +public class TzCategoryBrandBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分类id + */ + @NotNull(message = "分类id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long categoryId; + + /** + * 品牌id + */ + @NotNull(message = "品牌id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long brandId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryPropBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryPropBo.java new file mode 100644 index 0000000..c3f4c08 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCategoryPropBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzCategoryProp; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_category_prop + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzCategoryProp.class, reverseConvertGenerate = false) +public class TzCategoryPropBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分类id + */ + @NotNull(message = "分类id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long categoryId; + + /** + * 商品属性id即表tz_prod_prop中的prop_id + */ + @NotNull(message = "商品属性id即表tz_prod_prop中的prop_id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerBo.java new file mode 100644 index 0000000..2bba6e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerBo.java @@ -0,0 +1,128 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzCustomer; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 客户业务对象 tz_customer + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzCustomer.class, reverseConvertGenerate = false) +public class TzCustomerBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 客服ID + */ + private Long userId; + + /** + * 客服编号 + */ + private String userCode; + + /** + * 客服姓名 + */ + private String userName; + + /** + * 客户编号 + */ + private String code; + + /** + * 客户姓名 + */ + @NotBlank(message = "客户姓名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 电话号码 + */ + @NotBlank(message = "电话号码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String phone; + + + /** + * 性别 0:女 1:男 + */ + private Integer sex; + + /** + * 客户类型 + */ + private Integer type; + + /** + * 状态(0正常 1禁用) + */ + private Integer state; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + + /** + * 退款金额 + */ + private BigDecimal refundPrice; + + + /** + *退款人姓名 + */ + private String payeeName; + + /** + *退款人收款银行名称 + */ + private String payeeBank; + + /** + *退款人收款银行卡号 + */ + private String payeeBankNum; + + /** + * 退款描述 + */ + private String depict; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerRecordBo.java new file mode 100644 index 0000000..12cf051 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzCustomerRecordBo.java @@ -0,0 +1,84 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzCustomerRecord; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 客户资金记录业务对象 tz_customer_record + * + * @author Maosw + * @date 2024-09-12 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzCustomerRecord.class, reverseConvertGenerate = false) +public class TzCustomerRecordBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 客户ID + */ + @NotNull(message = "客户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 客户姓名 + */ + @NotBlank(message = "客户姓名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userName; + + /** + * 账变类型1:充值 2:支出 3:退款 + */ + @NotNull(message = "账变类型1:充值 2:支出 3:退款不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer type; + + /** + * 变动金额 + */ + private BigDecimal price; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 描述 + */ + private String depict; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzDeliveryBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzDeliveryBo.java new file mode 100644 index 0000000..a5ec53a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzDeliveryBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzDelivery; + +/** + * 物流公司业务对象 tz_delivery + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzDelivery.class, reverseConvertGenerate = false) +public class TzDeliveryBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 物流公司名称 + */ + @NotBlank(message = "物流公司名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String name; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzHotSearchBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzHotSearchBo.java new file mode 100644 index 0000000..9115e85 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzHotSearchBo.java @@ -0,0 +1,71 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzHotSearch; + +import java.util.Date; + +/** + * 热搜业务对象 tz_hot_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzHotSearch.class, reverseConvertGenerate = false) +public class TzHotSearchBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long hotSearchId; + + /** + * 店铺ID 0为全局热搜 + */ + private Long shopId; + + /** + * 热搜标题 + */ + @NotBlank(message = "热搜标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String title; + + /** + * 搜索次数 + */ + private Long num; + + /** + * 状态 0下线 1上线 + */ + @NotNull(message = "状态 0下线 1上线不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + /** + * 内容 + */ + private String content; + + /** + * 顺序 + */ + private Long seq; + + /** + * 录入时间 + */ + @NotNull(message = "录入时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzIndexImgBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzIndexImgBo.java new file mode 100644 index 0000000..8790019 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzIndexImgBo.java @@ -0,0 +1,89 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzIndexImg; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 主页轮播图业务对象 tz_index_img + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzIndexImg.class, reverseConvertGenerate = false) +public class TzIndexImgBo{ + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long imgId; + + /** + * 图片 + */ + @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class }) + private String imgUrl; + + /** + * 说明文字,描述 + */ + private String des; + + /** + * 标题 + */ + private String title; + + /** + * 链接 + */ + private String link; + + /** + * 状态 + */ + private Integer status; + + /** + * 顺序 + */ + private Integer seq; + + /** + * 上传时间 + */ + private Date uploadTime; + + /** + * 关联 + */ + private Long relation; + + /** + * 类型 + */ + private Integer type; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceApplyBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceApplyBo.java new file mode 100644 index 0000000..107bbc1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceApplyBo.java @@ -0,0 +1,117 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzInvoiceApply; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 发票申请记录业务对象 tz_invoice_apply + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzInvoiceApply.class, reverseConvertGenerate = false) +public class TzInvoiceApplyBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 发票申请编号 + */ + private String invoiceNo; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 发票抬头id + */ + private Long invoiceTitleId; + + /** + * 发票抬头信息JSON + */ + private String invoiceTitleJson; + + /** + * 发票类型(1-电子普票,2-电子专票) + */ + private Integer invoiceType; + + /** + * 发票内容 + */ + @NotBlank(message = "发票内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String invoiceContent; + + /** + * 开票金额 + */ + @NotNull(message = "开票金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal invoiceAmount; + + /** + * 关联订单号(多个逗号分隔) + */ + private String orderIds; + + /** + * 关联订单编号(多个逗号分隔) + */ + private String orderNos; + + /** + * 接收邮箱 + */ + private String email; + + /** + * 开票状态(1-待开票,2-开票中,3-已开票,4-开票失败,5-已取消) + */ + private Integer status; + + /** + * 电子发票下载地址 + */ + private String invoiceUrl; + + /** + * 失败原因 + */ + private String failReason; + + /** + * 开票时间 + */ + private Date invoiceTime; + + /** + * 删除标志(1代表存在 2代表删除) + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceTitleBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceTitleBo.java new file mode 100644 index 0000000..ad040dc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzInvoiceTitleBo.java @@ -0,0 +1,93 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzInvoiceTitle; + +/** + * 发票抬头信息业务对象 tz_invoice_title + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzInvoiceTitle.class, reverseConvertGenerate = false) +public class TzInvoiceTitleBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户id + */ + @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 抬头类型(1-个人,2-企业) + */ + private Integer type; + + /** + * 发票抬头名称 + */ + @NotBlank(message = "发票抬头名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String titleName; + + /** + * 税号 + */ + private String taxNumber; + + /** + * 单位地址 + */ + private String companyAddress; + + /** + * 单位电话 + */ + private String companyPhone; + + /** + * 开户银行 + */ + private String bankName; + + /** + * 银行账号 + */ + private String bankAccount; + + /** + * 是否默认(1-是,2-否) + */ + private Integer isDefault; + + /** + * 接收邮箱 + */ + private String email; + + /** + * 删除标志(1代表存在 2代表删除) + */ + private Integer delFlag; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzMessageBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzMessageBo.java new file mode 100644 index 0000000..89c12dd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzMessageBo.java @@ -0,0 +1,59 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzMessage; + +/** + * 消息业务对象 tz_message + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzMessage.class, reverseConvertGenerate = false) +public class TzMessageBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 姓名 + */ + private String userName; + + /** + * 邮箱 + */ + private String email; + + /** + * 联系方式 + */ + private String contact; + + /** + * 留言内容 + */ + private String content; + + /** + * 留言回复 + */ + private String reply; + + /** + * 状态:0:未审核 1审核通过 + */ + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzNoticeBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzNoticeBo.java new file mode 100644 index 0000000..b3e7fbc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzNoticeBo.java @@ -0,0 +1,55 @@ +package org.dromara.mall.domain.bo; + + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzNotice; + +/** + * 公告业务对象 tz_notice + * + * @author Maosw + * @date 2025-01-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzNotice.class, reverseConvertGenerate = false) +public class TzNoticeBo extends BaseEntity { + + /** + * 公告id + */ + @NotNull(message = "公告id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 公告标题 + */ + private String title; + + /** + * 公告内容 + */ + private String content; + + /** + * 状态(0:未发布,1:已发布) + */ + private Integer status; + + /** + * 是否置顶(0:未置顶,1:已置顶) + */ + private Integer isTop; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderAllBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderAllBo.java new file mode 100644 index 0000000..10d0933 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderAllBo.java @@ -0,0 +1,135 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzOrderAll; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 订单汇总业务对象 tz_order_all + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrderAll.class, reverseConvertGenerate = false) +public class TzOrderAllBo extends BaseEntity { + + /** + * ID + */ + private Long id; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String cName; + + /** + * 订单金额 + */ + private BigDecimal total; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + private Integer payState; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:交易中 3:交易成功 4:订单关闭 + */ + private Integer status; + + /** + * 收货人姓名 + */ + @NotBlank(message = "收货人姓名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userName; + + /** + * 收货人电话 + */ + @NotBlank(message = "收货人电话不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userPhone; + + /** + * 收货地址 + */ + @NotBlank(message = "收货地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userAddress; + + /** + * 订单商品总数 + */ + private Integer productNums; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + private Integer refundSts; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + private Integer deleteStatus; + + /** + * 订单子项集合 + */ + private List list; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderBo.java new file mode 100644 index 0000000..54b673c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderBo.java @@ -0,0 +1,310 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzOrder; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 订单业务对象 tz_order + * + * @author Maosw + * @date 2024-08-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrder.class, reverseConvertGenerate = false) +public class TzOrderBo extends BaseEntity { + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { EditGroup.class }) + private Long orderId; + + + /** + * 租户ID + */ + private String tenantId; + + /** + * 订单汇总ID + */ + @NotNull(message = "订单汇总ID", groups = { AddGroup.class, EditGroup.class}) + private Long allId; + + /** + * 产品ID + */ + @NotNull(message = "产品ID", groups = { AddGroup.class}) + private Long prodId; + + /** + * 产品编码 + */ + @NotBlank(message = "产品编码不能为空", groups = { AddGroup.class}) + private String prodCode; + + /** + * 产品名称 + */ + @NotBlank(message = "产品名称不能为空", groups = { AddGroup.class}) + private String prodName; + + /** + * skuID + */ + @NotNull(message = "skuID不能为空", groups = { EditGroup.class }) + private Long skuId; + + /** + * SKU编码 + */ + @NotBlank(message = "SKU编码不能为空", groups = { AddGroup.class}) + private String skuCode; + + /** + * sku厂家编码 + */ + @NotBlank(message = "sku厂家编码", groups = { AddGroup.class, EditGroup.class }) + private String skuFactoryCode; + + /** + * SKU名称 + */ + @NotBlank(message = "SKU名称不能为空", groups = { AddGroup.class}) + private String skuName; + + + /** + * sku图片路径 + */ + @NotBlank(message = "sku图片路径不能为空", groups = { AddGroup.class}) + private String pic; + + /** + * 销售员ID + */ + private Long saleId; + + /** + * 采购员ID + */ + private Long buyerId; + + /** + * 订购用户ID + */ + private Long userId; + + /** + * 订单编号 + */ + private String orderNum; + + /** + * 单价 + */ + private BigDecimal price; + + /** + * 订单金额 + */ + @NotNull(message = "订单金额不能为空", groups = { AddGroup.class}) + private BigDecimal total; + + /** + * 成本金额 + */ + private BigDecimal actualTotal; + + /** + *付款金额 + */ + private BigDecimal payPrice; + + /** + * 尾款金额 + */ + private BigDecimal endPrice; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + private Integer payState; + + /** + * 支付方式 0 手动代付 1 微信支付 2 支付宝 + */ + private Integer payType; + + /** + * 订单备注 + */ + private String remarks; + + /** + * 订单状态 1:待付款 2:待采购 3:待发货 4:待收货 5:已签收 6:交易成功 7:订单关闭 + */ + private Integer status; + + /** + * 重量或体积 + */ + private String dvyType; + + /** + * 运费金额 + */ + private BigDecimal dvyPrice; + + /** + * 物流单号 + */ + private String dvyFlowId; + + /** + * 订单运费 + */ + private BigDecimal freightAmount; + + /** + * 发货地 + */ + private String deliveryLocat; + + /** + * 收货人姓名 + */ + @NotBlank(message = "收货人姓名不能为空", groups = { AddGroup.class}) + private String userName; + + /** + * 收货人电话 + */ + @NotBlank(message = "收货人电话不能为空", groups = { AddGroup.class}) + private String userPhone; + + /** + * 收货地址 + */ + @NotBlank(message = "收货地址不能为空", groups = { AddGroup.class}) + private String userAddress; + + /** + * 订单商品总数 + */ + private Integer productNums; + + /** + * 付款时间 + */ + private Date payTime; + + /** + * 发货时间 + */ + private Date dvyTime; + + /** + * 完成时间 + */ + private Date finallyTime; + + /** + * 取消时间 + */ + private Date cancelTime; + + /** + * 是否已经打款给厂家 0:待录入 1:未打款 2:已打款 + */ + private Integer isPayed; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + private Integer refundSts; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 拒绝原因 + */ + private String reason; + + /** + * 优惠总额 + */ + private BigDecimal reduceAmount; + + /** + * 订单类型 + */ + private Integer orderType; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + private Integer deleteStatus; + + /** + * 描述 + */ + private String describe; + + private String sname; + + private String bname; + + private String cname; + + /** + * 打款订单ID集合 + */ + private List payList; + + /** + * 打款金额 + */ + private BigDecimal makeMoney; + + /** + * 支付订单类型 1:总订单 2:子订单 + */ + private Integer payOrderType; + + /** + * 标识 1:新增 2:修改 3:修改金额 4:删除 5:未修改 + */ + private Integer flag; + + /** + * 显示状态 1:正常 2:关闭 + */ + private Integer closeFlag; + + /** + * 支付金额 + */ + private BigDecimal payAmount; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderItemBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderItemBo.java new file mode 100644 index 0000000..e707bd2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderItemBo.java @@ -0,0 +1,123 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzOrderItem; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 订单项业务对象 tz_order_item + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrderItem.class, reverseConvertGenerate = false) +public class TzOrderItemBo extends BaseEntity { + + /** + * 订单项ID + */ + @NotNull(message = "订单项ID不能为空", groups = { EditGroup.class }) + private Long orderItemId; + + /** + * 店铺id + */ + @NotNull(message = "店铺id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shopId; + + /** + * 订单order_number + */ + @NotBlank(message = "订单order_number不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderNumber; + + /** + * 产品ID + */ + @NotNull(message = "产品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 产品SkuID + */ + @NotNull(message = "产品SkuID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long skuId; + + /** + * 购物车产品个数 + */ + @NotNull(message = "购物车产品个数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodCount; + + /** + * 产品名称 + */ + @NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String prodName; + + /** + * sku名称 + */ + @NotBlank(message = "sku名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String skuName; + + /** + * 产品主图片路径 + */ + @NotBlank(message = "产品主图片路径不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pic; + + /** + * 产品价格 + */ + @NotNull(message = "产品价格不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal price; + + /** + * 用户Id + */ + @NotBlank(message = "用户Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 商品总金额 + */ + @NotNull(message = "商品总金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal productTotalAmount; + + /** + * 购物时间 + */ + @NotNull(message = "购物时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recTime; + + /** + * 评论状态: 0 未评价 1 已评价 + */ + @NotNull(message = "评论状态: 0 未评价 1 已评价不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer commSts; + + /** + * 推广员使用的推销卡号 + */ + @NotBlank(message = "推广员使用的推销卡号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String distributionCardNo; + + /** + * 加入购物车时间 + */ + @NotNull(message = "加入购物车时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date basketDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderReceiveBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderReceiveBo.java new file mode 100644 index 0000000..93e819b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderReceiveBo.java @@ -0,0 +1,114 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzOrderReceive; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 订单汇款业务对象 tz_order_receive + * + * @author Maosw + * @date 2024-09-03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzOrderReceive.class, reverseConvertGenerate = false) +public class TzOrderReceiveBo { + + /** + * ID + */ + private Long id; + + /** + * 客户ID + */ + private Long cId; + + /** + * 客户姓名 + */ + private String cName; + + /** + * 客服ID + */ + private Long userId; + + /** + * 客服编号 + */ + private String userCode; + + /** + * 客服姓名 + */ + private String userName; + + /** + * 财务ID + */ + private Long cwId; + + /** + * 财务姓名 + */ + private String cwName; + + /** + * 付款金额 + */ + @NotNull(message = "付款金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal total; + + /** + * 状态 1:待领款 2:已领款 + */ + private Integer status; + + /** + * 收款信息 + */ + private String receiveInfo; + + /** + * 描述 + */ + private String depict; + + /** + * 付款截图 + */ + private String paymentImg; + + /** + * 1:汇款 + */ + private Integer type; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRecordBo.java new file mode 100644 index 0000000..96f7dd7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRecordBo.java @@ -0,0 +1,91 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzOrderRecord; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 订单历史记录业务对象 tz_order_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzOrderRecord.class, reverseConvertGenerate = false) +public class TzOrderRecordBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单汇总ID + */ + private Long allId; + + /** + * 订单ID + */ + private String orderId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 操作类型 + */ + @NotBlank(message = "操作类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String type; + + /** + * 操作内容 + */ + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + @NotNull(message = "操作状态 1:记录 2:节点不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long state; + + /** + * 修改前json + */ + private String oldJson; + + /** + * 修改后json + */ + private String newJson; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRefundBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRefundBo.java new file mode 100644 index 0000000..7c5a25a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderRefundBo.java @@ -0,0 +1,181 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzOrderRefund; + +import java.util.Date; + +/** + * 订单资金业务对象 tz_order_refund + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrderRefund.class, reverseConvertGenerate = false) +public class TzOrderRefundBo extends BaseEntity { + + /** + * 记录ID + */ + @NotNull(message = "记录ID不能为空", groups = { EditGroup.class }) + private Long refundId; + + /** + * 店铺ID + */ + @NotNull(message = "店铺ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shopId; + + /** + * 订单ID + */ + @NotNull(message = "订单ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderId; + + /** + * 订单流水号 + */ + @NotBlank(message = "订单流水号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderNumber; + + /** + * 订单总金额 + */ + @NotNull(message = "订单总金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderAmount; + + /** + * 订单项ID 全部退款是0 + */ + @NotNull(message = "订单项ID 全部退款是0不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderItemId; + + /** + * 退款编号 + */ + @NotBlank(message = "退款编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String refundSn; + + /** + * 订单支付流水号 + */ + @NotBlank(message = "订单支付流水号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String flowTradeNo; + + /** + * 第三方退款单号(微信退款单号) + */ + private String outRefundNo; + + /** + * 订单支付方式 1 微信支付 2 支付宝 + */ + private Long payType; + + /** + * 订单支付名称 + */ + private String payTypeName; + + /** + * 买家ID + */ + @NotBlank(message = "买家ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 退货数量 + */ + private Long goodsNum; + + /** + * 退款金额 + */ + @NotNull(message = "退款金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long refundAmount; + + /** + * 申请类型:1,仅退款,2退款退货 + */ + @NotNull(message = "申请类型:1,仅退款,2退款退货不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long applyType; + + /** + * 处理状态:1为待审核,2为同意,3为不同意 + */ + @NotNull(message = "处理状态:1为待审核,2为同意,3为不同意不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long refundSts; + + /** + * 处理退款状态: 0:退款处理中 1:退款成功 -1:退款失败 + */ + @NotNull(message = "处理退款状态: 0:退款处理中 1:退款成功 -1:退款失败不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long returnMoneySts; + + /** + * 申请时间 + */ + @NotNull(message = "申请时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date applyTime; + + /** + * 卖家处理时间 + */ + private Date handelTime; + + /** + * 退款时间 + */ + private Date refundTime; + + /** + * 文件凭证json + */ + private String photoFiles; + + /** + * 申请原因 + */ + private String buyerMsg; + + /** + * 卖家备注 + */ + private String sellerMsg; + + /** + * 物流公司名称 + */ + private String expressName; + + /** + * 物流单号 + */ + private String expressNo; + + /** + * 发货时间 + */ + private Date shipTime; + + /** + * 收货时间 + */ + private Date receiveTime; + + /** + * 收货备注 + */ + private String receiveMessage; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderSettlementBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderSettlementBo.java new file mode 100644 index 0000000..eac9033 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderSettlementBo.java @@ -0,0 +1,93 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzOrderSettlement; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 【请填写功能名称】业务对象 tz_order_settlement + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrderSettlement.class, reverseConvertGenerate = false) +public class TzOrderSettlementBo extends BaseEntity { + + /** + * 支付结算单据ID + */ + @NotNull(message = "支付结算单据ID不能为空", groups = { EditGroup.class }) + private Long settlementId; + + /** + * 支付单号 + */ + @NotBlank(message = "支付单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String payNo; + + /** + * 外部订单流水号 + */ + @NotBlank(message = "外部订单流水号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String bizPayNo; + + /** + * order表中的订单号 + */ + @NotBlank(message = "order表中的订单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderNumber; + + /** + * 支付方式 1 微信支付 2 支付宝 + */ + @NotNull(message = "支付方式 1 微信支付 2 支付宝不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer payType; + + /** + * 支付方式名称 + */ + @NotBlank(message = "支付方式名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String payTypeName; + + /** + * 支付金额 + */ + @NotNull(message = "支付金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal payAmount; + + /** + * 是否清算 0:否 1:是 + */ + @NotNull(message = "是否清算 0:否 1:是不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer isClearing; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 清算时间 + */ + @NotNull(message = "清算时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date clearingTime; + + /** + * 支付状态 + */ + @NotNull(message = "支付状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer payStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderShareBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderShareBo.java new file mode 100644 index 0000000..9217c3e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzOrderShareBo.java @@ -0,0 +1,51 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzOrderShare; + +import java.util.Date; + +/** + * 订单分享业务对象 tz_order_share + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzOrderShare.class, reverseConvertGenerate = false) +public class TzOrderShareBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 采购ID + */ + private Long userId; + + /** + * 订单内容 + */ + private String content; + + /** + * 备注 + */ + private String remark; + + /** + * 过期时间 + */ + private Date expireTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPickAddrBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPickAddrBo.java new file mode 100644 index 0000000..4319f88 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPickAddrBo.java @@ -0,0 +1,90 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzPickAddr; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 用户配送地址业务对象 tz_pick_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzPickAddr.class, reverseConvertGenerate = false) +public class TzPickAddrBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long addrId; + + /** + * 自提点名称 + */ + @NotBlank(message = "自提点名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String addrName; + + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String addr; + + /** + * 手机 + */ + @NotBlank(message = "手机不能为空", groups = { AddGroup.class, EditGroup.class }) + private String mobile; + + /** + * 省份ID + */ + @NotNull(message = "省份ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long provinceId; + + /** + * 省份 + */ + @NotBlank(message = "省份不能为空", groups = { AddGroup.class, EditGroup.class }) + private String province; + + /** + * 城市ID + */ + @NotNull(message = "城市ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long cityId; + + /** + * 城市 + */ + @NotBlank(message = "城市不能为空", groups = { AddGroup.class, EditGroup.class }) + private String city; + + /** + * 区/县ID + */ + @NotNull(message = "区/县ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 区/县 + */ + @NotBlank(message = "区/县不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 店铺id + */ + @NotNull(message = "店铺id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shopId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPictureAlbumBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPictureAlbumBo.java new file mode 100644 index 0000000..023593b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzPictureAlbumBo.java @@ -0,0 +1,67 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzPictureAlbum; + +/** + * 画册业务对象 tz_picture_album + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzPictureAlbum.class, reverseConvertGenerate = false) +public class TzPictureAlbumBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分类字典值 + */ + private String type; + + /** + * 标题 + */ + @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String title; + + /** + * 封面图片 + */ + private String icon; + + /** + * 文件地址 + */ + private String url; + + /** + * 状态(1正常 0关闭) + */ + private Long status; + + /** + * 排序 + */ + private Long sort; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java new file mode 100644 index 0000000..7a92ac5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBo.java @@ -0,0 +1,220 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.mall.domain.TzProd; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 产品业务对象 tz_prod + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProd.class, reverseConvertGenerate = false) +public class TzProdBo extends TenantEntity { + + /** + * 产品ID + */ + @NotNull(message = "产品ID不能为空", groups = { EditGroup.class }) + private Long prodId; + + /** + * 租户名称 + */ + private String tenantName; + + /** + * 品牌ID + */ + private Long brandId; + + /** + * 商品厂家编号 + */ + private String prodFactoryCode; + + /** + * 商品编号 + */ + private String prodCode; + + /** + * 商品名称 + */ + @NotBlank(message = "商品名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String prodName; + + /** + * 商品指导价 + */ + private BigDecimal guidingPrice; + + /** + * 商品展示价 + */ + private BigDecimal price; + + /** + * 商品成本价 + */ + private BigDecimal oriPrice; + + /** + * 单位 + */ + private String unit; + + /** + * 简要描述,卖点等 + */ + private String brief; + + /** + * 详细描述 + */ + private String content; + + /** + * 工厂展示 + */ + private String factory; + + /** + * 售后保障 + */ + private String afterSales; + + /** + * 场景展示 + */ + private String cjzs; + + /** + * 工艺流程展示 + */ + private String gylczs; + + /** + * 商品主图 + */ + private String pic; + + /** + * 商品图片,以,分割 + */ + private String imgs; + + /** + * 视频地址 + */ + private String video; + + /** + * 默认是1,表示正常状态, -1表示删除, 0下架 + */ + private Long status; + + /** + * 商品分类 + */ + private Long categoryId; + + /** + * 商品参数json + */ + private String prodParame; + + /** + * 产地 + */ + private String factoryAddress; + + /** + * sku列表字符串 + */ + private List skuList; + + /** + * 销量 + */ + private Long soldNum; + + /** + * 总库存 + */ + private Long totalStocks; + + /** + * 配送方式json见TransportModeVO + */ + private String deliveryMode; + + /** + * 上架时间 + */ + private Date putawayTime; + + /** + * 浏览量 + */ + private Long browseNum; + + /** + * 收藏量 + */ + private Long collectNum; + + /** + * 规格JSON + */ + private String prodProp; + + /** + * 装箱率 + */ + private Long packingRate; + + /** + * 是否特价 1:是 2:否 + */ + private Long isFloor; + + /** + * 配送方式 1:物流点自提 2:配送上门 + */ + private Long isDvy; + + /** + * 发货天数 + */ + private Long dvyDay; + + /** + * 审核状态 1:待审核 2:已通过 3:已拒绝 + */ + private Long examineFlag; + + /** + * 标签 0:默认 1:性价比 2:品质款 3:旗舰款 + */ + private Integer label; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBrowseBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBrowseBo.java new file mode 100644 index 0000000..1f8d529 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdBrowseBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzProdBrowse; + +/** + * 商品浏览业务对象 tz_prod_browse + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProdBrowse.class, reverseConvertGenerate = false) +public class TzProdBrowseBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 商品ID + */ + @NotNull(message = "商品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdCommBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdCommBo.java new file mode 100644 index 0000000..36a0da9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdCommBo.java @@ -0,0 +1,86 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzProdComm; + +/** + * 商品评论业务对象 tz_prod_comm + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProdComm.class, reverseConvertGenerate = false) +public class TzProdCommBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 商品ID + */ + @NotNull(message = "商品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 订单 ID + */ + private Long orderId; + + /** + * 订单项ID + */ + private Long orderItemId; + + /** + * 评论用户ID + */ + private Long userId; + + /** + * 订购用户姓名 + */ + private String userName; + + /** + * 评论内容 + */ + private String content; + + /** + * 得分,0-5分 + */ + private Long score; + + /** + * 晒图的json字符串 + */ + private String pics; + + /** + * 是否匿名(1:是 0:否) + */ + private Long isAnonymous; + + /** + * 是否显示,1:为显示,0:待审核, -1:不通过审核,不显示。 如果需要审核评论,则是0,,否则1 + */ + private Integer status; + + /** + * 删除标志: 1-存在, 2-删除 + */ + private Integer delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdFavoriteBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdFavoriteBo.java new file mode 100644 index 0000000..083eac7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdFavoriteBo.java @@ -0,0 +1,60 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzProdFavorite; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 商品收藏业务对象 tz_prod_favorite + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzProdFavorite.class, reverseConvertGenerate = false) +public class TzProdFavoriteBo { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long favoriteId; + + /** + * 商品ID + */ + @NotNull(message = "商品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 用户ID + */ + @NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 收藏时间 + */ + @NotNull(message = "收藏时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recTime; + + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropBo.java new file mode 100644 index 0000000..026ff1f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropBo.java @@ -0,0 +1,69 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzProdProp; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 商品规格业务对象 tz_prod_prop + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzProdProp.class, reverseConvertGenerate = false) +public class TzProdPropBo { + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 属性id + */ + @NotNull(message = "属性id不能为空", groups = { EditGroup.class }) + private Long propId; + + /** + * 属性名称 + */ + private String propName; + + /** + * ProdPropRule 1:销售属性(规格); 2:参数属性; + */ + private Integer rule; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 规格属性值集合 + */ + @NotEmpty(message = "规格属性值不能为空", groups = { AddGroup.class, EditGroup.class }) + private List prodPropValues; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropValueBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropValueBo.java new file mode 100644 index 0000000..41c0c53 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdPropValueBo.java @@ -0,0 +1,38 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzProdPropValue; + +/** + * 商品规格子规格业务对象 tz_prod_prop_value + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzProdPropValue.class, reverseConvertGenerate = false) +public class TzProdPropValueBo { + + /** + * 属性值ID + */ + @NotNull(message = "属性值ID不能为空", groups = { EditGroup.class }) + private Long valueId; + + /** + * 属性值名称 + */ + private String propValue; + + /** + * 属性ID + */ + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRecordBo.java new file mode 100644 index 0000000..6c9d89e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRecordBo.java @@ -0,0 +1,94 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzProdRecord; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 产品价格记录业务对象 tz_prod_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzProdRecord.class, reverseConvertGenerate = false) +public class TzProdRecordBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 单品ID + */ + private Long skuId; + + /** + * 修改人ID + */ + private Long userId; + + /** + * 修改人姓名 + */ + private String userName; + + /** + * 修改人类型1:商家 2:采购员 + */ + private Long type; + + /** + * 修改前价格 + */ + private Long oldPrice; + + /** + * 修改后价格 + */ + private Long newPrice; + + /** + * 操作内容 + */ + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + private Long state; + + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRelationBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRelationBo.java new file mode 100644 index 0000000..060d190 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdRelationBo.java @@ -0,0 +1,38 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzProdRelation; + +/** + * 商品推荐关联业务对象 tz_prod_relation + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzProdRelation.class, reverseConvertGenerate = false) +public class TzProdRelationBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 商品ID + */ + private Long prodId; + + /** + * 关联商品ID + */ + private Long glProdId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagBo.java new file mode 100644 index 0000000..23776d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagBo.java @@ -0,0 +1,79 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzProdTag; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 商品分组业务对象 tz_prod_tag + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProdTag.class, reverseConvertGenerate = false) +public class TzProdTagBo extends BaseEntity { + + /** + * 分组标签id + */ + @NotNull(message = "分组标签id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 分组标题 + */ + @NotBlank(message = "分组标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String title; + + /** + * 店铺Id + */ + private Long shopId; + + /** + * 状态(1为正常,0为删除) + */ + @NotNull(message = "状态(1为正常,0为删除)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 默认类型(0:商家自定义,1:系统默认) + */ + @NotNull(message = "默认类型(0:商家自定义,1:系统默认)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer isDefault; + + /** + * 商品数量 + */ + @NotNull(message = "商品数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodCount; + + /** + * 列表样式(0:一列一个,1:一列两个,2:一列三个) + */ + @NotNull(message = "列表样式(0:一列一个,1:一列两个,2:一列三个)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer style; + + /** + * 排序 + */ + @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer seq; + + /** + * 删除时间 + */ + @NotNull(message = "删除时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date deleteTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagReferenceBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagReferenceBo.java new file mode 100644 index 0000000..fda9efe --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdTagReferenceBo.java @@ -0,0 +1,53 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzProdTagReference; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_prod_tag_reference + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProdTagReference.class, reverseConvertGenerate = false) +public class TzProdTagReferenceBo extends BaseEntity { + + /** + * 分组引用id + */ + @NotNull(message = "分组引用id不能为空", groups = { EditGroup.class }) + private Long referenceId; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 标签id + */ + @NotNull(message = "标签id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long tagId; + + /** + * 商品id + */ + @NotNull(message = "商品id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 状态(1:正常,0:删除) + */ + @NotNull(message = "状态(1:正常,0:删除)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdWishlistBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdWishlistBo.java new file mode 100644 index 0000000..2c2209a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzProdWishlistBo.java @@ -0,0 +1,75 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzProdWishlist; + +/** + * 心愿单业务对象 + * + * @author Lion Li + * @date 2024-01-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzProdWishlist.class, reverseConvertGenerate = false) +public class TzProdWishlistBo extends BaseEntity { + + /** + * 心愿单记录ID + */ + @NotNull(message = "心愿单记录ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 用户姓名 + */ + private String userName; + + /** + * 用户号码 + */ + private String userPhone; + + /** + * 产品名称 + */ + @NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String prodName; + + /** + * 产品图片 + */ + private String prodPic; + + /** + * 产品描述 + */ + private String prodDescription; + + /** + * 产品类别 + */ + private String category; + + /** + * 状态: 1-已提交, 2-已采纳, 3-已上货, 4-未找到货源 + */ + private Integer status; + + /** + * 删除标志: 1-存在 2-删除 + */ + private Integer delFlag; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzShopDetailBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzShopDetailBo.java new file mode 100644 index 0000000..e7b1ada --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzShopDetailBo.java @@ -0,0 +1,174 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzShopDetail; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 【请填写功能名称】业务对象 tz_shop_detail + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzShopDetail.class, reverseConvertGenerate = false) +public class TzShopDetailBo extends BaseEntity { + + /** + * 店铺id + */ + private Long shopId; + + /** + * 店铺名称(数字、中文,英文(可混合,不可有特殊字符),可修改)、不唯一 + */ + @NotBlank(message = "店铺名称(数字、中文,英文(可混合,不可有特殊字符),可修改)、不唯一不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopName; + + /** + * 店长用户id + */ + @NotBlank(message = "店长用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 店铺类型 + */ + @NotNull(message = "店铺类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer shopType; + + /** + * 店铺简介(可修改) + */ + @NotBlank(message = "店铺简介(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String intro; + + /** + * 店铺公告(可修改) + */ + @NotBlank(message = "店铺公告(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopNotice; + + /** + * 店铺行业(餐饮、生鲜果蔬、鲜花等) + */ + @NotNull(message = "店铺行业(餐饮、生鲜果蔬、鲜花等)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer shopIndustry; + + /** + * 店长 + */ + @NotBlank(message = "店长不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopOwner; + + /** + * 店铺绑定的手机(登录账号:唯一) + */ + @NotBlank(message = "店铺绑定的手机(登录账号:唯一)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String mobile; + + /** + * 店铺联系电话 + */ + @NotBlank(message = "店铺联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) + private String tel; + + /** + * 店铺所在纬度(可修改) + */ + @NotBlank(message = "店铺所在纬度(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopLat; + + /** + * 店铺所在经度(可修改) + */ + @NotBlank(message = "店铺所在经度(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopLng; + + /** + * 店铺详细地址 + */ + @NotBlank(message = "店铺详细地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopAddress; + + /** + * 店铺所在省份(描述) + */ + @NotBlank(message = "店铺所在省份(描述)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String province; + + /** + * 店铺所在城市(描述) + */ + @NotBlank(message = "店铺所在城市(描述)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String city; + + /** + * 店铺所在区域(描述) + */ + @NotBlank(message = "店铺所在区域(描述)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 店铺省市区代码,用于回显 + */ + @NotBlank(message = "店铺省市区代码,用于回显不能为空", groups = { AddGroup.class, EditGroup.class }) + private String pcaCode; + + /** + * 店铺logo(可修改) + */ + @NotBlank(message = "店铺logo(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopLogo; + + /** + * 店铺相册 + */ + @NotBlank(message = "店铺相册不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shopPhotos; + + /** + * 每天营业时间段(可修改) + */ + @NotBlank(message = "每天营业时间段(可修改)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String openTime; + + /** + * 店铺状态(-1:未开通 0: 停业中 1:营业中),可修改 + */ + @NotNull(message = "店铺状态(-1:未开通 0: 停业中 1:营业中),可修改不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer shopStatus; + + /** + * 0:商家承担运费; 1:买家承担运费 + */ + @NotNull(message = "0:商家承担运费; 1:买家承担运费不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer transportType; + + /** + * 固定运费 + */ + @NotNull(message = "固定运费不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal fixedFreight; + + /** + * 满X包邮 + */ + @NotNull(message = "满X包邮不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal fullFreeShipping; + + /** + * 分销开关(0:开启 1:关闭) + */ + @NotNull(message = "分销开关(0:开启 1:关闭)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer isDistribution; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSkuBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSkuBo.java new file mode 100644 index 0000000..f57187b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSkuBo.java @@ -0,0 +1,135 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzSku; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 单品SKU业务对象 tz_sku + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzSku.class, reverseConvertGenerate = false) +public class TzSkuBo extends BaseEntity { + + /** + * 单品ID + */ + @NotNull(message = "单品ID不能为空", groups = { EditGroup.class }) + private Long skuId; + + /** + * 商品ID + */ + @NotNull(message = "商品ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 销售属性组合字符串 + */ + private String properties; + + /** + * 商品指导价 + */ + private BigDecimal guidingPrice; + + /** + * 商品成本价 + */ + private BigDecimal oriPrice; + + /** + * 商品展示价 + */ + private BigDecimal price; + + /** + * 商品在付款减库存的状态下,该sku上未付款的订单数量 + */ + private Long stocks; + + /** + * 实际库存 + */ + private Long actualStocks; + + /** + * 记录时间 + */ + @NotNull(message = "记录时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recTime; + + /** + * 商家编码 + */ + private String partyCode; + + /** + * 商品条形码 + */ + private String modelId; + + /** + * sku图片 + */ + private String pic; + + /** + * sku编号 + */ + private String skuCode; + + /** + * sku名称 + */ + private String skuName; + + /** + * sku厂家编号 + */ + private String skuFactoryCode; + + /** + * 商品名称 + */ + private String prodName; + + /** + * 商品重量 + */ + private Long weight; + + /** + * 商品体积 + */ + private Long volume; + + /** + * 0 禁用 1 启用 + */ + private Long status; + + /** + * 0 正常 1 已被删除 + */ + private Long isDelete; + + /** + * 标识 1:新增 2:修改 3:修改金额 4:删除 5:未修改 + */ + private Integer flag; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSmsLogBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSmsLogBo.java new file mode 100644 index 0000000..d4b3fd5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzSmsLogBo.java @@ -0,0 +1,79 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzSmsLog; + +import java.util.Date; + +/** + * 短信记录业务对象 tz_sms_log + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzSmsLog.class, reverseConvertGenerate = false) +public class TzSmsLogBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户id + */ + private String userId; + + /** + * 手机号码 + */ + @NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userPhone; + + /** + * 短信内容 + */ + @NotBlank(message = "短信内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String content; + + /** + * 手机验证码 + */ + @NotBlank(message = "手机验证码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String mobileCode; + + /** + * 短信类型 1:注册 2:验证 + */ + @NotNull(message = "短信类型 1:注册 2:验证不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long type; + + /** + * 发送时间 + */ + @NotNull(message = "发送时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recDate; + + /** + * 发送短信返回码 + */ + private String responseCode; + + /** + * 状态 1:有效 0:失效 + */ + @NotNull(message = "状态 1:有效 0:失效不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTenantRecordBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTenantRecordBo.java new file mode 100644 index 0000000..3467e9f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTenantRecordBo.java @@ -0,0 +1,76 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzTenantRecord; + +import java.math.BigDecimal; + +/** + * 租户资金记录业务对象 tz_tenant_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTenantRecord.class, reverseConvertGenerate = false) +public class TzTenantRecordBo extends BaseEntity { + + /** + * 记录ID + */ + @NotNull(message = "记录ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 租户名称 + */ + private String tenantName; + + /** + * 变动金额(正数增加,负数减少) + */ + private BigDecimal amount; + + /** + * 变动后余额 + */ + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + private Integer type; + + /** + * 订单ID + */ + private Long orderId; + + /** + * 子订单项ID + */ + private Long orderItemId; + + /** + * 备注 + */ + private String remark; + + /** + * 金额类型: 1-可用余额, 2-冻结余额 + */ + private Integer amountType; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityBo.java new file mode 100644 index 0000000..5338baf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzTranscity; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_transcity + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTranscity.class, reverseConvertGenerate = false) +public class TzTranscityBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long transcityId; + + /** + * 运费项id + */ + @NotNull(message = "运费项id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long transfeeId; + + /** + * 城市id + */ + @NotNull(message = "城市id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long cityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityFreeBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityFreeBo.java new file mode 100644 index 0000000..a9fd5e8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTranscityFreeBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzTranscityFree; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_transcity_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTranscityFree.class, reverseConvertGenerate = false) +public class TzTranscityFreeBo extends BaseEntity { + + /** + * 指定条件包邮城市项id + */ + @NotNull(message = "指定条件包邮城市项id不能为空", groups = { EditGroup.class }) + private Long transcityFreeId; + + /** + * 指定条件包邮项id + */ + @NotNull(message = "指定条件包邮项id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long transfeeFreeId; + + /** + * 城市id + */ + @NotNull(message = "城市id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long freeCityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeBo.java new file mode 100644 index 0000000..31f53a2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeBo.java @@ -0,0 +1,61 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzTransfee; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 【请填写功能名称】业务对象 tz_transfee + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTransfee.class, reverseConvertGenerate = false) +public class TzTransfeeBo extends BaseEntity { + + /** + * 运费项id + */ + @NotNull(message = "运费项id不能为空", groups = { EditGroup.class }) + private Long transfeeId; + + /** + * 运费模板id + */ + @NotNull(message = "运费模板id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long transportId; + + /** + * 续件数量 + */ + @NotNull(message = "续件数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal continuousPiece; + + /** + * 首件数量 + */ + @NotNull(message = "首件数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal firstPiece; + + /** + * 续件费用 + */ + @NotNull(message = "续件费用不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal continuousFee; + + /** + * 首件费用 + */ + @NotNull(message = "首件费用不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal firstFee; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeFreeBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeFreeBo.java new file mode 100644 index 0000000..c341d49 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransfeeFreeBo.java @@ -0,0 +1,55 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzTransfeeFree; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.math.BigDecimal; + +/** + * 【请填写功能名称】业务对象 tz_transfee_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTransfeeFree.class, reverseConvertGenerate = false) +public class TzTransfeeFreeBo extends BaseEntity { + + /** + * 指定条件包邮项id + */ + @NotNull(message = "指定条件包邮项id不能为空", groups = { EditGroup.class }) + private Long transfeeFreeId; + + /** + * 运费模板id + */ + @NotNull(message = "运费模板id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long transportId; + + /** + * 包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮) + */ + @NotNull(message = "包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer freeType; + + /** + * 需满金额 + */ + @NotNull(message = "需满金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal amount; + + /** + * 包邮x件/重量/体积 + */ + @NotNull(message = "包邮x件/重量/体积不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal piece; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransportBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransportBo.java new file mode 100644 index 0000000..c05ec78 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzTransportBo.java @@ -0,0 +1,60 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzTransport; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_transport + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzTransport.class, reverseConvertGenerate = false) +public class TzTransportBo extends BaseEntity { + + /** + * 运费模板id + */ + @NotNull(message = "运费模板id不能为空", groups = { EditGroup.class }) + private Long transportId; + + /** + * 运费模板名称 + */ + @NotBlank(message = "运费模板名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String transName; + + /** + * 店铺id + */ + @NotNull(message = "店铺id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long shopId; + + /** + * 收费方式(0 按件数,1 按重量 2 按体积) + */ + @NotNull(message = "收费方式(0 按件数,1 按重量 2 按体积)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer chargeType; + + /** + * 是否包邮 0:不包邮 1:包邮 + */ + @NotNull(message = "是否包邮 0:不包邮 1:包邮不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer isFreeFee; + + /** + * 是否含有包邮条件 0 否 1是 + */ + @NotNull(message = "是否含有包邮条件 0 否 1是不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer hasFreeCondition; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrBo.java new file mode 100644 index 0000000..e5ac199 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrBo.java @@ -0,0 +1,108 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzUserAddr; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 用户配送地址业务对象 tz_user_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzUserAddr.class, reverseConvertGenerate = false) +public class TzUserAddrBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long addrId; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 收货人 + */ + @NotBlank(message = "收货人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String receiver; + + /** + * 省ID + */ + @NotNull(message = "省ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long provinceId; + + /** + * 省 + */ + @NotBlank(message = "省不能为空", groups = { AddGroup.class, EditGroup.class }) + private String province; + + /** + * 城市 + */ + @NotBlank(message = "城市不能为空", groups = { AddGroup.class, EditGroup.class }) + private String city; + + /** + * 城市ID + */ + @NotNull(message = "城市ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long cityId; + + /** + * 区 + */ + @NotBlank(message = "区不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 区ID + */ + @NotNull(message = "区ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 邮编 + */ + @NotBlank(message = "邮编不能为空", groups = { AddGroup.class, EditGroup.class }) + private String postCode; + + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String addr; + + /** + * 手机 + */ + @NotBlank(message = "手机不能为空", groups = { AddGroup.class, EditGroup.class }) + private String mobile; + + /** + * 状态,1正常,0无效 + */ + @NotNull(message = "状态,1正常,0无效不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 是否默认地址 1是 + */ + @NotNull(message = "是否默认地址 1是不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer commonAddr; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrOrderBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrOrderBo.java new file mode 100644 index 0000000..4fff089 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddrOrderBo.java @@ -0,0 +1,102 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzUserAddrOrder; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 用户订单配送地址业务对象 tz_user_addr_order + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzUserAddrOrder.class, reverseConvertGenerate = false) +public class TzUserAddrOrderBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long addrOrderId; + + /** + * 地址ID + */ + @NotNull(message = "地址ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long addrId; + + /** + * 用户ID + */ + @NotBlank(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + /** + * 收货人 + */ + @NotBlank(message = "收货人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String receiver; + + /** + * 省ID + */ + @NotNull(message = "省ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long provinceId; + + /** + * 省 + */ + @NotBlank(message = "省不能为空", groups = { AddGroup.class, EditGroup.class }) + private String province; + + /** + * 区域ID + */ + @NotNull(message = "区域ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 区 + */ + @NotBlank(message = "区不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 城市ID + */ + @NotNull(message = "城市ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long cityId; + + /** + * 城市 + */ + @NotBlank(message = "城市不能为空", groups = { AddGroup.class, EditGroup.class }) + private String city; + + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String addr; + + /** + * 邮编 + */ + @NotBlank(message = "邮编不能为空", groups = { AddGroup.class, EditGroup.class }) + private String postCode; + + /** + * 手机 + */ + @NotBlank(message = "手机不能为空", groups = { AddGroup.class, EditGroup.class }) + private String mobile; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddressBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddressBo.java new file mode 100644 index 0000000..f021f73 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserAddressBo.java @@ -0,0 +1,54 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzUserAddress; + +/** + * 客户地址业务对象 tz_user_address + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzUserAddress.class, reverseConvertGenerate = false) +public class TzUserAddressBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 客户ID + */ + private Long userId; + + /** + * 收货人姓名 + */ + private String userName; + + /** + * 收货人电话 + */ + private String userPhone; + + /** + * 收货地址 + */ + private String userAddress; + + /** + * 是否默认 1:默认 2:非默认 + */ + private Long isDefault; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserBo.java new file mode 100644 index 0000000..9515b8e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserBo.java @@ -0,0 +1,210 @@ +package org.dromara.mall.domain.bo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.mall.domain.TzUser; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 用户业务对象 tz_user + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@AutoMapper(target = TzUser.class, reverseConvertGenerate = false) +public class TzUserBo { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long userId; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 用户邮箱 + */ + private String userMail; + + /** + * 登录密码 + */ + private String loginPassword; + + /** + * 支付密码 + */ + private String payPassword; + + /** + * 手机号码 + */ + private String userMobile; + + /** + * 身份证号码 + */ + private String idCard; + + /** + * 身份证正面 + */ + private String frontCard; + + /** + * 身份证反面 + */ + private String reverseCard; + + /** + * 余额 + */ + private BigDecimal balance; + + /** + * 抵扣金额 + */ + private BigDecimal deductionFee; + + /** + * 修改时间 + */ + private Date modifyTime; + + /** + * 注册时间 + */ + private Date userRegtime; + + /** + * 注册IP + */ + private String userRegip; + + /** + * 最后登录时间 + */ + private Date userLasttime; + + /** + * 最后登录IP + */ + private String userLastip; + + /** + * 备注 + */ + private String userMemo; + + /** + * M(男) or F(女) + */ + private String sex; + + /** + * 例如:2009-11-27 + */ + private String birthDate; + + /** + * 头像图片路径 + */ + private String pic; + + /** + * 状态 1 正常 0 无效 + */ + private Integer status; + + /** + * 用户积分 + */ + private Long score; + + /** + * 微信openId + */ + private String openId; + + /** + * 是否设计师 1:是 0:否 + */ + private Integer isDesigner; + + /** + * 设计师认证信息 + */ + private String sjsJson; + + /** + * 设计师审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer sjsFlag; + + /** + * 实名审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + private Integer examineFlag; + + /** + * 价格开关是否打开 1:打开 0:关闭 + */ + private Integer priceFlag; + + /** + * 是否是会员 1:是 0:否 + */ + private Integer isMember; + + /** + * 会员码 + */ + private String userCode; + + /** + * 会员有效期结束 + */ + private Date validTo; + + /** + * 调价比例 + */ + private String ratio; + + /** + * 拉卡拉用户ID + */ + private String custId; + + /** + * 证件起止日期 + */ + private String certExpirationDate; + + /** + * 请求参数 + */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @TableField(exist = false) + private Map params = new HashMap<>(); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserCollectionBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserCollectionBo.java new file mode 100644 index 0000000..c778d39 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserCollectionBo.java @@ -0,0 +1,42 @@ +package org.dromara.mall.domain.bo; + +import org.dromara.mall.domain.TzUserCollection; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 【请填写功能名称】业务对象 tz_user_collection + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzUserCollection.class, reverseConvertGenerate = false) +public class TzUserCollectionBo extends BaseEntity { + + /** + * 收藏表 + */ + @NotNull(message = "收藏表不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 商品id + */ + @NotNull(message = "商品id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long prodId; + + /** + * 用户id + */ + @NotBlank(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String userId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserSearchBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserSearchBo.java new file mode 100644 index 0000000..f2e1c80 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzUserSearchBo.java @@ -0,0 +1,55 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzUserSearch; + +import java.util.Date; + +/** + * 用户搜索业务对象 tz_user_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzUserSearch.class, reverseConvertGenerate = false) +public class TzUserSearchBo extends BaseEntity { + + /** + * ID + */ + @NotNull(message = "ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 搜索标题 + */ + @NotBlank(message = "搜索标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String title; + + /** + * 搜索次数 + */ + private Long num; + + /** + * 录入时间 + */ + @NotNull(message = "录入时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzWithdrawRequestBo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzWithdrawRequestBo.java new file mode 100644 index 0000000..7aa077b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/TzWithdrawRequestBo.java @@ -0,0 +1,167 @@ +package org.dromara.mall.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.mall.domain.TzWithdrawRequest; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 提现申请业务对象 tz_withdraw_request + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzWithdrawRequest.class, reverseConvertGenerate = false) +public class TzWithdrawRequestBo extends BaseEntity { + + /** + * 提现申请ID + */ + @NotNull(message = "提现申请ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + private Long userId; + + /** + * 租户ID + */ + private String tenantId; + + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + private Integer roleType; + + /** + * 提现金额 + */ + @NotNull(message = "提现金额不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal withdrawAmount; + + /** + * 提现前余额 + */ + private BigDecimal currentBalance; + + /** + * 提现状态: 1-待审核, 2-审核通过, 3-打款成功, 4-打款失败,5-审核拒绝 + */ + private Integer withdrawStatus; + + /** + * 支付方式(如银行卡/支付宝/微信) + */ + private String paymentMethod; + + /** + * 持卡人姓名 + */ + @NotNull(message = "持卡人姓名", groups = { AddGroup.class, EditGroup.class }) + private String cardHolderName; + + /** + * 银行名称 + */ + @NotNull(message = "银行名称", groups = { AddGroup.class, EditGroup.class }) + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 银行卡号 + */ + @NotNull(message = "银行卡号", groups = { AddGroup.class, EditGroup.class }) + private String cardNumber; + + /** + * 审核时间 + */ + private Date approveTime; + + /** + * 审核备注 + */ + private String remark; + + /** + * 审核人 + */ + private String approveBy; + + /** + * 个税税率 + */ + private BigDecimal taxRate; + + /** + * 个税税金 + */ + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + private BigDecimal sxfTaxAmount; + + /** + * 税后金额 + */ + private BigDecimal afterTaxAmount; + + /** + * 分账系统生成唯一流水 + */ + private String separateNo; + + /** + * 商户外部订单号 + */ + private String outSeparateNo; + + /** + * 分账接收方 + */ + private String receiverNo; + + /** + * 开票类型 1-开票,2-不开票 + */ + private Integer invoiceType; + + /** + * 发票链接 + */ + private String invoiceUrl; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java new file mode 100644 index 0000000..1a0ae56 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyBasketVo.java @@ -0,0 +1,124 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyBasket; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + + +/** + * 购物车视图对象 hy_basket + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyBasket.class) +public class HyBasketVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * SkuID + */ + @ExcelProperty(value = "SkuID") + private Long skuId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 产品个数 + */ + @ExcelProperty(value = "产品个数") + private Long num; + + /** + * 单价 + */ + @ExcelProperty(value = "单价") + private BigDecimal price; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 商品编号 + */ + @ExcelProperty(value = "商品编号") + private String prodCode; + + /** + * 商品名称 + */ + @ExcelProperty(value = "商品名称") + private String prodName; + + /** + * SKU名称 + */ + @ExcelProperty(value = "SKU名称") + private String skuName; + + /** + * SKU编号 + */ + @ExcelProperty(value = "SKU编号") + private String skuCode; + + /** + * SKU工厂编号 + */ + @ExcelProperty(value = "SKU工厂编号") + private String skuFactoryCode; + + /** + * SKU图片 + */ + @ExcelProperty(value = "SKU图片") + private String pic; + + /** + * SKU成本价格 + */ + @ExcelProperty(value = "SKU成本价格") + private BigDecimal oriPrice; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderSumVo.java new file mode 100644 index 0000000..683f269 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderSumVo.java @@ -0,0 +1,36 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class HyCodeOrderSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long totalNum; + + /** + * 购买总数量 + */ + private Long buyNum; + + /** + * 总金额 + */ + private BigDecimal totalPrice; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderVo.java new file mode 100644 index 0000000..c960866 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCodeOrderVo.java @@ -0,0 +1,135 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyCodeOrder; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 会员码订单视图对象 hy_code_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyCodeOrder.class) +public class HyCodeOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long id; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNo; + + /** + * 设计师ID + */ + @ExcelProperty(value = "设计师ID") + private Long userId; + + /** + * 邀请人ID + */ + @ExcelProperty(value = "邀请人ID") + private Long inviteUserId; + + /** + * 购买商户ID + */ + @ExcelProperty(value = "购买商户ID") + private Long merchantId; + + /** + * 推广员ID + */ + @ExcelProperty(value = "推广员ID") + private Long promoterId; + + /** + * 购买数量 + */ + @ExcelProperty(value = "购买数量") + private Long num; + + /** + * 单价 + */ + @ExcelProperty(value = "单价") + private BigDecimal price; + + /** + * 订单金额 + */ + @ExcelProperty(value = "订单金额") + private BigDecimal orderAmount; + + /** + * 订单状态: 1-待支付, 2-已支付, 3-已取消 + */ + @ExcelProperty(value = "订单状态: 1-待支付, 2-已支付, 3-已取消") + private Integer orderStatus; + + /** + * 支付时间 + */ + @ExcelProperty(value = "支付时间") + private Date paymentTime; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + @ExcelProperty(value = "购买人员类型:1-商户ID 2-推广员 3-设计师") + private Integer type; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 拉卡拉平台订单号 + */ + @ExcelProperty(value = "拉卡拉平台订单号") + private String payOrderNo; + + /** + * 推广员手机号 + */ + private String tgyPhone; + + /** + * 设计师手机号 + */ + private String sjsPhone; + + /** + * 邀请人手机号 + */ + private String yqrPhone; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCouponRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCouponRecordVo.java new file mode 100644 index 0000000..e30b6d0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyCouponRecordVo.java @@ -0,0 +1,85 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyCouponRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 会员券抵金记录视图对象 + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyCouponRecord.class) +public class HyCouponRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "记录ID") + private Long id; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 购买手机号码 + */ + @ExcelProperty(value = "手机号码") + private String phone; + + /** + * 变动金额(正数增加,负数减少) + */ + @ExcelProperty(value = "变动金额") + private BigDecimal amount; + + /** + * 变动后余额 + */ + @ExcelProperty(value = "变动后余额") + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-退回 + */ + @ExcelProperty(value = "变动类型") + private Integer type; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNum; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyMemberCodeVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyMemberCodeVo.java new file mode 100644 index 0000000..fdfcbe4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyMemberCodeVo.java @@ -0,0 +1,141 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyMemberCode; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 会员码兑换视图对象 hy_member_code + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyMemberCode.class) +public class HyMemberCodeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 设计师ID + */ + @ExcelProperty(value = "设计师ID") + private Long userId; + + /** + * 购买商户ID + */ + @ExcelProperty(value = "购买商户ID") + private Long merchantId; + + /** + * 推广员ID + */ + @ExcelProperty(value = "推广员ID") + private Long promoterId; + + /** + * 兑换时间 + */ + @ExcelProperty(value = "兑换时间") + private Date redeemTime; + + /** + * 兑换码有效期开始 + */ + @ExcelProperty(value = "兑换码有效期开始") + private Date validFrom; + + /** + * 兑换码有效期结束 + */ + @ExcelProperty(value = "兑换码有效期结束") + private Date validTo; + + /** + * 购买价格 + */ + @ExcelProperty(value = "购买价格") + private Long price; + + /** + * 会员ID + */ + @ExcelProperty(value = "会员ID") + private Long memberId; + + /** + * 会员兑换手机号码 + */ + @ExcelProperty(value = "会员兑换手机号码") + private String memberPhone; + + /** + * 兑换码 + */ + @ExcelProperty(value = "兑换码") + private String code; + + /** + * 兑换状态: 1-未兑换, 2-已兑换 + */ + @ExcelProperty(value = "兑换状态: 1-未兑换, 2-已兑换") + private Long status; + + /** + * 购买人员类型:1-商户ID 2-推广员 3-设计师 + */ + @ExcelProperty(value = "购买人员类型:1-商户ID 2-推广员 3-设计师") + private Integer type; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 是否复制 1-未复制 2-已复制 + */ + @ExcelProperty(value = "是否复制 1-未复制 2-已复制") + private Integer isCopy; + + /** + * 推广员手机号 + */ + private String tgyPhone; + + /** + * 设计师手机号 + */ + private String sjsPhone; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemSumVo.java new file mode 100644 index 0000000..a5b2c0e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemSumVo.java @@ -0,0 +1,45 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class HyOrderItemSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单总数量 + */ + private Long totalOrderNum; + + /** + * 订单总金额 + */ + private BigDecimal totalOrderPrice; + + /** + * 订单总运费 + */ + private BigDecimal totalOrderFreight; + + /** + * 待发货数量 + */ + private Long waitSendNum; + + /** + * 订单成本价总额 + */ + private BigDecimal totalOrderCostPrice; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemVo.java new file mode 100644 index 0000000..1333e56 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderItemVo.java @@ -0,0 +1,276 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyOrderItem; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 订单详情视图对象 hy_order_item + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyOrderItem.class) +public class HyOrderItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long id; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNum; + + /** + * 订单汇总ID + */ + @ExcelProperty(value = "订单汇总ID") + private Long orderId; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * 产品编码 + */ + @ExcelProperty(value = "产品编码") + private String prodCode; + + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String prodName; + + /** + * skuID + */ + @ExcelProperty(value = "skuID") + private Long skuId; + + /** + * sku编码 + */ + @ExcelProperty(value = "sku编码") + private String skuCode; + + /** + * sku厂家编码 + */ + @ExcelProperty(value = "sku厂家编码") + private String skuFactoryCode; + + /** + * sku名称 + */ + @ExcelProperty(value = "sku名称") + private String skuName; + + /** + * sku图片路径 + */ + @ExcelProperty(value = "sku图片路径") + private String pic; + + /** + * 销售员ID + */ + @ExcelProperty(value = "销售员ID") + private Long saleId; + + /** + * 采购员ID + */ + @ExcelProperty(value = "采购员ID") + private Long buyerId; + + /** + * 订购用户ID + */ + @ExcelProperty(value = "订购用户ID") + private Long userId; + + /** + * 订购用户姓名 + */ + @ExcelProperty(value = "订购用户姓名") + private String userName; + + /** + * 订单商品总数 + */ + @ExcelProperty(value = "订单商品总数") + private Long num; + + /** + * 单价 + */ + @ExcelProperty(value = "单价") + private BigDecimal price; + + /** + * 订单金额 + */ + @ExcelProperty(value = "订单金额") + private BigDecimal total; + + /** + * 抵扣金额 + */ + @ExcelProperty(value = "抵扣金额") + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + @ExcelProperty(value = "成本金额") + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + @ExcelProperty(value = "支付状态 1:待支付 2:未付清 3:已付清") + private Long payState; + + /** + * 支付类型 0:手动代付 1: 微信支付 2:支付宝 + */ + @ExcelProperty(value = "支付类型 0:手动代付 1: 微信支付 2:支付宝") + private Long payType; + + /** + * 订单备注 + */ + @ExcelProperty(value = "订单备注") + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + @ExcelProperty(value = "订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭") + private Long status; + + /** + * 物流单号 + */ + @ExcelProperty(value = "物流单号") + private String dvyFlowId; + + /** + * 订单运费 + */ + @ExcelProperty(value = "订单运费") + private Long dvyPrice; + + /** + * 发货地 + */ + @ExcelProperty(value = "发货地") + private String deliveryLocat; + + /** + * 收货人姓名 + */ + @ExcelProperty(value = "收货人姓名") + private String clientName; + + /** + * 收货人电话 + */ + @ExcelProperty(value = "收货人电话") + private String clientPhone; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String clientAddress; + + /** + * 付款时间 + */ + @ExcelProperty(value = "付款时间") + private Date payTime; + + /** + * 发货时间 + */ + @ExcelProperty(value = "发货时间") + private Date dvyTime; + + /** + * 完成时间 + */ + @ExcelProperty(value = "完成时间") + private Date finallyTime; + + /** + * 取消时间 + */ + @ExcelProperty(value = "取消时间") + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + @ExcelProperty(value = "0:默认 1:在处理 2:处理完成") + private Long refundSts; + + /** + * 1:未评价 2:已评价 + */ + @ExcelProperty(value = "1:未评价 2:已评价") + private Long appraisalFlag; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + @ExcelProperty(value = "订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消") + private Long closeType; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 是否开票 1:未开票 2:已开票 + */ + @ExcelProperty(value = "是否开票 1:未开票 2:已开票") + private Integer isSfkp; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymenSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymenSumVo.java new file mode 100644 index 0000000..40fe5da --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymenSumVo.java @@ -0,0 +1,45 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class HyOrderPaymenSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long totalNum; + + /** + * 总提现金额 + */ + private BigDecimal totalAmount; + + /** + * 待打款数量 + */ + private Long dshNum; + + /** + * 已打款数量 + */ + private Long ydkNum; + + /** + * 审核拒绝数量 + */ + private Long sjyNum; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymentVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymentVo.java new file mode 100644 index 0000000..e9a2707 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderPaymentVo.java @@ -0,0 +1,150 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyOrderPayment; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 订单打款视图对象 hy_order_payment + * + * @author Maosw + * @date 2024-12-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyOrderPayment.class) +public class HyOrderPaymentVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 租户ID + */ + @ExcelProperty(value = "租户ID") + private String tenantId; + + /** + * 租户名称 + */ + @ExcelProperty(value = "租户名称") + private String tenantName; + + /** + * 订单ID集合 + */ +// @ExcelProperty(value = "订单ID集合") +// private String orderIds; + + /** + * 订单编号集合 + */ +// @ExcelProperty(value = "订单编号集合") +// private String orderNums; + + /** + * 财务ID + */ + @ExcelProperty(value = "财务ID") + private Long cwId; + + /** + * 财务姓名 + */ + @ExcelProperty(value = "财务姓名") + private String cwName; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal total; + + /** + * 提现前余额 + */ + @ExcelProperty(value = "提现前余额") + private BigDecimal currentBalance; + + /** + * 状态 1:待付款 2:已付款 3:审核拒绝 + */ + @ExcelProperty(value = "状态 1:待付款 2:已付款 3:审核拒绝") + private Integer status; + + /** + * 付款截图 + */ + @ExcelProperty(value = "付款截图") + private String paymentImg; + + /** + * 描述 + */ + @ExcelProperty(value = "描述") + private String depict; + + /** + * 收款人姓名 + */ + @ExcelProperty(value = "收款人姓名") + private String payeeName; + + /** + * 收款银行名称 + */ + @ExcelProperty(value = "收款银行名称") + private String payeeBank; + + /** + * 收款银行卡号 + */ + @ExcelProperty(value = "收款银行卡号") + private String payeeBankNum; + + /** + * 打款时间 + */ + @ExcelProperty(value = "打款时间") + private Date payTime; + + /** + * 1:打款给厂家 2:退款给买家 + */ + @ExcelProperty(value = "1:打款给厂家 2:退款给买家") + private Integer type; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 发票链接 + */ + private String invoiceUrl; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderSumVo.java new file mode 100644 index 0000000..55e6dee --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderSumVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class HyOrderSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单总数量 + */ + private Long totalOrderNum; + + /** + * 商品总数量 + */ + private Long prodTotalNum; + + /** + * 订单总金额 + */ + private BigDecimal totalOrderPrice; + + /** + * 抵扣金总金额 + */ + private BigDecimal totalDeductionPrice; + + /** + * 实际支付总金额 + */ + private BigDecimal totalPayPrice; + + /** + * 成本总金额 + */ + private BigDecimal totalCostPrice; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderVo.java new file mode 100644 index 0000000..0babdab --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyOrderVo.java @@ -0,0 +1,175 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyOrder; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 总订单视图对象 hy_order + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyOrder.class) +public class HyOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNum; + + /** + * 销售员ID + */ + @ExcelProperty(value = "销售员ID") + private Long saleId; + + /** + * 采购员ID + */ + @ExcelProperty(value = "采购员ID") + private Long buyerId; + + /** + * 订购用户ID + */ + @ExcelProperty(value = "订购用户ID") + private Long userId; + + /** + * 订购用户号码 + */ + @ExcelProperty(value = "订购用户号码") + private String userPhone; + + /** + * 订购用户姓名 + */ + @ExcelProperty(value = "订购用户姓名") + private String userName; + + /** + * 订单商品总数 + */ + @ExcelProperty(value = "订单商品总数") + private Long num; + + /** + * 订单金额 + */ + @ExcelProperty(value = "订单金额") + private BigDecimal total; + + /** + * 抵扣金额 + */ + @ExcelProperty(value = "抵扣金额") + private BigDecimal deductionFee; + + /** + * 成本金额 + */ + @ExcelProperty(value = "成本金额") + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal payPrice; + + /** + * 支付状态 1:待支付 2:未付清 3:已付清 + */ + @ExcelProperty(value = "支付状态 1:待支付 2:未付清 3:已付清") + private Long payState; + + /** + * 订单备注 + */ + @ExcelProperty(value = "订单备注") + private String remarks; + + /** + * 订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭 + */ + @ExcelProperty(value = "订单状态 1:待付款 2:待发货 3:待收货 4:待评价 5:已评价 6:已完成 7:已关闭") + private Long status; + + /** + * 收货人姓名 + */ + @ExcelProperty(value = "收货人姓名") + private String clientName; + + /** + * 收货人电话 + */ + @ExcelProperty(value = "收货人电话") + private String clientPhone; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String clientAddress; + + /** + * 发货时间 + */ + @ExcelProperty(value = "发货时间") + private Date dvyTime; + + /** + * 完成时间 + */ + @ExcelProperty(value = "完成时间") + private Date finallyTime; + + /** + * 取消时间 + */ + @ExcelProperty(value = "取消时间") + private Date cancelTime; + + /** + * 0:默认 1:在处理 2:处理完成 + */ + @ExcelProperty(value = "0:默认 1:在处理 2:处理完成") + private Long refundSts; + + /** + * 订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消 + */ + @ExcelProperty(value = "订单关闭原因 1:超时未支付 2:退款关闭 3:填错信息 4:买家取消") + private Long closeType; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterRecordVo.java new file mode 100644 index 0000000..3bd818b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterRecordVo.java @@ -0,0 +1,75 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.HyPromoterRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + + +/** + * 推广员资金记录视图对象 hy_promoter_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyPromoterRecord.class) +public class HyPromoterRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long id; + + /** + * 推广员ID + */ + @ExcelProperty(value = "推广员ID") + private Long promoterId; + + /** + * 变动金额(正数增加,负数减少) + */ + @ExcelProperty(value = "变动金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正=数增加,负数减少") + private BigDecimal amount; + + /** + * 变动后余额 + */ + @ExcelProperty(value = "变动后余额") + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + @ExcelProperty(value = "变动类型: 1-增加, 2-扣除, 3-提现, 4-其他") + private Long type; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterSumVo.java new file mode 100644 index 0000000..a61520f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterSumVo.java @@ -0,0 +1,29 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class HyPromoterSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总人数 + */ + private Long totalNum; + + /** + * 推广总人数 + */ + private Long promoterNum; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterVo.java new file mode 100644 index 0000000..1a274ec --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyPromoterVo.java @@ -0,0 +1,136 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.HyPromoter; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 推广员视图对象 hy_promoter + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyPromoter.class) +public class HyPromoterVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 推广员名称 + */ + @ExcelProperty(value = "推广员名称") + private String name; + + /** + * 推广员编号 + */ + @ExcelProperty(value = "推广员编号") + private String code; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String phone; + + /** + * 登录密码 + */ + @ExcelProperty(value = "登录密码") + private String password; + + /** + * 推广人数 + */ + @ExcelProperty(value = "推广人数") + private Long num; + + /** + * 标识: 1-企业, 2-个人 + */ + @ExcelProperty(value = "标识: 1-企业, 2-个人") + private Long typeFlag; + + /** + * 个人所属企业ID + */ + @ExcelProperty(value = "个人所属企业ID") + private Long parentId; + + /** + * 账户余额 + */ + @ExcelProperty(value = "账户余额") + private Long balance; + + /** + * 状态: 1-启用, 2-禁用 + */ + @ExcelProperty(value = "状态: 1-启用, 2-禁用") + private Long status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + @ExcelProperty(value = "审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝") + private Integer examineFlag; + + /** + * 真实姓名 + */ + @ExcelProperty(value = "真实姓名") + private String realName; + + /** + * 身份证号码 + */ + @ExcelProperty(value = "身份证号码") + private String idCard; + + /** + * 身份证正面 + */ + @ExcelProperty(value = "身份证正面") + private String frontCard; + + /** + * 身份证反面 + */ + @ExcelProperty(value = "身份证反面") + private String reverseCard; + + /** + * 订单数量 + */ + @ExcelProperty(value = "订单数量") + private Long orderNum; + + /** + * 订单总金额 + */ + @ExcelProperty(value = "订单总金额") + private BigDecimal orderTotal; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyUserRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyUserRecordVo.java new file mode 100644 index 0000000..cc65bb8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/HyUserRecordVo.java @@ -0,0 +1,135 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.HyUserRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 用户资金记录视图对象 hy_user_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = HyUserRecord.class) +public class HyUserRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long id; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 订购用户姓名 + */ + @ExcelProperty(value = "订购用户姓名") + private String userName; + + /** + * 订购用户手机号 + */ + @ExcelProperty(value = "订购用户手机号") + private String userPhone; + + /** + * 变动金额(正数增加,负数减少) + */ + @ExcelProperty(value = "变动金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正=数增加,负数减少") + private BigDecimal amount; + + /** + * 变动后余额 + */ + @ExcelProperty(value = "变动后余额") + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + @ExcelProperty(value = "变动类型: 1-增加, 2-扣除, 3-提现, 4-其他") + private Integer type; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 个税税率 + */ + @ExcelProperty(value = "个税税率") + private BigDecimal taxRate; + + /** + * 个税税金 + */ + @ExcelProperty(value = "个税税金") + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + @ExcelProperty(value = "增值税税率") + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + @ExcelProperty(value = "增值税税金") + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + @ExcelProperty(value = "手续费费率") + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + @ExcelProperty(value = "手续费金额") + private BigDecimal sxfTaxAmount; + + + /** + * 税后金额 + */ + @ExcelProperty(value = "税后金额") + private BigDecimal afterTaxAmount; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexCountVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexCountVo.java new file mode 100644 index 0000000..cef7bef --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexCountVo.java @@ -0,0 +1,120 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 首页统计管理视图对象 + * + * @author Maosw + * @date 2024-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class IndexCountVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总销售额 + */ + private BigDecimal totalSales; + + /** + * 当月销售额 + */ + private BigDecimal monthSales; + + /** + * 总订单数 + */ + private Long orderCount; + + /** + * 当月订单数 + */ + private Long orderMonthCount; + + /** + * 产品总数 + */ + private Long productCount; + + /** + * 产品当月新增数量 + */ + private Long productMonthCount; + + /** + * 小程序用户数量 + */ + private Long wxUserCount; + + /** + * 小程序用户当月新增数量 + */ + private Long wxUserMonthCount; + + /** + * 渠道数量 + */ + private Long channelCount; + + /** + * 渠道当月新增数量 + */ + private Long channelMonthCount; + + /** + * 厂家数量 + */ + private Long factoryCount; + + /** + * 厂家当月新增数量 + */ + private Long factoryMonthCount; + + /** + * 会员码总销量 + */ + private Long memberCodeCount; + + /** + * 会员码当月销量 + */ + private Long memberCodeMonthCount; + + /** + * 会员码已兑换数量 + */ + private Long memberCodeExchangeCount; + + /** + * 会员码销售额 + */ + private BigDecimal memberCodeSales; + + /** + * 待付款金额 + */ + private BigDecimal payPrice; + + /** + * 待发货订单数 + */ + private Long dvyCount; + + /** + * 可提现金额 + */ + private BigDecimal withdrawPrice; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexSumVo.java new file mode 100644 index 0000000..4a02232 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/IndexSumVo.java @@ -0,0 +1,95 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 首页统计管理视图对象 + * + * @author Maosw + * @date 2024-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class IndexSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + + /** + * 当天销售额 + */ + private BigDecimal dtxseSum; + + /** + * 当天已到款 + */ + private BigDecimal dtydkSum; + + /** + * 本月销售额 + */ + private BigDecimal byxseSum; + + /** + * 本月已到款 + */ + private BigDecimal byydkSum; + + /** + * 本年销售额 + */ + private BigDecimal bnxseSum; + + /** + * 本年已到款 + */ + private BigDecimal bnydkSum; + + /** + * 产品总数 + */ + private Long cpCount; + + /** + * 本月新增产品数量 + */ + private Long byxzCpCount; + + /** + * 客户总数 + */ + private Long khCount; + + /** + * 本月新增客户数量 + */ + private Long byxzKhCount; + + /** + * 商家提现待审核数量 + */ + private Long dfkddCount; + + /** + * 会员提现待审核数量 + */ + private Long hhdshCount; + + /** + * 已完成订单数量 + */ + private Long ywcddCount; + + /** + * 待采购订单 + */ + private Long dcgddCount; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/PerSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/PerSumVo.java new file mode 100644 index 0000000..c792787 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/PerSumVo.java @@ -0,0 +1,36 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 报表理视图对象 + * + * @author Maosw + * @date 2024-08-12 + */ +@Data +@ExcelIgnoreUnannotated +public class PerSumVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 类型 + */ + private String type; + + /** + * 金额 + */ + private BigDecimal sum; + + /** + * 数量 + */ + private Long num; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/RankSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/RankSumVo.java new file mode 100644 index 0000000..f09ae58 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/RankSumVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ExcelIgnoreUnannotated +public class RankSumVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private Long userId; + + /** + * 客户姓名 + */ + private String userName; + + /** + * 金额 + */ + private BigDecimal sum; + + /** + * 产品ID + */ + private Long prodId; + + /** + * 商品编码 + */ + private String prodCode; + + /** + * 商品名称 + */ + private String prodName; + + /** + * 数量 + */ + private Long count; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAgreementVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAgreementVo.java new file mode 100644 index 0000000..84ac41c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAgreementVo.java @@ -0,0 +1,59 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzAgreement; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 协议视图对象 tz_agreement + * + * @author Maosw + * @date 2024-12-26 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzAgreement.class) +public class TzAgreementVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String title; + + /** + * 内容 + */ + @ExcelProperty(value = "内容") + private String content; + + /** + * code值 + */ + @ExcelProperty(value = "code值") + private String code; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAreaVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAreaVo.java new file mode 100644 index 0000000..cd08e4f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAreaVo.java @@ -0,0 +1,53 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzArea; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 地区视图对象 tz_area + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzArea.class) +public class TzAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long areaId; + + /** + * + */ + @ExcelProperty(value = "") + private String areaName; + + /** + * + */ + @ExcelProperty(value = "") + private Long parentId; + + /** + * + */ + @ExcelProperty(value = "") + private Long level; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAttachFileVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAttachFileVo.java new file mode 100644 index 0000000..4c1b426 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzAttachFileVo.java @@ -0,0 +1,76 @@ +package org.dromara.mall.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mall.domain.TzAttachFile; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_attach_file + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzAttachFile.class) +public class TzAttachFileVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long fileId; + + /** + * 文件路径 + */ + @ExcelProperty(value = "文件路径") + private String filePath; + + /** + * 文件类型 + */ + @ExcelProperty(value = "文件类型") + private String fileType; + + /** + * 文件大小 + */ + @ExcelProperty(value = "文件大小") + private Integer fileSize; + + /** + * 上传时间 + */ + @ExcelProperty(value = "上传时间") + private Date uploadTime; + + /** + * 文件关联的表主键id + */ + @ExcelProperty(value = "文件关联的表主键id") + private Long fileJoinId; + + /** + * 文件关联表类型:1 商品表 FileJoinType + */ + @ExcelProperty(value = "文件关联表类型:1 商品表 FileJoinType") + private Integer fileJoinType; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBankCardVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBankCardVo.java new file mode 100644 index 0000000..ef111da --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBankCardVo.java @@ -0,0 +1,121 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzBankCard; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 绑定银行卡信息视图对象 tz_bank_card + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzBankCard.class) +public class TzBankCardVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 银行卡信息ID + */ + @ExcelProperty(value = "银行卡信息ID") + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + @ExcelProperty(value = "用户ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "租=户/商户/推广员/会员") + private Long userId; + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + @ExcelProperty(value = "角色类型: 1-租户, 2-商户, 3-推广员, 4-会员") + private Integer roleType; + + /** + * 持卡人姓名 + */ + @ExcelProperty(value = "持卡人姓名") + private String cardHolderName; + + /** + * 银行名称 + */ + @ExcelProperty(value = "银行名称") + private String bankName; + + /** + * 支行名称 + */ + @ExcelProperty(value = "支行名称") + private String branchName; + + /** + * 银行卡号 + */ + @ExcelProperty(value = "银行卡号") + private String cardNumber; + + /** + * 卡类型: 1-借记卡, 2-信用卡 + */ + @ExcelProperty(value = "卡类型: 1-借记卡, 2-信用卡") + private Integer cardType; + + /** + * 是否默认: 1-是,2-否 + */ + @ExcelProperty(value = "是否默认: 1-是,2-否") + private Integer isDefault; + + /** + * 状态: 1-正常, 2-停用 + */ + @ExcelProperty(value = "状态: 1-正常, 2-停用") + private Integer status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 拉卡拉订单编号 + */ + @ExcelProperty(value = "拉卡拉订单编号") + private String orderNo; + + /** + * 拉卡拉接收方编号 + */ + @ExcelProperty(value = "拉卡拉接收方编号") + private String receiverNo; + + /** + * 拉卡拉绑定订单编号 + */ + @ExcelProperty(value = "拉卡拉绑定订单编号") + private String bdOrderNo; + + /** + * 拉卡拉受理编号 + */ + @ExcelProperty(value = "拉卡拉受理编号") + private String applyId; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBasketVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBasketVo.java new file mode 100644 index 0000000..add5b15 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBasketVo.java @@ -0,0 +1,88 @@ +package org.dromara.mall.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mall.domain.TzBasket; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 购物车视图对象 tz_basket + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzBasket.class) +public class TzBasketVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long basketId; + + /** + * 店铺ID + */ + @ExcelProperty(value = "店铺ID") + private Long shopId; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * SkuID + */ + @ExcelProperty(value = "SkuID") + private Long skuId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 购物车产品个数 + */ + @ExcelProperty(value = "购物车产品个数") + private Long basketCount; + + /** + * 购物时间 + */ + @ExcelProperty(value = "购物时间") + private Date basketDate; + + /** + * 满减活动ID + */ + @ExcelProperty(value = "满减活动ID") + private Long discountId; + + /** + * 分销推广人卡号 + */ + @ExcelProperty(value = "分销推广人卡号") + private String distributionCardNo; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBrandVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBrandVo.java new file mode 100644 index 0000000..108c523 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzBrandVo.java @@ -0,0 +1,65 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzBrand; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 品牌视图对象 tz_brand + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzBrand.class) +public class TzBrandVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 品牌名称 + */ + @ExcelProperty(value = "品牌名称") + private String name; + + /** + * 图片路径 + */ + @ExcelProperty(value = "图片路径") + private String pic; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 顺序 + */ + @ExcelProperty(value = "顺序") + private Long seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + @ExcelProperty(value = "默认是1,表示正常状态,0为下线状态") + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryBrandVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryBrandVo.java new file mode 100644 index 0000000..244cd90 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryBrandVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzCategoryBrand; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_category_brand + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzCategoryBrand.class) +public class TzCategoryBrandVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 分类id + */ + @ExcelProperty(value = "分类id") + private Long categoryId; + + /** + * 品牌id + */ + @ExcelProperty(value = "品牌id") + private Long brandId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryPropVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryPropVo.java new file mode 100644 index 0000000..1b41253 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryPropVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzCategoryProp; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_category_prop + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzCategoryProp.class) +public class TzCategoryPropVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 分类id + */ + @ExcelProperty(value = "分类id") + private Long categoryId; + + /** + * 商品属性id即表tz_prod_prop中的prop_id + */ + @ExcelProperty(value = "商品属性id即表tz_prod_prop中的prop_id") + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryVo.java new file mode 100644 index 0000000..985b2f4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCategoryVo.java @@ -0,0 +1,96 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzCategory; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 产品类目视图对象 tz_category + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzCategory.class) +public class TzCategoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类目ID + */ + @ExcelProperty(value = "类目ID") + private Long categoryId; + + /** + * 店铺ID + */ + @ExcelProperty(value = "店铺ID") + private Long shopId; + + /** + * 父节点 + */ + @ExcelProperty(value = "父节点") + private Long parentId; + + /** + * 产品类目名称 + */ + @ExcelProperty(value = "产品类目名称") + private String categoryName; + + /** + * 类目图标 + */ + @ExcelProperty(value = "类目图标") + private String icon; + + /** + * 类目的显示图片 + */ + @ExcelProperty(value = "类目的显示图片") + private String pic; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long seq; + + /** + * 默认是1,表示正常状态,0为下线状态 + */ + @ExcelProperty(value = "默认是1,表示正常状态,0为下线状态") + private Long status; + + /** + * 记录时间 + */ + @ExcelProperty(value = "记录时间") + private Date recTime; + + /** + * 分类层级 + */ + @ExcelProperty(value = "分类层级") + private Long grade; + + /** + * 是否有子集 0:没有 1:有 + */ + @ExcelProperty(value = "是否有子集 0:没有 1:有") + private Long subset; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerRecordVo.java new file mode 100644 index 0000000..52ce847 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerRecordVo.java @@ -0,0 +1,79 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzCustomerRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 客户资金记录视图对象 tz_customer_record + * + * @author Maosw + * @date 2024-09-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzCustomerRecord.class) +public class TzCustomerRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 客户ID + */ + @ExcelProperty(value = "客户ID") + private Long userId; + + /** + * 客户姓名 + */ + @ExcelProperty(value = "客户姓名") + private String userName; + + /** + * 账变类型1:充值 2:支出 3:退款 + */ + @ExcelProperty(value = "账变类型1:充值 2:支出 3:退款") + private Integer type; + + /** + * 变动金额 + */ + @ExcelProperty(value = "变动金额") + private BigDecimal price; + + /** + * 变动后余额 + */ + @ExcelProperty(value = "变动后余额") + private BigDecimal balance; + + /** + * 描述 + */ + @ExcelProperty(value = "描述") + private String depict; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerSumVo.java new file mode 100644 index 0000000..fdbefcb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerSumVo.java @@ -0,0 +1,26 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ExcelIgnoreUnannotated +public class TzCustomerSumVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户数量 + */ + private Long count; + + /** + * 余额汇总 + */ + private BigDecimal sum; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerVo.java new file mode 100644 index 0000000..b34a86f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzCustomerVo.java @@ -0,0 +1,109 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzCustomer; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * 客户视图对象 tz_customer + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzCustomer.class) +public class TzCustomerVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 客服ID + */ + @ExcelProperty(value = "客服ID") + private Long userId; + + /** + * 客服编号 + */ + @ExcelProperty(value = "客服编号") + private String userCode; + + /** + * 客服姓名 + */ + @ExcelProperty(value = "客服姓名") + private String userName; + + /** + * 客户编号 + */ + @ExcelProperty(value = "客户编号") + private String code; + + /** + * 客户姓名 + */ + @ExcelProperty(value = "客户姓名") + private String name; + + /** + * 电话号码 + */ + @ExcelProperty(value = "电话号码") + private String phone; + + /** + * 余额 + */ + @ExcelProperty(value = "余额") + private BigDecimal balance; + + /** + * 性别 0:女 1:男 + */ + @ExcelProperty(value = "性别 0:女 1:男") + private Integer sex; + + /** + * 客户类型 + */ + @ExcelProperty(value = "客户类型") + private Integer type; + + /** + * 状态(0正常 1禁用) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=正常,1=禁用") + private Integer state; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 还需支付金额 + */ + @ExcelProperty(value = "余额") + private BigDecimal price; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzDeliveryVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzDeliveryVo.java new file mode 100644 index 0000000..36a968b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzDeliveryVo.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzDelivery; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 物流公司视图对象 tz_delivery + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzDelivery.class) +public class TzDeliveryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 物流公司名称 + */ + @ExcelProperty(value = "物流公司名称") + private String name; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzHotSearchVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzHotSearchVo.java new file mode 100644 index 0000000..b90b4bf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzHotSearchVo.java @@ -0,0 +1,78 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzHotSearch; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 热搜视图对象 tz_hot_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzHotSearch.class) +public class TzHotSearchVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long hotSearchId; + + /** + * 店铺ID 0为全局热搜 + */ + @ExcelProperty(value = "店铺ID 0为全局热搜") + private Long shopId; + + /** + * 热搜标题 + */ + @ExcelProperty(value = "热搜标题") + private String title; + + /** + * 搜索次数 + */ + @ExcelProperty(value = "搜索次数") + private Long num; + + /** + * 状态 0下线 1上线 + */ + @ExcelProperty(value = "状态 0下线 1上线") + private Long status; + + /** + * 内容 + */ + @ExcelProperty(value = "内容") + private String content; + + /** + * 顺序 + */ + @ExcelProperty(value = "顺序") + private Long seq; + + /** + * 录入时间 + */ + @ExcelProperty(value = "录入时间") + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzIndexImgVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzIndexImgVo.java new file mode 100644 index 0000000..9e07535 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzIndexImgVo.java @@ -0,0 +1,90 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzIndexImg; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 主页轮播图视图对象 tz_index_img + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzIndexImg.class) +public class TzIndexImgVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long imgId; + + /** + * 图片 + */ + @ExcelProperty(value = "图片") + private String imgUrl; + + /** + * 说明文字,描述 + */ + @ExcelProperty(value = "说明文字,描述") + private String des; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String title; + + /** + * 链接 + */ + @ExcelProperty(value = "链接") + private String link; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private Integer status; + + /** + * 顺序 + */ + @ExcelProperty(value = "顺序") + private Integer seq; + + /** + * 上传时间 + */ + @ExcelProperty(value = "上传时间") + private Date uploadTime; + + /** + * 关联 + */ + @ExcelProperty(value = "关联") + private Long relation; + + /** + * 类型 + */ + @ExcelProperty(value = "类型") + private Integer type; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoicApplySumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoicApplySumVo.java new file mode 100644 index 0000000..30655f4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoicApplySumVo.java @@ -0,0 +1,40 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class TzInvoicApplySumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long totalNum; + + /** + * 总金额 + */ + private BigDecimal totalAmount; + + /** + * 待开票数量 + */ + private Long dshNum; + + /** + * 已开票数量 + */ + private Long ydkNum; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceApplyVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceApplyVo.java new file mode 100644 index 0000000..e0aee22 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceApplyVo.java @@ -0,0 +1,139 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzInvoiceApply; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 发票申请记录视图对象 tz_invoice_apply + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzInvoiceApply.class) +public class TzInvoiceApplyVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 发票申请编号 + */ + @ExcelProperty(value = "发票申请编号") + private String invoiceNo; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 发票抬头id + */ + @ExcelProperty(value = "发票抬头id") + private Long invoiceTitleId; + + /** + * 发票抬头信息JSON + */ + @ExcelProperty(value = "发票抬头信息JSON") + private String invoiceTitleJson; + + /** + * 发票类型(1-电子普票,2-电子专票) + */ + @ExcelProperty(value = "发票类型(1-电子普票,2-电子专票)") + private Integer invoiceType; + + /** + * 发票内容 + */ + @ExcelProperty(value = "发票内容") + private String invoiceContent; + + /** + * 开票金额 + */ + @ExcelProperty(value = "开票金额") + private BigDecimal invoiceAmount; + + /** + * 关联订单号(多个逗号分隔) + */ + @ExcelProperty(value = "关联订单号(多个逗号分隔)") + private String orderIds; + + /** + * 关联订单编号(多个逗号分隔) + */ + @ExcelProperty(value = "关联订单编号(多个逗号分隔)") + private String orderNos; + + /** + * 接收邮箱 + */ + @ExcelProperty(value = "接收邮箱") + private String email; + + /** + * 开票状态(1-待开票,2-开票中,3-已开票,4-开票失败,5-已取消) + */ + @ExcelProperty(value = "开票状态(1-待开票,2-开票中,3-已开票,4-开票失败,5-已取消)") + private Integer status; + + /** + * 电子发票下载地址 + */ + @ExcelProperty(value = "电子发票下载地址") + private String invoiceUrl; + + /** + * 失败原因 + */ + @ExcelProperty(value = "失败原因") + private String failReason; + + /** + * 开票时间 + */ + @ExcelProperty(value = "开票时间") + private Date invoiceTime; + + /** + * 删除标志(1代表存在 2代表删除) + */ + @ExcelProperty(value = "删除标志(1代表存在 2代表删除)") + private Integer delFlag; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceTitleVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceTitleVo.java new file mode 100644 index 0000000..7b36086 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzInvoiceTitleVo.java @@ -0,0 +1,101 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzInvoiceTitle; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 发票抬头信息视图对象 tz_invoice_title + * + * @author Maosw + * @date 2024-12-25 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzInvoiceTitle.class) +public class TzInvoiceTitleVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 抬头类型(1-个人,2-企业) + */ + @ExcelProperty(value = "抬头类型(1-个人,2-企业)") + private Integer type; + + /** + * 发票抬头名称 + */ + @ExcelProperty(value = "发票抬头名称") + private String titleName; + + /** + * 税号 + */ + @ExcelProperty(value = "税号") + private String taxNumber; + + /** + * 单位地址 + */ + @ExcelProperty(value = "单位地址") + private String companyAddress; + + /** + * 单位电话 + */ + @ExcelProperty(value = "单位电话") + private String companyPhone; + + /** + * 开户银行 + */ + @ExcelProperty(value = "开户银行") + private String bankName; + + /** + * 银行账号 + */ + @ExcelProperty(value = "银行账号") + private String bankAccount; + + /** + * 是否默认(1-是,2-否) + */ + @ExcelProperty(value = "是否默认(1-是,2-否)") + private Integer isDefault; + + /** + * 接收邮箱 + */ + @ExcelProperty(value = "接收邮箱") + private String email; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzMessageVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzMessageVo.java new file mode 100644 index 0000000..903c8e2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzMessageVo.java @@ -0,0 +1,71 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzMessage; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 消息视图对象 tz_message + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzMessage.class) +public class TzMessageVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 姓名 + */ + @ExcelProperty(value = "姓名") + private String userName; + + /** + * 邮箱 + */ + @ExcelProperty(value = "邮箱") + private String email; + + /** + * 联系方式 + */ + @ExcelProperty(value = "联系方式") + private String contact; + + /** + * 留言内容 + */ + @ExcelProperty(value = "留言内容") + private String content; + + /** + * 留言回复 + */ + @ExcelProperty(value = "留言回复") + private String reply; + + /** + * 状态:0:未审核 1审核通过 + */ + @ExcelProperty(value = "状态:0:未审核 1审核通过") + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzNoticeVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzNoticeVo.java new file mode 100644 index 0000000..ed61c2e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzNoticeVo.java @@ -0,0 +1,70 @@ +package org.dromara.mall.domain.vo; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzNotice; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 公告视图对象 tz_notice + * + * @author Maosw + * @date 2025-01-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzNotice.class) +public class TzNoticeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 公告id + */ + @ExcelProperty(value = "公告id") + private Long id; + + /** + * 公告标题 + */ + @ExcelProperty(value = "公告标题") + private String title; + + /** + * 公告内容 + */ + @ExcelProperty(value = "公告内容") + private String content; + + /** + * 状态(0:未发布,1:已发布) + */ + @ExcelProperty(value = "状态(0:未发布,1:已发布)") + private Integer status; + + /** + * 是否置顶(0:未置顶,1:已置顶) + */ + @ExcelProperty(value = "是否置顶", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=:未置顶,1:已置顶") + private Integer isTop; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderAllVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderAllVo.java new file mode 100644 index 0000000..e2a110f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderAllVo.java @@ -0,0 +1,174 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrderAll; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 订单汇总视图对象 tz_order_all + * + * @author Maosw + * @date 2024-09-04 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderAll.class) +public class TzOrderAllVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNum; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 客服ID + */ + @ExcelProperty(value = "客服ID") + private Long saleId; + + /** + * 客服姓名 + */ + @ExcelProperty(value = "客服姓名") + private String sName; + + /** + * 订购用户姓名 + */ + @ExcelProperty(value = "订购用户姓名") + private String cName; + + /** + * 采购员ID + */ + @ExcelProperty(value = "采购员ID") + private Long buyerId; + + /** + * 订购用户ID + */ + @ExcelProperty(value = "订购用户ID") + private Long userId; + + /** + * 订单金额 + */ + @ExcelProperty(value = "订单金额") + private BigDecimal total; + + /** + * 成本金额 + */ + @ExcelProperty(value = "成本金额") + private BigDecimal actualTotal; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal payPrice; + + /** + * 尾款金额 + */ + @ExcelProperty(value = "尾款金额") + private BigDecimal endPrice; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + @ExcelProperty(value = "支付状态 1:待支付 2未付清 3:已付清") + private Integer payState; + + /** + * 订单备注 + */ + @ExcelProperty(value = "订单备注") + private String remarks; + + /** + * 订单状态 1:待付款 2:交易中 3:交易成功 4:订单关闭 + */ + @ExcelProperty(value = "订单状态 1:待付款 2:交易中 3:交易成功 4:订单关闭") + private Integer status; + + /** + * 收货人姓名 + */ + @ExcelProperty(value = "收货人姓名") + private String userName; + + /** + * 收货人电话 + */ + @ExcelProperty(value = "收货人电话") + private String userPhone; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String userAddress; + + /** + * 订单商品总数 + */ + @ExcelProperty(value = "订单商品总数") + private Integer productNums; + + /** + * 完成时间 + */ + @ExcelProperty(value = "完成时间") + private Date finallyTime; + + /** + * 取消时间 + */ + @ExcelProperty(value = "取消时间") + private Date cancelTime; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + @ExcelProperty(value = "0:默认,1:在处理,2:处理完成") + private Integer refundSts; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + @ExcelProperty(value = "订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消") + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + @ExcelProperty(value = "用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除") + private Integer deleteStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderItemVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderItemVo.java new file mode 100644 index 0000000..deca474 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderItemVo.java @@ -0,0 +1,131 @@ +package org.dromara.mall.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mall.domain.TzOrderItem; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 订单项视图对象 tz_order_item + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderItem.class) +public class TzOrderItemVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单项ID + */ + @ExcelProperty(value = "订单项ID") + private Long orderItemId; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + /** + * 订单order_number + */ + @ExcelProperty(value = "订单order_number") + private String orderNumber; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * 产品SkuID + */ + @ExcelProperty(value = "产品SkuID") + private Long skuId; + + /** + * 购物车产品个数 + */ + @ExcelProperty(value = "购物车产品个数") + private Long prodCount; + + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String prodName; + + /** + * sku名称 + */ + @ExcelProperty(value = "sku名称") + private String skuName; + + /** + * 产品主图片路径 + */ + @ExcelProperty(value = "产品主图片路径") + private String pic; + + /** + * 产品价格 + */ + @ExcelProperty(value = "产品价格") + private BigDecimal price; + + /** + * 用户Id + */ + @ExcelProperty(value = "用户Id") + private String userId; + + /** + * 商品总金额 + */ + @ExcelProperty(value = "商品总金额") + private BigDecimal productTotalAmount; + + /** + * 购物时间 + */ + @ExcelProperty(value = "购物时间") + private Date recTime; + + /** + * 评论状态: 0 未评价 1 已评价 + */ + @ExcelProperty(value = "评论状态: 0 未评价 1 已评价") + private Integer commSts; + + /** + * 推广员使用的推销卡号 + */ + @ExcelProperty(value = "推广员使用的推销卡号") + private String distributionCardNo; + + /** + * 加入购物车时间 + */ + @ExcelProperty(value = "加入购物车时间") + private Date basketDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderPaymentSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderPaymentSumVo.java new file mode 100644 index 0000000..3c7784f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderPaymentSumVo.java @@ -0,0 +1,35 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ExcelIgnoreUnannotated +public class TzOrderPaymentSumVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 总打款金额 + */ + private BigDecimal zdkje; + + /** + * 总打款金额 + */ + private BigDecimal yfje; + + + /** + * 总打款金额 + */ + private BigDecimal wfje; + + + /** + * 退款金额 + */ + private BigDecimal tkje; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveSumVo.java new file mode 100644 index 0000000..13c51ae --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveSumVo.java @@ -0,0 +1,44 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ExcelIgnoreUnannotated +public class TzOrderReceiveSumVo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long zsl; + + /** + * 待认领数量 + */ + private Long drlsh; + + /** + * 总金额 + */ + private BigDecimal zje; + + /** + * 待认领金额 + */ + private BigDecimal drlje; + + /** + * 作废数量 + */ + private Long zfsl; + + /** + * 作废金额 + */ + private BigDecimal zfje; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveVo.java new file mode 100644 index 0000000..6fb5f43 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderReceiveVo.java @@ -0,0 +1,115 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrderReceive; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 订单汇款视图对象 tz_order_receive + * + * @author Maosw + * @date 2024-09-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderReceive.class) +public class TzOrderReceiveVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + + /** + * 客户ID + */ + @ExcelProperty(value = "客户ID") + private Long cId; + + + /** + * 客户姓名 + */ + @ExcelProperty(value = "客户姓名") + private String cName; + + + /** + * 客服ID + */ + @ExcelProperty(value = "客服ID") + private Long userId; + + /** + * 客服姓名 + */ + @ExcelProperty(value = "客服姓名") + private String userName; + + /** + * 财务操作人姓名 + */ + @ExcelProperty(value = "财务操作人姓名") + private String cwName; + + /** + * 付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal total; + + /** + * 状态 1:待领款 2:已领款 + */ + @ExcelProperty(value = "状态 1:待领款 2:已领款") + private Integer status; + + /** + * 描述 + */ + @ExcelProperty(value = "描述") + private String depict; + + /** + * 付款截图 + */ + @ExcelProperty(value = "付款截图") + private String paymentImg; + + /** + * 1:汇款 + */ + @ExcelProperty(value = "1:汇款") + private Integer type; + + /** + * 收款信息 + */ + @ExcelProperty(value = "收款信息") + private String receiveInfo; + + /** + * 认领时间 + */ + @ExcelProperty(value = "认领时间") + private Date adoptTime; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRecordVo.java new file mode 100644 index 0000000..27e4239 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRecordVo.java @@ -0,0 +1,89 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrderRecord; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 订单历史记录视图对象 tz_order_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderRecord.class) +public class TzOrderRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 订单汇总ID + */ + @ExcelProperty(value = "订单汇总ID") + private Long allId; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private String orderId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 用户名 + */ + @ExcelProperty(value = "用户名") + private String userName; + + /** + * 操作类型 + */ + @ExcelProperty(value = "操作类型") + private String type; + + /** + * 操作内容 + */ + @ExcelProperty(value = "操作内容") + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + @ExcelProperty(value = "操作状态 1:记录 2:节点") + private Long state; + + /** + * 修改前json + */ + @ExcelProperty(value = "修改前json") + private String oldJson; + + /** + * 修改后json + */ + @ExcelProperty(value = "修改后json") + private String newJson; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRefundVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRefundVo.java new file mode 100644 index 0000000..cd76546 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderRefundVo.java @@ -0,0 +1,198 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrderRefund; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 订单资金视图对象 tz_order_refund + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderRefund.class) +public class TzOrderRefundVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long refundId; + + /** + * 店铺ID + */ + @ExcelProperty(value = "店铺ID") + private Long shopId; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 订单流水号 + */ + @ExcelProperty(value = "订单流水号") + private String orderNumber; + + /** + * 订单总金额 + */ + @ExcelProperty(value = "订单总金额") + private Long orderAmount; + + /** + * 订单项ID 全部退款是0 + */ + @ExcelProperty(value = "订单项ID 全部退款是0") + private Long orderItemId; + + /** + * 退款编号 + */ + @ExcelProperty(value = "退款编号") + private String refundSn; + + /** + * 订单支付流水号 + */ + @ExcelProperty(value = "订单支付流水号") + private String flowTradeNo; + + /** + * 第三方退款单号(微信退款单号) + */ + @ExcelProperty(value = "第三方退款单号(微信退款单号)") + private String outRefundNo; + + /** + * 订单支付方式 1 微信支付 2 支付宝 + */ + @ExcelProperty(value = "订单支付方式 1 微信支付 2 支付宝") + private Long payType; + + /** + * 订单支付名称 + */ + @ExcelProperty(value = "订单支付名称") + private String payTypeName; + + /** + * 买家ID + */ + @ExcelProperty(value = "买家ID") + private String userId; + + /** + * 退货数量 + */ + @ExcelProperty(value = "退货数量") + private Long goodsNum; + + /** + * 退款金额 + */ + @ExcelProperty(value = "退款金额") + private Long refundAmount; + + /** + * 申请类型:1,仅退款,2退款退货 + */ + @ExcelProperty(value = "申请类型:1,仅退款,2退款退货") + private Long applyType; + + /** + * 处理状态:1为待审核,2为同意,3为不同意 + */ + @ExcelProperty(value = "处理状态:1为待审核,2为同意,3为不同意") + private Long refundSts; + + /** + * 处理退款状态: 0:退款处理中 1:退款成功 -1:退款失败 + */ + @ExcelProperty(value = "处理退款状态: 0:退款处理中 1:退款成功 -1:退款失败") + private Long returnMoneySts; + + /** + * 申请时间 + */ + @ExcelProperty(value = "申请时间") + private Date applyTime; + + /** + * 卖家处理时间 + */ + @ExcelProperty(value = "卖家处理时间") + private Date handelTime; + + /** + * 退款时间 + */ + @ExcelProperty(value = "退款时间") + private Date refundTime; + + /** + * 文件凭证json + */ + @ExcelProperty(value = "文件凭证json") + private String photoFiles; + + /** + * 申请原因 + */ + @ExcelProperty(value = "申请原因") + private String buyerMsg; + + /** + * 卖家备注 + */ + @ExcelProperty(value = "卖家备注") + private String sellerMsg; + + /** + * 物流公司名称 + */ + @ExcelProperty(value = "物流公司名称") + private String expressName; + + /** + * 物流单号 + */ + @ExcelProperty(value = "物流单号") + private String expressNo; + + /** + * 发货时间 + */ + @ExcelProperty(value = "发货时间") + private Date shipTime; + + /** + * 收货时间 + */ + @ExcelProperty(value = "收货时间") + private Date receiveTime; + + /** + * 收货备注 + */ + @ExcelProperty(value = "收货备注") + private String receiveMessage; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSettlementVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSettlementVo.java new file mode 100644 index 0000000..828ac1e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSettlementVo.java @@ -0,0 +1,101 @@ +package org.dromara.mall.domain.vo; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mall.domain.TzOrderSettlement; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_order_settlement + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderSettlement.class) +public class TzOrderSettlementVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 支付结算单据ID + */ + @ExcelProperty(value = "支付结算单据ID") + private Long settlementId; + + /** + * 支付单号 + */ + @ExcelProperty(value = "支付单号") + private String payNo; + + /** + * 外部订单流水号 + */ + @ExcelProperty(value = "外部订单流水号") + private String bizPayNo; + + /** + * order表中的订单号 + */ + @ExcelProperty(value = "order表中的订单号") + private String orderNumber; + + /** + * 支付方式 1 微信支付 2 支付宝 + */ + @ExcelProperty(value = "支付方式 1 微信支付 2 支付宝") + private Integer payType; + + /** + * 支付方式名称 + */ + @ExcelProperty(value = "支付方式名称") + private String payTypeName; + + /** + * 支付金额 + */ + @ExcelProperty(value = "支付金额") + private BigDecimal payAmount; + + /** + * 是否清算 0:否 1:是 + */ + @ExcelProperty(value = "是否清算 0:否 1:是") + private Integer isClearing; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 清算时间 + */ + @ExcelProperty(value = "清算时间") + private Date clearingTime; + + /** + * 支付状态 + */ + @ExcelProperty(value = "支付状态") + private Integer payStatus; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderShareVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderShareVo.java new file mode 100644 index 0000000..ae4a29f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderShareVo.java @@ -0,0 +1,72 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrderShare; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 订单分享视图对象 tz_order_share + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrderShare.class) +public class TzOrderShareVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 租户姓名 + */ + @ExcelProperty(value = "租户姓名") + private String tenantName; + + /** + * 采购ID + */ + @ExcelProperty(value = "采购ID") + private Long userId; + + /** + * 用户名 + */ + @ExcelProperty(value = "用户名") + private String userName; + + /** + * 订单内容 + */ + @ExcelProperty(value = "订单内容") + private String content; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 过期时间 + */ + @ExcelProperty(value = "过期时间") + private Date expireTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSumVo.java new file mode 100644 index 0000000..23dada1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderSumVo.java @@ -0,0 +1,70 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ExcelIgnoreUnannotated +public class TzOrderSumVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 订单总数量(客服,采购) + */ + private Long ddzsl; + + + /** + * 待付款数量(客服) + */ + private Long dfksl; + + + /** + * 订单总金额(客服,采购) + */ + private BigDecimal ddzje; + + + /** + * 待付款金额(客服) + */ + private BigDecimal dfkje; + + + /** + * 待采购数量(采购) + */ + private Long dcgsl; + + + /** + * 待发货数量(客服,采购) + */ + private Long dfhsl; + + /** + * 待收货数量(客服,采购) + */ + private Long dshsl; + + /** + * 待确认数量(采购) + */ + private Long dqrsl; + + /** + * 已付款金额(客服) + */ + private BigDecimal yfkje; + + /** + * 已完成订单数量(客服,采购) + */ + private Long ywcddsl; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderVo.java new file mode 100644 index 0000000..f4589bc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzOrderVo.java @@ -0,0 +1,363 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzOrder; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 订单视图对象 tz_order + * + * @author Maosw + * @date 2024-08-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzOrder.class) +public class TzOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 租户ID + */ + @ExcelProperty(value = "租户ID") + private String tenantId; + + /** + * 租户名称 + */ + @ExcelProperty(value = "租户名称") + private String tenantName; + + /** + * 订单汇总ID + */ + @ExcelProperty(value = "订单汇总ID") + private Long allId; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * 产品编码 + */ + @ExcelProperty(value = "产品编码") + private String prodCode; + + /** + * 产品名称,多个产品将会以逗号隔开 + */ + @ExcelProperty(value = "产品名称,多个产品将会以逗号隔开") + private String prodName; + + /** + * skuID + */ + @ExcelProperty(value = "skuID") + private Long skuId; + + /** + * SKU编码 + */ + @ExcelProperty(value = "SKU编码") + private String skuCode; + + /** + * sku厂家编码 + */ + @ExcelProperty(value = "sku厂家编码") + private String skuFactoryCode; + + /** + * SKU名称 + */ + @ExcelProperty(value = "SKU名称") + private String skuName; + + /** + * sku图片路径 + */ + @ExcelProperty(value = "sku图片路径") + private String pic; + + /** + * 客服ID + */ + @ExcelProperty(value = "客服ID") + private Long saleId; + + /** + * 采购员ID + */ + @ExcelProperty(value = "采购员ID") + private Long buyerId; + + /** + * 客户ID + */ + @ExcelProperty(value = "订购用户ID") + private Long userId; + + /** + * 客户姓名 + */ + @ExcelProperty(value = "客户姓名") + private String cname; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNum; + + /** + * 单价 + */ + @ExcelProperty(value = "单价") + private BigDecimal price; + + /** + * 订单金额 + */ + @ExcelProperty(value = "订单金额") + private BigDecimal total; + + /** + * 成本金额 + */ + @ExcelProperty(value = "成本金额") + private BigDecimal actualTotal; + + /** + *付款金额 + */ + @ExcelProperty(value = "付款金额") + private BigDecimal payPrice; + + /** + * 尾款金额 + */ + @ExcelProperty(value = "尾款金额") + private BigDecimal endPrice; + + /** + * 成本付款金额 + */ + @ExcelProperty(value = "成本付款金额") + private BigDecimal actualPayPrice; + + /** + * 支付状态 1:待支付 2未付清 3:已付清 + */ + @ExcelProperty(value = "支付状态 1:待支付 2未付清 3:已付清") + private Integer payState; + + + /** + * 成本支付状态 1:待打款 2未付清 3:已付清 + */ + @ExcelProperty(value = "成本支付状态 1:待打款 2未付清 3:已付清") + private Integer actualPayState; + + /** + * 支付方式 0 手动代付 1 微信支付 2 支付宝 + */ + @ExcelProperty(value = "支付方式 0 手动代付 1 微信支付 2 支付宝") + private Integer payType; + + /** + * 订单备注 + */ + @ExcelProperty(value = "订单备注") + private String remarks; + + /** + * 订单状态 1:待付款 2:待采购 3:待发货 4:待收货 5:已签收 6:交易成功 7:订单关闭 + */ + @ExcelProperty(value = "订单状态 1:待付款 2:待采购 3:待发货 4:待收货 5:已签收 6:交易成功 7:订单关闭") + private Integer status; + + /** + * 重量或体积 + */ + @ExcelProperty(value = "重量或体积") + private String dvyType; + + /** + * 运费金额 + */ + @ExcelProperty(value = "运费金额") + private BigDecimal dvyPrice; + + /** + * 物流单号 + */ + @ExcelProperty(value = "物流单号") + private String dvyFlowId; + + /** + * 订单运费 + */ + @ExcelProperty(value = "订单运费") + private BigDecimal freightAmount; + + /** + * 发货地 + */ + private String deliveryLocat; + + /** + * 收货人姓名 + */ + @ExcelProperty(value = "收货人姓名") + private String userName; + + /** + * 收货人电话 + */ + @ExcelProperty(value = "收货人电话") + private String userPhone; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String userAddress; + + /** + * 订单商品总数 + */ + @ExcelProperty(value = "订单商品总数") + private Integer productNums; + + /** + * 订购时间 + */ + @ExcelProperty(value = "订购时间") + private Date createTime; + + /** + * 订单更新时间 + */ + @ExcelProperty(value = "订单更新时间") + private Date updateTime; + + /** + * 付款时间 + */ + @ExcelProperty(value = "付款时间") + private Date payTime; + + /** + * 发货时间 + */ + @ExcelProperty(value = "发货时间") + private Date dvyTime; + + /** + * 完成时间 + */ + @ExcelProperty(value = "完成时间") + private Date finallyTime; + + /** + * 取消时间 + */ + @ExcelProperty(value = "取消时间") + private Date cancelTime; + + /** + * 是否已经打款给厂家,1:已打款 0:未打款 + */ + @ExcelProperty(value = "是否已经打款给厂家,1:已打款 0:未打款") + private Integer isPayed; + + /** + * 0:默认,1:在处理,2:处理完成 + */ + @ExcelProperty(value = "0:默认,1:在处理,2:处理完成") + private Integer refundSts; + + /** + * 付款截图 + */ + @ExcelProperty(value = "付款截图") + private String paymentImg; + + /** + * 拒绝原因 + */ + @ExcelProperty(value = "拒绝原因") + private String reason; + + /** + * 优惠总额 + */ + @ExcelProperty(value = "优惠总额") + private BigDecimal reduceAmount; + + /** + * 订单类型 + */ + @ExcelProperty(value = "订单类型") + private Integer orderType; + + /** + * 订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消 + */ + @ExcelProperty(value = "订单关闭原因 1-超时未支付 2-退款关闭 3-填错信息 4-买家取消") + private Integer closeType; + + /** + * 用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除 + */ + @ExcelProperty(value = "用户订单删除状态,0:没有删除, 1:回收站, 2:永久删除") + private Integer deleteStatus; + + /** + * 客服姓名 + */ + private String sname; + + /** + * 采购员姓名 + */ + private String bname; + + /** + * 单位字典值 + */ + private String unit; + + /** + * 原价 + */ + private BigDecimal oriPrice; + + /** + * 已付比例 + */ + @ExcelProperty(value = "已付比例") + private String bili; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPickAddrVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPickAddrVo.java new file mode 100644 index 0000000..efba21a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPickAddrVo.java @@ -0,0 +1,98 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzPickAddr; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户配送地址视图对象 tz_pick_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzPickAddr.class) +public class TzPickAddrVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long addrId; + + /** + * 自提点名称 + */ + @ExcelProperty(value = "自提点名称") + private String addrName; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String addr; + + /** + * 手机 + */ + @ExcelProperty(value = "手机") + private String mobile; + + /** + * 省份ID + */ + @ExcelProperty(value = "省份ID") + private Long provinceId; + + /** + * 省份 + */ + @ExcelProperty(value = "省份") + private String province; + + /** + * 城市ID + */ + @ExcelProperty(value = "城市ID") + private Long cityId; + + /** + * 城市 + */ + @ExcelProperty(value = "城市") + private String city; + + /** + * 区/县ID + */ + @ExcelProperty(value = "区/县ID") + private Long areaId; + + /** + * 区/县 + */ + @ExcelProperty(value = "区/县") + private String area; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPictureAlbumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPictureAlbumVo.java new file mode 100644 index 0000000..d60f619 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzPictureAlbumVo.java @@ -0,0 +1,80 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzPictureAlbum; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 画册视图对象 tz_picture_album + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzPictureAlbum.class) +public class TzPictureAlbumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 分类字典值 + */ + @ExcelProperty(value = "分类字典值") + private String type; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String title; + + /** + * 封面图片 + */ + @ExcelProperty(value = "封面图片") + private String icon; + + /** + * 文件地址 + */ + @ExcelProperty(value = "文件地址") + private String url; + + /** + * 状态(1正常 0关闭) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=正常,0=关闭") + private Long status; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdBrowseVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdBrowseVo.java new file mode 100644 index 0000000..c73cbfb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdBrowseVo.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdBrowse; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 商品浏览视图对象 tz_prod_browse + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdBrowse.class) +public class TzProdBrowseVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 商品ID + */ + @ExcelProperty(value = "商品ID") + private Long prodId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java new file mode 100644 index 0000000..cd0bc9a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdCommVo.java @@ -0,0 +1,113 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdComm; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 商品评论视图对象 tz_prod_comm + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdComm.class) +public class TzProdCommVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 商品ID + */ + @ExcelProperty(value = "商品ID") + private Long prodId; + + /** + * 商品名称 + */ + @ExcelProperty(value = "商品名称") + private String prodName; + + /** + * 订单 ID + */ + @ExcelProperty(value = "订单 ID") + private Long orderId; + + /** + * 订单项ID + */ + @ExcelProperty(value = "订单项ID") + private Long orderItemId; + + /** + * 评论用户ID + */ + @ExcelProperty(value = "评论用户ID") + private Long userId; + + /** + * 订购用户姓名 + */ + @ExcelProperty(value = "订购用户姓名") + private String userName; + + /** + * 评论内容 + */ + @ExcelProperty(value = "评论内容") + private String content; + + /** + * 得分,0-5分 + */ + @ExcelProperty(value = "得分,0-5分") + private Long score; + + /** + * 晒图的json字符串 + */ + @ExcelProperty(value = "晒图的json字符串") + private String pics; + + /** + * 是否匿名(1:是 0:否) + */ + @ExcelProperty(value = "是否匿名(1:是 0:否)") + private Long isAnonymous; + + /** + * 是否显示,1:为显示,0:待审核, -1:不通过审核,不显示。 如果需要审核评论,则是0,,否则1 + */ + @ExcelProperty(value = "是否显示,1:为显示,0:待审核, -1:不通过审核,不显示。 如果需要审核评论,则是0,,否则1") + private Long status; + + /** + * 用户头像 + */ + @ExcelProperty(value = "用户头像") + private String userAvatar; + + /** + * 评论时间 + */ + @ExcelProperty(value = "评论时间") + private Date createTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdFavoriteVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdFavoriteVo.java new file mode 100644 index 0000000..dd3de20 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdFavoriteVo.java @@ -0,0 +1,54 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdFavorite; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 商品收藏视图对象 tz_prod_favorite + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdFavorite.class) +public class TzProdFavoriteVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long favoriteId; + + /** + * 商品ID + */ + @ExcelProperty(value = "商品ID") + private Long prodId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 收藏时间 + */ + @ExcelProperty(value = "收藏时间") + private Date recTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropValueVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropValueVo.java new file mode 100644 index 0000000..13e4e43 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropValueVo.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdPropValue; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 商品规格子规格视图对象 tz_prod_prop_value + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdPropValue.class) +public class TzProdPropValueVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 属性值ID + */ + @ExcelProperty(value = "属性值ID") + private Long valueId; + + /** + * 属性值名称 + */ + @ExcelProperty(value = "属性值名称") + private String propValue; + + /** + * 属性ID + */ + @ExcelProperty(value = "属性ID") + private Long propId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropVo.java new file mode 100644 index 0000000..85059d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdPropVo.java @@ -0,0 +1,60 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdProp; +import org.dromara.mall.domain.TzProdPropValue; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + + +/** + * 商品规格视图对象 tz_prod_prop + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdProp.class) +public class TzProdPropVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 属性id + */ + @ExcelProperty(value = "属性id") + private Long propId; + + /** + * 属性名称 + */ + @ExcelProperty(value = "属性名称") + private String propName; + + /** + * ProdPropRule 1:销售属性(规格); 2:参数属性; + */ + @ExcelProperty(value = "ProdPropRule 1:销售属性(规格); 2:参数属性;") + private Long rule; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + /** + * 规格属性值集合 + */ + @ExcelProperty(value = "规格属性值集合") + private List prodPropValues; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRecordVo.java new file mode 100644 index 0000000..effb05f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRecordVo.java @@ -0,0 +1,89 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdRecord; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 产品价格记录视图对象 tz_prod_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdRecord.class) +public class TzProdRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * 单品ID + */ + @ExcelProperty(value = "单品ID") + private Long skuId; + + /** + * 修改人ID + */ + @ExcelProperty(value = "修改人ID") + private Long userId; + + /** + * 修改人姓名 + */ + @ExcelProperty(value = "修改人姓名") + private String userName; + + /** + * 修改人类型1:商家 2:采购员 + */ + @ExcelProperty(value = "修改人类型1:商家 2:采购员") + private Long type; + + /** + * 修改前价格 + */ + @ExcelProperty(value = "修改前价格") + private Long oldPrice; + + /** + * 修改后价格 + */ + @ExcelProperty(value = "修改后价格") + private Long newPrice; + + /** + * 操作内容 + */ + @ExcelProperty(value = "操作内容") + private String content; + + /** + * 操作状态 1:记录 2:节点 + */ + @ExcelProperty(value = "操作状态 1:记录 2:节点") + private Long state; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRelationVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRelationVo.java new file mode 100644 index 0000000..e803765 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdRelationVo.java @@ -0,0 +1,47 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProdRelation; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 商品推荐关联视图对象 tz_prod_relation + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdRelation.class) +public class TzProdRelationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 商品ID + */ + @ExcelProperty(value = "商品ID") + private Long prodId; + + /** + * 关联商品ID + */ + @ExcelProperty(value = "关联商品ID") + private Long glProdId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdSumVo.java new file mode 100644 index 0000000..57dc17b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdSumVo.java @@ -0,0 +1,30 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ExcelIgnoreUnannotated +public class TzProdSumVo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 产品数量 + */ + private Long cpsl; + + /** + * 销量总计 + */ + private Long xlzj; + + /** + * 待审核数量 + */ + private Long dshNum; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagReferenceVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagReferenceVo.java new file mode 100644 index 0000000..99cf517 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagReferenceVo.java @@ -0,0 +1,62 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzProdTagReference; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_prod_tag_reference + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdTagReference.class) +public class TzProdTagReferenceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 分组引用id + */ + @ExcelProperty(value = "分组引用id") + private Long referenceId; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + /** + * 标签id + */ + @ExcelProperty(value = "标签id") + private Long tagId; + + /** + * 商品id + */ + @ExcelProperty(value = "商品id") + private Long prodId; + + /** + * 状态(1:正常,0:删除) + */ + @ExcelProperty(value = "状态(1:正常,0:删除)") + private Integer status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagVo.java new file mode 100644 index 0000000..abbb0c4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdTagVo.java @@ -0,0 +1,88 @@ +package org.dromara.mall.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.mall.domain.TzProdTag; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 商品分组视图对象 tz_prod_tag + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdTag.class) +public class TzProdTagVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 分组标签id + */ + @ExcelProperty(value = "分组标签id") + private Long id; + + /** + * 分组标题 + */ + @ExcelProperty(value = "分组标题") + private String title; + + /** + * 店铺Id + */ + @ExcelProperty(value = "店铺Id") + private Long shopId; + + /** + * 状态(1为正常,0为删除) + */ + @ExcelProperty(value = "状态(1为正常,0为删除)") + private Integer status; + + /** + * 默认类型(0:商家自定义,1:系统默认) + */ + @ExcelProperty(value = "默认类型(0:商家自定义,1:系统默认)") + private Integer isDefault; + + /** + * 商品数量 + */ + @ExcelProperty(value = "商品数量") + private Long prodCount; + + /** + * 列表样式(0:一列一个,1:一列两个,2:一列三个) + */ + @ExcelProperty(value = "列表样式(0:一列一个,1:一列两个,2:一列三个)") + private Integer style; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Integer seq; + + /** + * 删除时间 + */ + @ExcelProperty(value = "删除时间") + private Date deleteTime; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java new file mode 100644 index 0000000..f7ba747 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdVo.java @@ -0,0 +1,293 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzProd; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + + +/** + * 产品视图对象 tz_prod + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProd.class) +public class TzProdVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 产品ID + */ + @ExcelProperty(value = "产品ID") + private Long prodId; + + /** + * 品牌ID + */ + @ExcelProperty(value = "品牌ID") + private Long brandId; + + /** + * 商品厂家编号 + */ + @ExcelProperty(value = "商品厂家编号") + private String prodFactoryCode; + + /** + * 商品编号 + */ + @ExcelProperty(value = "商品编号") + private String prodCode; + + /** + * 商品名称 + */ + @ExcelProperty(value = "商品名称") + private String prodName; + + /** + * 商品指导价 + */ + @ExcelProperty(value = "商品指导价") + private BigDecimal guidingPrice; + + /** + * 商品展示价 + */ + @ExcelProperty(value = "商品展示价") + private BigDecimal price; + + /** + * 商品成本价 + */ + @ExcelProperty(value = "商品成本价") + private BigDecimal oriPrice; + + /** + * 单位 + */ + @ExcelProperty(value = "单位") + private String unit; + + /** + * 简要描述,卖点等 + */ + @ExcelProperty(value = "简要描述,卖点等") + private String brief; + + /** + * 详细描述 + */ + @ExcelProperty(value = "详细描述") + private String content; + + /** + * 工厂展示 + */ + @ExcelProperty(value = "工厂展示") + private String factory; + + /** + * 售后保障 + */ + @ExcelProperty(value = "售后保障") + private String afterSales; + + /** + * 场景展示 + */ + @ExcelProperty(value = "场景展示") + private String cjzs; + + /** + * 工艺流程展示 + */ + @ExcelProperty(value = "工艺流程展示") + private String gylczs; + + /** + * 商品主图 + */ + @ExcelProperty(value = "商品主图") + private String pic; + + /** + * 商品图片,以,分割 + */ + @ExcelProperty(value = "商品图片,以,分割") + private String imgs; + + /** + * 视频地址 + */ + @ExcelProperty(value = "视频地址") + private String video; + + /** + * 默认是1,表示正常状态, -1表示删除, 0下架 + */ + @ExcelProperty(value = "默认是1,表示正常状态, -1表示删除, 0下架") + private Long status; + + /** + * 商品分类 + */ + @ExcelProperty(value = "商品分类") + private Long categoryId; + + /** + * 商品参数json + */ + @ExcelProperty(value = "商品参数json") + private String prodParame; + + /** + * 产地 + */ + @ExcelProperty(value = "产地") + private String factoryAddress; + + /** + * 销量 + */ + @ExcelProperty(value = "销量") + private Long soldNum; + + /** + * 总库存 + */ + @ExcelProperty(value = "总库存") + private Long totalStocks; + + /** + * 配送方式json见TransportModeVO + */ + @ExcelProperty(value = "配送方式json见TransportModeVO") + private String deliveryMode; + + /** + * 上架时间 + */ + @ExcelProperty(value = "上架时间") + private Date putawayTime; + + /** + * 浏览量 + */ + @ExcelProperty(value = "浏览量") + private Long browseNum; + + /** + * 收藏量 + */ + @ExcelProperty(value = "收藏量") + private Long collectNum; + + /** + * 规格JSON + */ + @ExcelProperty(value = "规格JSON") + private String prodProp; + + /** + * 装箱率 + */ + @ExcelProperty(value = "装箱率") + private Long packingRate; + + /** + * 是否特价 1:是 2:否 + */ + @ExcelProperty(value = "是否低价 1:是 2:否") + private Long isFloor; + + /** + * 配送方式 1:物流点自提 2:配送上门 + */ + @ExcelProperty(value = "配送方式 1:物流点自提 2:配送上门") + private Long isDvy; + + /** + * 发货天数 + */ + @ExcelProperty(value = "发货天数") + private Long dvyDay; + + /** + * 审核状态 1:待审核 2:已通过 3:已拒绝 + */ + @ExcelProperty(value = "审核状态 1:待审核 2:已通过 3:已拒绝") + private Long examineFlag; + + /** + * 分类名称 + */ + @ExcelProperty(value = "分类名称") + private String categoryName; + + /** + * 租户名称 + */ + @ExcelProperty(value = "租户名称") + private String tenantName; + + /** + * 品牌名称 + */ + @ExcelProperty(value = "品牌名称") + private Long brandName; + + /** + * 是否已经收藏 0:未收藏 1:已收藏 + */ + private Long isCollect; + + /** + * sku列表字符串 + */ + private List skuList; + + /** + * 租户编号 + */ + private String tenantId; + + + /** + * 标签 0:默认 1:性价比 2:品质款 3:旗舰款 + */ + @ExcelProperty(value = "标签 0:默认 1:性价比 2:品质款 3:旗舰款") + private Integer label; + + /** + * 订单数量 + */ + @ExcelProperty(value = "订单数量") + private Long orderNum; + + /** + * 订单总金额 + */ + @ExcelProperty(value = "订单总金额") + private BigDecimal orderTotal; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdWishlistVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdWishlistVo.java new file mode 100644 index 0000000..9ba2f39 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzProdWishlistVo.java @@ -0,0 +1,89 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzProdWishlist; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 心愿单视图对象 + * + * @author Lion Li + * @date 2024-01-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzProdWishlist.class) +public class TzProdWishlistVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 心愿单记录ID + */ + @ExcelProperty(value = "心愿单记录ID") + private Long id; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 用户姓名 + */ + @ExcelProperty(value = "用户姓名") + private String userName; + + /** + * 用户号码 + */ + @ExcelProperty(value = "用户号码") + private String userPhone; + + /** + * 产品名称 + */ + @ExcelProperty(value = "产品名称") + private String prodName; + + /** + * 产品图片 + */ + @ExcelProperty(value = "产品图片") + private String prodPic; + + /** + * 产品描述 + */ + @ExcelProperty(value = "产品描述") + private String prodDescription; + + /** + * 产品类别 + */ + @ExcelProperty(value = "产品类别") + private String category; + + /** + * 状态 + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=已提交,2=已采纳,3=已上货,4=未找到货源") + private Integer status; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzShopDetailVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzShopDetailVo.java new file mode 100644 index 0000000..95680b9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzShopDetailVo.java @@ -0,0 +1,186 @@ +package org.dromara.mall.domain.vo; + +import java.math.BigDecimal; +import org.dromara.mall.domain.TzShopDetail; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_shop_detail + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzShopDetail.class) +public class TzShopDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + /** + * 店铺名称(数字、中文,英文(可混合,不可有特殊字符),可修改)、不唯一 + */ + @ExcelProperty(value = "店铺名称(数字、中文,英文(可混合,不可有特殊字符),可修改)、不唯一") + private String shopName; + + /** + * 店长用户id + */ + @ExcelProperty(value = "店长用户id") + private String userId; + + /** + * 店铺类型 + */ + @ExcelProperty(value = "店铺类型") + private Integer shopType; + + /** + * 店铺简介(可修改) + */ + @ExcelProperty(value = "店铺简介(可修改)") + private String intro; + + /** + * 店铺公告(可修改) + */ + @ExcelProperty(value = "店铺公告(可修改)") + private String shopNotice; + + /** + * 店铺行业(餐饮、生鲜果蔬、鲜花等) + */ + @ExcelProperty(value = "店铺行业(餐饮、生鲜果蔬、鲜花等)") + private Integer shopIndustry; + + /** + * 店长 + */ + @ExcelProperty(value = "店长") + private String shopOwner; + + /** + * 店铺绑定的手机(登录账号:唯一) + */ + @ExcelProperty(value = "店铺绑定的手机(登录账号:唯一)") + private String mobile; + + /** + * 店铺联系电话 + */ + @ExcelProperty(value = "店铺联系电话") + private String tel; + + /** + * 店铺所在纬度(可修改) + */ + @ExcelProperty(value = "店铺所在纬度(可修改)") + private String shopLat; + + /** + * 店铺所在经度(可修改) + */ + @ExcelProperty(value = "店铺所在经度(可修改)") + private String shopLng; + + /** + * 店铺详细地址 + */ + @ExcelProperty(value = "店铺详细地址") + private String shopAddress; + + /** + * 店铺所在省份(描述) + */ + @ExcelProperty(value = "店铺所在省份", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "描=述") + private String province; + + /** + * 店铺所在城市(描述) + */ + @ExcelProperty(value = "店铺所在城市", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "描=述") + private String city; + + /** + * 店铺所在区域(描述) + */ + @ExcelProperty(value = "店铺所在区域", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "描=述") + private String area; + + /** + * 店铺省市区代码,用于回显 + */ + @ExcelProperty(value = "店铺省市区代码,用于回显") + private String pcaCode; + + /** + * 店铺logo(可修改) + */ + @ExcelProperty(value = "店铺logo(可修改)") + private String shopLogo; + + /** + * 店铺相册 + */ + @ExcelProperty(value = "店铺相册") + private String shopPhotos; + + /** + * 每天营业时间段(可修改) + */ + @ExcelProperty(value = "每天营业时间段(可修改)") + private String openTime; + + /** + * 店铺状态(-1:未开通 0: 停业中 1:营业中),可修改 + */ + @ExcelProperty(value = "店铺状态(-1:未开通 0: 停业中 1:营业中),可修改") + private Integer shopStatus; + + /** + * 0:商家承担运费; 1:买家承担运费 + */ + @ExcelProperty(value = "0:商家承担运费; 1:买家承担运费") + private Integer transportType; + + /** + * 固定运费 + */ + @ExcelProperty(value = "固定运费") + private BigDecimal fixedFreight; + + /** + * 满X包邮 + */ + @ExcelProperty(value = "满X包邮") + private BigDecimal fullFreeShipping; + + /** + * 分销开关(0:开启 1:关闭) + */ + @ExcelProperty(value = "分销开关(0:开启 1:关闭)") + private Integer isDistribution; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSkuVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSkuVo.java new file mode 100644 index 0000000..8e01fc1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSkuVo.java @@ -0,0 +1,151 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzSku; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 单品SKU视图对象 tz_sku + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzSku.class) +public class TzSkuVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 单品ID + */ + @ExcelProperty(value = "单品ID") + private Long skuId; + + /** + * 商品ID + */ + @ExcelProperty(value = "商品ID") + private Long prodId; + + /** + * 销售属性组合字符串 + */ + @ExcelProperty(value = "销售属性组合字符串") + private String properties; + + /** + * 商品指导价 + */ + @ExcelProperty(value = "商品指导价") + private BigDecimal guidingPrice; + + /** + * 商品成本价 + */ + @ExcelProperty(value = "商品成本价") + private BigDecimal oriPrice; + + /** + * 商品展示价 + */ + @ExcelProperty(value = "商品展示价") + private BigDecimal price; + + /** + * 商品在付款减库存的状态下,该sku上未付款的订单数量 + */ + @ExcelProperty(value = "商品在付款减库存的状态下,该sku上未付款的订单数量") + private Long stocks; + + /** + * 实际库存 + */ + @ExcelProperty(value = "实际库存") + private Long actualStocks; + + /** + * 记录时间 + */ + @ExcelProperty(value = "记录时间") + private Date recTime; + + /** + * 商家编码 + */ + @ExcelProperty(value = "商家编码") + private String partyCode; + + /** + * 商品条形码 + */ + @ExcelProperty(value = "商品条形码") + private String modelId; + + /** + * sku图片 + */ + @ExcelProperty(value = "sku图片") + private String pic; + + /** + * sku编号 + */ + @ExcelProperty(value = "sku编号") + private String skuCode; + + /** + * sku名称 + */ + @ExcelProperty(value = "sku名称") + private String skuName; + + /** + * sku厂家编号 + */ + @ExcelProperty(value = "sku厂家编号") + private String skuFactoryCode; + + /** + * 商品名称 + */ + @ExcelProperty(value = "商品名称") + private String prodName; + + /** + * 商品重量 + */ + @ExcelProperty(value = "商品重量") + private Long weight; + + /** + * 商品体积 + */ + @ExcelProperty(value = "商品体积") + private Long volume; + + /** + * 0 禁用 1 启用 + */ + @ExcelProperty(value = "0 禁用 1 启用") + private Long status; + + /** + * 0 正常 1 已被删除 + */ + @ExcelProperty(value = "0 正常 1 已被删除") + private Long isDelete; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSmsLogVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSmsLogVo.java new file mode 100644 index 0000000..d5b9310 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzSmsLogVo.java @@ -0,0 +1,84 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzSmsLog; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 短信记录视图对象 tz_sms_log + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzSmsLog.class) +public class TzSmsLogVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private String userId; + + /** + * 手机号码 + */ + @ExcelProperty(value = "手机号码") + private String userPhone; + + /** + * 短信内容 + */ + @ExcelProperty(value = "短信内容") + private String content; + + /** + * 手机验证码 + */ + @ExcelProperty(value = "手机验证码") + private String mobileCode; + + /** + * 短信类型 1:注册 2:验证 + */ + @ExcelProperty(value = "短信类型 1:注册 2:验证") + private Long type; + + /** + * 发送时间 + */ + @ExcelProperty(value = "发送时间") + private Date recDate; + + /** + * 发送短信返回码 + */ + @ExcelProperty(value = "发送短信返回码") + private String responseCode; + + /** + * 状态 1:有效 0:失效 + */ + @ExcelProperty(value = "状态 1:有效 0:失效") + private Long status; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTenantRecordVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTenantRecordVo.java new file mode 100644 index 0000000..b7a2599 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTenantRecordVo.java @@ -0,0 +1,92 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.mall.domain.TzTenantRecord; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 租户资金记录视图对象 tz_tenant_record + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTenantRecord.class) +public class TzTenantRecordVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 记录ID + */ + @ExcelProperty(value = "记录ID") + private Long id; + + /** + * 租户名称 + */ + @ExcelProperty(value = "租户名称") + private String tenantName; + + /** + * 变动金额(正数增加,负数减少) + */ + @ExcelProperty(value = "变动金额", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "正=数增加,负数减少") + private BigDecimal amount; + + /** + * 变动后余额 + */ + @ExcelProperty(value = "变动后余额") + private BigDecimal balance; + + /** + * 变动类型: 1-增加, 2-扣除, 3-提现, 4-其他 + */ + @ExcelProperty(value = "变动类型: 1-增加, 2-扣除, 3-提现, 4-其他") + private Integer type; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 子订单项ID + */ + @ExcelProperty(value = "子订单项ID") + private Long orderItemId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 金额类型: 1-可用余额, 2-冻结余额 + */ + @ExcelProperty(value = "金额类型: 1-可用余额, 2-冻结余额") + private Integer amountType; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityFreeVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityFreeVo.java new file mode 100644 index 0000000..b0ca42f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityFreeVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzTranscityFree; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_transcity_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTranscityFree.class) +public class TzTranscityFreeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 指定条件包邮城市项id + */ + @ExcelProperty(value = "指定条件包邮城市项id") + private Long transcityFreeId; + + /** + * 指定条件包邮项id + */ + @ExcelProperty(value = "指定条件包邮项id") + private Long transfeeFreeId; + + /** + * 城市id + */ + @ExcelProperty(value = "城市id") + private Long freeCityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityVo.java new file mode 100644 index 0000000..2e8f249 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTranscityVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzTranscity; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_transcity + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTranscity.class) +public class TzTranscityVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long transcityId; + + /** + * 运费项id + */ + @ExcelProperty(value = "运费项id") + private Long transfeeId; + + /** + * 城市id + */ + @ExcelProperty(value = "城市id") + private Long cityId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeFreeVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeFreeVo.java new file mode 100644 index 0000000..52976b2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeFreeVo.java @@ -0,0 +1,64 @@ +package org.dromara.mall.domain.vo; + +import java.math.BigDecimal; +import org.dromara.mall.domain.TzTransfeeFree; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_transfee_free + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTransfeeFree.class) +public class TzTransfeeFreeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 指定条件包邮项id + */ + @ExcelProperty(value = "指定条件包邮项id") + private Long transfeeFreeId; + + /** + * 运费模板id + */ + @ExcelProperty(value = "运费模板id") + private Long transportId; + + /** + * 包邮方式 (0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮) + */ + @ExcelProperty(value = "包邮方式 ", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=,满=x件/重量/体积包邮,1=满金额包邮,2=满x件/重量/体积且满金额包邮") + private Integer freeType; + + /** + * 需满金额 + */ + @ExcelProperty(value = "需满金额") + private BigDecimal amount; + + /** + * 包邮x件/重量/体积 + */ + @ExcelProperty(value = "包邮x件/重量/体积") + private BigDecimal piece; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeVo.java new file mode 100644 index 0000000..9f95d87 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransfeeVo.java @@ -0,0 +1,69 @@ +package org.dromara.mall.domain.vo; + +import java.math.BigDecimal; +import org.dromara.mall.domain.TzTransfee; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_transfee + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTransfee.class) +public class TzTransfeeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 运费项id + */ + @ExcelProperty(value = "运费项id") + private Long transfeeId; + + /** + * 运费模板id + */ + @ExcelProperty(value = "运费模板id") + private Long transportId; + + /** + * 续件数量 + */ + @ExcelProperty(value = "续件数量") + private BigDecimal continuousPiece; + + /** + * 首件数量 + */ + @ExcelProperty(value = "首件数量") + private BigDecimal firstPiece; + + /** + * 续件费用 + */ + @ExcelProperty(value = "续件费用") + private BigDecimal continuousFee; + + /** + * 首件费用 + */ + @ExcelProperty(value = "首件费用") + private BigDecimal firstFee; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransportVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransportVo.java new file mode 100644 index 0000000..f77162b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzTransportVo.java @@ -0,0 +1,69 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzTransport; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_transport + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzTransport.class) +public class TzTransportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 运费模板id + */ + @ExcelProperty(value = "运费模板id") + private Long transportId; + + /** + * 运费模板名称 + */ + @ExcelProperty(value = "运费模板名称") + private String transName; + + /** + * 店铺id + */ + @ExcelProperty(value = "店铺id") + private Long shopId; + + /** + * 收费方式(0 按件数,1 按重量 2 按体积) + */ + @ExcelProperty(value = "收费方式", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=,按=件数,1,按=重量,2=,按=体积") + private Integer chargeType; + + /** + * 是否包邮 0:不包邮 1:包邮 + */ + @ExcelProperty(value = "是否包邮 0:不包邮 1:包邮") + private Integer isFreeFee; + + /** + * 是否含有包邮条件 0 否 1是 + */ + @ExcelProperty(value = "是否含有包邮条件 0 否 1是") + private Integer hasFreeCondition; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrOrderVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrOrderVo.java new file mode 100644 index 0000000..c980e1e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrOrderVo.java @@ -0,0 +1,110 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzUserAddrOrder; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户订单配送地址视图对象 tz_user_addr_order + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUserAddrOrder.class) +public class TzUserAddrOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long addrOrderId; + + /** + * 地址ID + */ + @ExcelProperty(value = "地址ID") + private Long addrId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 收货人 + */ + @ExcelProperty(value = "收货人") + private String receiver; + + /** + * 省ID + */ + @ExcelProperty(value = "省ID") + private Long provinceId; + + /** + * 省 + */ + @ExcelProperty(value = "省") + private String province; + + /** + * 区域ID + */ + @ExcelProperty(value = "区域ID") + private Long areaId; + + /** + * 区 + */ + @ExcelProperty(value = "区") + private String area; + + /** + * 城市ID + */ + @ExcelProperty(value = "城市ID") + private Long cityId; + + /** + * 城市 + */ + @ExcelProperty(value = "城市") + private String city; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String addr; + + /** + * 邮编 + */ + @ExcelProperty(value = "邮编") + private String postCode; + + /** + * 手机 + */ + @ExcelProperty(value = "手机") + private String mobile; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrVo.java new file mode 100644 index 0000000..6a89b21 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddrVo.java @@ -0,0 +1,116 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzUserAddr; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户配送地址视图对象 tz_user_addr + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUserAddr.class) +public class TzUserAddrVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long addrId; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private String userId; + + /** + * 收货人 + */ + @ExcelProperty(value = "收货人") + private String receiver; + + /** + * 省ID + */ + @ExcelProperty(value = "省ID") + private Long provinceId; + + /** + * 省 + */ + @ExcelProperty(value = "省") + private String province; + + /** + * 城市 + */ + @ExcelProperty(value = "城市") + private String city; + + /** + * 城市ID + */ + @ExcelProperty(value = "城市ID") + private Long cityId; + + /** + * 区 + */ + @ExcelProperty(value = "区") + private String area; + + /** + * 区ID + */ + @ExcelProperty(value = "区ID") + private Long areaId; + + /** + * 邮编 + */ + @ExcelProperty(value = "邮编") + private String postCode; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String addr; + + /** + * 手机 + */ + @ExcelProperty(value = "手机") + private String mobile; + + /** + * 状态,1正常,0无效 + */ + @ExcelProperty(value = "状态,1正常,0无效") + private Integer status; + + /** + * 是否默认地址 1是 + */ + @ExcelProperty(value = "是否默认地址 1是") + private Integer commonAddr; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddressVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddressVo.java new file mode 100644 index 0000000..1f07ec6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserAddressVo.java @@ -0,0 +1,65 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzUserAddress; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 客户地址视图对象 tz_user_address + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUserAddress.class) +public class TzUserAddressVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 客户ID + */ + @ExcelProperty(value = "客户ID") + private Long userId; + + /** + * 收货人姓名 + */ + @ExcelProperty(value = "收货人姓名") + private String userName; + + /** + * 收货人电话 + */ + @ExcelProperty(value = "收货人电话") + private String userPhone; + + /** + * 收货地址 + */ + @ExcelProperty(value = "收货地址") + private String userAddress; + + /** + * 是否默认 1:默认 2:非默认 + */ + @ExcelProperty(value = "是否默认 1:默认 2:非默认") + private Long isDefault; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserCollectionVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserCollectionVo.java new file mode 100644 index 0000000..2a1b2e8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserCollectionVo.java @@ -0,0 +1,50 @@ +package org.dromara.mall.domain.vo; + +import org.dromara.mall.domain.TzUserCollection; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 tz_user_collection + * + * @author Lion Li + * @date 2024-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUserCollection.class) +public class TzUserCollectionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 收藏表 + */ + @ExcelProperty(value = "收藏表") + private Long id; + + /** + * 商品id + */ + @ExcelProperty(value = "商品id") + private Long prodId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private String userId; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSearchVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSearchVo.java new file mode 100644 index 0000000..c5f5318 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSearchVo.java @@ -0,0 +1,60 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzUserSearch; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 用户搜索视图对象 tz_user_search + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUserSearch.class) +public class TzUserSearchVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long id; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户ID") + private Long userId; + + /** + * 搜索标题 + */ + @ExcelProperty(value = "搜索标题") + private String title; + + /** + * 搜索次数 + */ + @ExcelProperty(value = "搜索次数") + private Long num; + + /** + * 录入时间 + */ + @ExcelProperty(value = "录入时间") + private Date recDate; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSumVo.java new file mode 100644 index 0000000..1f92dd9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserSumVo.java @@ -0,0 +1,46 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class TzUserSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户总数量 + */ + private Long userNum; + + /** + * 订单总数量 + */ +// private Long orderNum; + + /** + * 待审核人数 + */ + private Long auditNum; + + /** + * 已认证数量 + */ + private Long authNum; + + /** + * 总余额 + */ + private BigDecimal totalBalance; + + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserVo.java new file mode 100644 index 0000000..6d9a1ec --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzUserVo.java @@ -0,0 +1,246 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.mall.domain.TzUser; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 用户视图对象 tz_user + * + * @author Maosw + * @date 2024-12-09 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzUser.class) +public class TzUserVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ExcelProperty(value = "ID") + private Long userId; + + /** + * 用户昵称 + */ + @ExcelProperty(value = "用户昵称") + private String nickName; + + /** + * 真实姓名 + */ + @ExcelProperty(value = "真实姓名") + private String realName; + + /** + * 用户邮箱 + */ + @ExcelProperty(value = "用户邮箱") + private String userMail; + + /** + * 登录密码 + */ + @ExcelProperty(value = "登录密码") + private String loginPassword; + + /** + * 支付密码 + */ + @ExcelProperty(value = "支付密码") + private String payPassword; + + /** + * 手机号码 + */ + @ExcelProperty(value = "手机号码") + private String userMobile; + + /** + * 身份证号码 + */ + @ExcelProperty(value = "身份证号码") + private String idCard; + + /** + * 身份证正面 + */ + @ExcelProperty(value = "身份证正面") + private String frontCard; + + /** + * 身份证反面 + */ + @ExcelProperty(value = "身份证反面") + private String reverseCard; + + /** + * 余额 + */ + @ExcelProperty(value = "余额") + private BigDecimal balance; + + /** + * 抵扣金额 + */ + @ExcelProperty(value = "抵扣金额") + private BigDecimal deductionFee; + + /** + * 修改时间 + */ + @ExcelProperty(value = "修改时间") + private Date modifyTime; + + /** + * 注册时间 + */ + @ExcelProperty(value = "注册时间") + private Date userRegtime; + + /** + * 注册IP + */ + @ExcelProperty(value = "注册IP") + private String userRegip; + + /** + * 最后登录时间 + */ + @ExcelProperty(value = "最后登录时间") + private Date userLasttime; + + /** + * 最后登录IP + */ + @ExcelProperty(value = "最后登录IP") + private String userLastip; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String userMemo; + + /** + * M(男) or F(女) + */ + @ExcelProperty(value = "M(男) or F(女)") + private String sex; + + /** + * 例如:2009-11-27 + */ + @ExcelProperty(value = "例如:2009-11-27") + private String birthDate; + + /** + * 头像图片路径 + */ + @ExcelProperty(value = "头像图片路径") + private String pic; + + /** + * 状态 1 正常 0 无效 + */ + @ExcelProperty(value = "状态 1 正常 0 无效") + private Integer status; + + /** + * 用户积分 + */ + @ExcelProperty(value = "用户积分") + private Long score; + + /** + * 微信openId + */ + @ExcelProperty(value = "微信openId") + private String openId; + + /** + * 是否设计师 1:是 0:否 + */ + @ExcelProperty(value = "是否设计师 1:是 0:否") + private Integer isDesigner; + + /** + * 设计师认证信息 + */ + @ExcelProperty(value = "设计师认证信息") + private String sjsJson; + + /** + * 设计师审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + @ExcelProperty(value = "设计师审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝") + private Integer sjsFlag; + + /** + * 实名审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝 + */ + @ExcelProperty(value = "实名审核状态 1:未认证 2:待审核 3:已通过 4:已拒绝") + private Integer examineFlag; + + /** + * 价格开关是否打开 1:打开 0:关闭 + */ + @ExcelProperty(value = "价格开关是否打开 1:打开 0:关闭") + private Integer priceFlag; + + /** + * 是否是会员 1:是 0:否 + */ + @ExcelProperty(value = "是否是会员 1:是 0:否") + private Integer isMember; + + /** + * 会员有效期结束 + */ + @ExcelProperty(value = "会员有效期结束") + private Date validTo; + + /** + * 调价比例 + */ + @ExcelProperty(value = "调价比例") + private String ratio; + + /** + * 拉卡拉用户ID + */ + @ExcelProperty(value = "拉卡拉用户ID") + private String custId; + + /** + * 证件起止日期 + */ + @ExcelProperty(value = "证件起止日期") + private String certExpirationDate; + + /** + * 订单数量 + */ + @ExcelProperty(value = "订单数量") + private Long orderNum; + + /** + * 订单总金额 + */ + @ExcelProperty(value = "订单总金额") + private BigDecimal orderTotal; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawRequestVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawRequestVo.java new file mode 100644 index 0000000..1f6dc7e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawRequestVo.java @@ -0,0 +1,200 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.mall.domain.TzWithdrawRequest; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 提现申请视图对象 tz_withdraw_request + * + * @author Maosw + * @date 2024-12-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzWithdrawRequest.class) +public class TzWithdrawRequestVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 提现申请ID + */ + private Long id; + + /** + * 用户ID(租户/商户/推广员/会员) + */ + @ExcelDictFormat(readConverterExp = "租=户/商户/推广员/会员") + private Long userId; + + /** + * 角色类型: 1-租户, 2-商户, 3-推广员, 4-会员 + */ + private Integer roleType; + + /** + * 姓名 + */ + @ExcelProperty(value = "姓名") + private String realName; + + /** + * 证件类型 + */ + @ExcelProperty(value = "证件类型") + private String idCardType; + + /** + * 证件号码 + */ + @ExcelProperty(value = "证件号码") + private String idCard; + + /** + * 所得期间起 + */ + @ExcelProperty(value = "所得期间起") + private Date periodStart; + + /** + * 所得期间止 + */ + @ExcelProperty(value = "所得期间止") + private Date periodEnd; + + /** + * 提现金额 + */ + @ExcelProperty(value = "提现金额") + private BigDecimal withdrawAmount; + + /** + * 提现前余额 + */ + private BigDecimal currentBalance; + + /** + * 提现状态: 1-待审核, 2-审核通过, 3-打款成功, 4-打款失败,5-审核拒绝 + */ + private Integer withdrawStatus; + + /** + * 支付方式(如银行卡/支付宝/微信) + */ + private String paymentMethod; + + /** + * 持卡人姓名 + */ + private String cardHolderName; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 银行卡号 + */ + private String cardNumber; + + /** + * 审核时间 + */ + private Date approveTime; + + /** + * 审核备注 + */ + private String remark; + + /** + * 审核人 + */ + private String approveBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 个税税率 + */ + private BigDecimal taxRate; + + /** + * 个税税金 + */ + @ExcelProperty(value = "个税税金") + private BigDecimal taxAmount; + + /** + * 增值税税率 + */ + private BigDecimal zhTaxRate; + + /** + * 增值税税金 + */ + private BigDecimal zhTaxAmount; + + /** + * 手续费费率 + */ + private BigDecimal sxfTaxRate; + + /** + * 手续费金额 + */ + private BigDecimal sxfTaxAmount; + + /** + * 税后金额 + */ + @ExcelProperty(value = "税后金额") + private BigDecimal afterTaxAmount; + + /** + * 分账系统生成唯一流水 + */ + private String separateNo; + + /** + * 商户外部订单号 + */ + private String outSeparateNo; + + /** + * 分账接收方 + */ + private String receiverNo; + + /** + * 开票类型 1-开票,2-不开票 + */ + private Integer invoiceType; + + /** + * 发票链接 + */ + private String invoiceUrl; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawSumVo.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawSumVo.java new file mode 100644 index 0000000..1f43894 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/TzWithdrawSumVo.java @@ -0,0 +1,65 @@ +package org.dromara.mall.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class TzWithdrawSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long totalNum; + + /** + * 总提现金额 + */ + private BigDecimal totalAmount; + + /** + * 个税总税金 + */ + private BigDecimal totalTax; + + /** + * 增值税总税金 + */ + private BigDecimal totalZhTax; + + /** + * 待审核数量 + */ + private Long dshNum; + + /** + * 已打款数量 + */ + private Long ydkNum; + + /** + * 审核拒绝数量 + */ + private Long sjyNum; + + /** + * 开票数量 + */ + private Long kpNum; + + /** + * 不开票数量 + */ + private Long bkpNum; + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyBasketMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyBasketMapper.java new file mode 100644 index 0000000..36c440f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyBasketMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyBasket; +import org.dromara.mall.domain.vo.HyBasketVo; + +/** + * 购物车Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyBasketMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCodeOrderMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCodeOrderMapper.java new file mode 100644 index 0000000..125030e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCodeOrderMapper.java @@ -0,0 +1,34 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyCodeOrder; +import org.dromara.mall.domain.vo.HyCodeOrderVo; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; + +import java.util.List; + +/** + * 会员码订单Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyCodeOrderMapper extends BaseMapperPlus, MPJBaseMapper { + + @InterceptorIgnore(tenantLine = "true") + IPage promoterCountMonth(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay); + + @InterceptorIgnore(tenantLine = "true") + IPage promoterSumMonth(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay); + + @InterceptorIgnore(tenantLine = "true") + List monthPerCodePer(@Param("month") String month); + + @InterceptorIgnore(tenantLine = "true") + List yearPerCodePer(@Param("year") String year); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCouponRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCouponRecordMapper.java new file mode 100644 index 0000000..dc40f01 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyCouponRecordMapper.java @@ -0,0 +1,11 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyCouponRecord; +import org.dromara.mall.domain.vo.HyCouponRecordVo; + +/** + * @author admin + */ +public interface HyCouponRecordMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyMemberCodeMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyMemberCodeMapper.java new file mode 100644 index 0000000..75bb696 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyMemberCodeMapper.java @@ -0,0 +1,36 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyMemberCode; +import org.dromara.mall.domain.vo.HyMemberCodeVo; +import org.dromara.mall.domain.vo.PerSumVo; + +import java.util.List; + +/** + * 会员码兑换Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyMemberCodeMapper extends BaseMapperPlus, MPJBaseMapper { + + /** + * 会员码数量按月统计 + * @param month + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List monthPerCode(@Param("month") String month); + + /** + * 会员码数量按年统计 + * @param year + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List yearPerCode(@Param("year") String year); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderItemMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderItemMapper.java new file mode 100644 index 0000000..25c69c9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderItemMapper.java @@ -0,0 +1,46 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyOrderItem; +import org.dromara.mall.domain.vo.HyOrderItemVo; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; + +import java.util.List; + +/** + * 订单详情Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyOrderItemMapper extends BaseMapperPlus, MPJBaseMapper { + + @InterceptorIgnore(tenantLine = "true") + IPage xcxUserCountMonth(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay); + + @InterceptorIgnore(tenantLine = "true") + IPage xcxUserSumMonth(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay); + + @InterceptorIgnore(tenantLine = "true") + IPage factorySalesVolumeCount(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay, @Param("tenantId") String tenantId); + + @InterceptorIgnore(tenantLine = "true") + IPage factorySalesVolumeSum(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay, @Param("tenantId") String tenantId); + + @InterceptorIgnore(tenantLine = "true") + List monthPer(@Param("month") String month, @Param("tenantId") String tenantId); + + @InterceptorIgnore(tenantLine = "true") + List yearPer(@Param("year") String year, @Param("tenantId") String tenantId); + + @InterceptorIgnore(tenantLine = "true") + List monthPerByZh(@Param("month") String month, @Param("tenantId") String tenantId); + + @InterceptorIgnore(tenantLine = "true") + List yearPerByZh(@Param("year") String year, @Param("tenantId") String tenantId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderMapper.java new file mode 100644 index 0000000..42e594b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyOrder; +import org.dromara.mall.domain.vo.HyOrderVo; + +/** + * 总订单Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyOrderMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderPaymentMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderPaymentMapper.java new file mode 100644 index 0000000..0488c7d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyOrderPaymentMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyOrderPayment; +import org.dromara.mall.domain.vo.HyOrderPaymentVo; + +/** + * 订单打款Mapper接口 + * + * @author Maosw + * @date 2024-12-27 + */ +public interface HyOrderPaymentMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterMapper.java new file mode 100644 index 0000000..a27f504 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyPromoter; +import org.dromara.mall.domain.vo.HyPromoterVo; + +/** + * 推广员Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyPromoterMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterRecordMapper.java new file mode 100644 index 0000000..43faba8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyPromoterRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyPromoterRecord; +import org.dromara.mall.domain.vo.HyPromoterRecordVo; + +/** + * 推广员资金记录Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyPromoterRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyUserRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyUserRecordMapper.java new file mode 100644 index 0000000..49af808 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/HyUserRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.HyUserRecord; +import org.dromara.mall.domain.vo.HyUserRecordVo; + +/** + * 用户资金记录Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface HyUserRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAgreementMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAgreementMapper.java new file mode 100644 index 0000000..840cbb6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAgreementMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzAgreement; +import org.dromara.mall.domain.vo.TzAgreementVo; + +/** + * 协议Mapper接口 + * + * @author Maosw + * @date 2024-12-26 + */ +public interface TzAgreementMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAreaMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAreaMapper.java new file mode 100644 index 0000000..ec2c4e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAreaMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzArea; +import org.dromara.mall.domain.vo.TzAreaVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzAreaMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAttachFileMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAttachFileMapper.java new file mode 100644 index 0000000..ff6eed9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzAttachFileMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzAttachFile; +import org.dromara.mall.domain.vo.TzAttachFileVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzAttachFileMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBankCardMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBankCardMapper.java new file mode 100644 index 0000000..ba46e5b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBankCardMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzBankCard; +import org.dromara.mall.domain.vo.TzBankCardVo; + +/** + * 绑定银行卡信息Mapper接口 + * + * @author Maosw + * @date 2024-12-12 + */ +public interface TzBankCardMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBasketMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBasketMapper.java new file mode 100644 index 0000000..e5ff82a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBasketMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzBasket; +import org.dromara.mall.domain.vo.TzBasketVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 购物车Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzBasketMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBrandMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBrandMapper.java new file mode 100644 index 0000000..f2d91ec --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzBrandMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzBrand; +import org.dromara.mall.domain.vo.TzBrandVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 品牌Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzBrandMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryBrandMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryBrandMapper.java new file mode 100644 index 0000000..2e6c212 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryBrandMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzCategoryBrand; +import org.dromara.mall.domain.vo.TzCategoryBrandVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzCategoryBrandMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryMapper.java new file mode 100644 index 0000000..a070ca8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzCategory; +import org.dromara.mall.domain.vo.TzCategoryVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 产品类目Mapper接口 + * + * @author Lion Li + * @date 2024-07-31 + */ +public interface TzCategoryMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryPropMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryPropMapper.java new file mode 100644 index 0000000..3a9e779 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCategoryPropMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzCategoryProp; +import org.dromara.mall.domain.vo.TzCategoryPropVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzCategoryPropMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerMapper.java new file mode 100644 index 0000000..96ffe8c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerMapper.java @@ -0,0 +1,28 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzCustomer; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.TzCustomerVo; + +import java.util.List; + +/** + * 客户Mapper接口 + * + * @author Maosw + * @date 2024-09-04 + */ +public interface TzCustomerMapper extends BaseMapperPlus { + + /** + * 客户数量按月统计 + * @param startDay + * @param endDay + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List monthPerCustomer(@Param("startDay") String startDay,@Param("endDay") String endDay); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerRecordMapper.java new file mode 100644 index 0000000..83a44bc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzCustomerRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzCustomerRecord; +import org.dromara.mall.domain.vo.TzCustomerRecordVo; + +/** + * 客户资金记录Mapper接口 + * + * @author Maosw + * @date 2024-09-12 + */ +public interface TzCustomerRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzDeliveryMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzDeliveryMapper.java new file mode 100644 index 0000000..6857cef --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzDeliveryMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzDelivery; +import org.dromara.mall.domain.vo.TzDeliveryVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 物流公司Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzDeliveryMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzHotSearchMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzHotSearchMapper.java new file mode 100644 index 0000000..3a69a0a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzHotSearchMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzHotSearch; +import org.dromara.mall.domain.vo.TzHotSearchVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 热搜Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzHotSearchMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzIndexImgMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzIndexImgMapper.java new file mode 100644 index 0000000..5a4d7a3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzIndexImgMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzIndexImg; +import org.dromara.mall.domain.vo.TzIndexImgVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 主页轮播图Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzIndexImgMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceApplyMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceApplyMapper.java new file mode 100644 index 0000000..076221a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceApplyMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzInvoiceApply; +import org.dromara.mall.domain.vo.TzInvoiceApplyVo; + +/** + * 发票申请记录Mapper接口 + * + * @author Maosw + * @date 2024-12-25 + */ +public interface TzInvoiceApplyMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceTitleMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceTitleMapper.java new file mode 100644 index 0000000..1028992 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzInvoiceTitleMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzInvoiceTitle; +import org.dromara.mall.domain.vo.TzInvoiceTitleVo; + +/** + * 发票抬头信息Mapper接口 + * + * @author Maosw + * @date 2024-12-25 + */ +public interface TzInvoiceTitleMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzMessageMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzMessageMapper.java new file mode 100644 index 0000000..9ab9d90 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzMessageMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzMessage; +import org.dromara.mall.domain.vo.TzMessageVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzMessageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzNoticeMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzNoticeMapper.java new file mode 100644 index 0000000..509d89f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzNoticeMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzNotice; +import org.dromara.mall.domain.vo.TzNoticeVo; + +/** + * 公告Mapper接口 + * + * @author Maosw + * @date 2025-01-13 + */ +public interface TzNoticeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderAllMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderAllMapper.java new file mode 100644 index 0000000..0a74f3e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderAllMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzOrderAll; +import org.dromara.mall.domain.vo.TzOrderAllVo; + +/** + * 订单汇总Mapper接口 + * + * @author Maosw + * @date 2024-09-04 + */ +public interface TzOrderAllMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderItemMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderItemMapper.java new file mode 100644 index 0000000..751b380 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderItemMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzOrderItem; +import org.dromara.mall.domain.vo.TzOrderItemVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 订单项Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzOrderItemMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderMapper.java new file mode 100644 index 0000000..2cbea7e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderMapper.java @@ -0,0 +1,63 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzOrder; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; +import org.dromara.mall.domain.vo.TzOrderVo; + +import java.util.List; + +/** + * 订单Mapper接口 + * + * @author Maosw + * @date 2024-08-03 + */ +public interface TzOrderMapper extends BaseMapperPlus, MPJBaseMapper { + + /** + * 业绩按月统计 + * @param month + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List monthPer(@Param("month") String month); + + /** + * 业绩已到款按月统计 + * @param month + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List monthArrivedPer(@Param("month") String month); + + /** + * 业绩按年统计 + * @param year + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List yearPer(@Param("year") String year); + + /** + * 业绩已到款按年统计 + * @param year + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List yearArrivedPer(@Param("year") String year); + + /** + * 客户下单金额排行榜 + * @param startDay + * @param endDay + * @return + */ + @InterceptorIgnore(tenantLine = "true") + IPage rankOrderAmount(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderReceiveMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderReceiveMapper.java new file mode 100644 index 0000000..2207e8b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderReceiveMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzOrderReceive; +import org.dromara.mall.domain.vo.TzOrderReceiveVo; + +/** + * 订单汇款Mapper接口 + * + * @author Maosw + * @date 2024-09-03 + */ +public interface TzOrderReceiveMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRecordMapper.java new file mode 100644 index 0000000..efe4aa2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRecordMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzOrderRecord; +import org.dromara.mall.domain.vo.TzOrderRecordVo; + +/** + * 订单修改记录Mapper接口 + * + * @author Lion Li + * @date 2024-08-03 + */ +public interface TzOrderRecordMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRefundMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRefundMapper.java new file mode 100644 index 0000000..8ef0f45 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderRefundMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzOrderRefund; +import org.dromara.mall.domain.vo.TzOrderRefundVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzOrderRefundMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderSettlementMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderSettlementMapper.java new file mode 100644 index 0000000..ecad645 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderSettlementMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzOrderSettlement; +import org.dromara.mall.domain.vo.TzOrderSettlementVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzOrderSettlementMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderShareMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderShareMapper.java new file mode 100644 index 0000000..4aa4ec0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzOrderShareMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzOrderShare; +import org.dromara.mall.domain.vo.TzOrderShareVo; + +/** + * 订单分享Mapper接口 + * + * @author Maosw + * @date 2024-09-14 + */ +public interface TzOrderShareMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPickAddrMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPickAddrMapper.java new file mode 100644 index 0000000..d6ea9c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPickAddrMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzPickAddr; +import org.dromara.mall.domain.vo.TzPickAddrVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户配送地址Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzPickAddrMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPictureAlbumMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPictureAlbumMapper.java new file mode 100644 index 0000000..c41fb5e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzPictureAlbumMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzPictureAlbum; +import org.dromara.mall.domain.vo.TzPictureAlbumVo; + +/** + * 画册Mapper接口 + * + * @author Maosw + * @date 2024-10-04 + */ +public interface TzPictureAlbumMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdBrowseMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdBrowseMapper.java new file mode 100644 index 0000000..0d3ea9f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdBrowseMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdBrowse; +import org.dromara.mall.domain.vo.TzProdBrowseVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 商品浏览Mapper接口 + * + * @author Maosw + * @date 2024-08-05 + */ +public interface TzProdBrowseMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdCommMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdCommMapper.java new file mode 100644 index 0000000..5476727 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdCommMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdComm; +import org.dromara.mall.domain.vo.TzProdCommVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 商品评论Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdCommMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdFavoriteMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdFavoriteMapper.java new file mode 100644 index 0000000..5504c40 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdFavoriteMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdFavorite; +import org.dromara.mall.domain.vo.TzProdFavoriteVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 商品收藏Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdFavoriteMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdMapper.java new file mode 100644 index 0000000..ad29725 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdMapper.java @@ -0,0 +1,111 @@ +package org.dromara.mall.mapper; + +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseMapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.bo.TzProdBo; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; +import org.dromara.mall.domain.vo.TzProdVo; + +import java.util.List; + +/** + * 商品Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdMapper extends BaseMapperPlus, MPJBaseMapper { + /** + * 根据分类id分页获取商品 + * @param page + * @param categoryId + * @return + */ + IPage pageByCategoryId(@Param("page") IPage page, @Param("categoryId") Long categoryId); + + /** + * 根据上架时间分页获取商品 + * @param page + * @return + */ + IPage pageByPutAwayTime(@Param("page") IPage page); + + /** + * 随机推荐分页获取商品 + * @param page + * @return + */ + IPage randomProdPage(@Param("page") IPage page); + + + /** + * 热门推荐分页获取商品 + * @param page + * @return + */ + IPage hotProdPage(@Param("page") IPage page); + + + /** + * 分页排序搜索商品 + * @param page + * @param categoryId + * @param prodName + * @param sort + * @param orderBy + * @return + */ + IPage getSearchProdPageByProdName(@Param("page") IPage page, @Param("categoryId") Long categoryId, @Param("prodName") String prodName, @Param("floor") Integer floor, @Param("sort") Integer sort, @Param("orderBy") Integer orderBy); + + + /** + * 产品数量按月统计 + * @param month + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List monthPerProd(@Param("month") String month); + + /** + * 产品数量按年统计 + * @param year + * @return + */ + @InterceptorIgnore(tenantLine = "true") + List yearPerProd(@Param("year") String year); + + /** + * 产品销量排行榜 + * @param page + * @param startDay + * @param endDay + * @return + */ + @InterceptorIgnore(tenantLine = "true") + IPage prodSalesVolumeCount(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay, @Param("tenantId") String tenantId); + + /** + * 产品销售额排行榜 + * @param page + * @param startDay + * @param endDay + * @return + */ + @InterceptorIgnore(tenantLine = "true") + IPage prodSalesVolumeSum(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay, @Param("tenantId") String tenantId); + + /** + * 产品销售额排行榜 + * @param page + * @param startDay + * @param endDay + * @return + */ + @InterceptorIgnore(tenantLine = "true") + IPage prodSalesVolumeSumByZh(@Param("page") IPage page, @Param("startDay") String startDay, @Param("endDay") String endDay, @Param("tenantId") String tenantId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropMapper.java new file mode 100644 index 0000000..eff2daa --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdProp; +import org.dromara.mall.domain.vo.TzProdPropVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdPropMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropValueMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropValueMapper.java new file mode 100644 index 0000000..8be22e3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdPropValueMapper.java @@ -0,0 +1,27 @@ +package org.dromara.mall.mapper; + +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzProdPropValue; +import org.dromara.mall.domain.bo.TzProdPropValueBo; +import org.dromara.mall.domain.vo.TzProdPropValueVo; + +import java.util.List; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdPropValueMapper extends BaseMapperPlus { + + Boolean insertPropValues(@Param("propId") Long propId, @Param("prodPropValues") List prodPropValues); + + /** + * 删除属性数值 + * @param propId + */ + void deleteByPropId(@Param("propId") Long propId); + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRecordMapper.java new file mode 100644 index 0000000..41d1893 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRecordMapper.java @@ -0,0 +1,21 @@ +package org.dromara.mall.mapper; + +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzProdRecord; +import org.dromara.mall.domain.vo.TzProdRecordVo; + +/** + * 产品价格记录Mapper接口 + * + * @author Maosw + * @date 2024-09-12 + */ +public interface TzProdRecordMapper extends BaseMapperPlus { + + /** + * 根据skuId删除记录 + * @param skuId + */ + void deleteBySkuId(@Param("skuId") Long skuId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRelationMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRelationMapper.java new file mode 100644 index 0000000..ce8acb8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdRelationMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzProdRelation; +import org.dromara.mall.domain.vo.TzProdRelationVo; + +/** + * 商品推荐关联Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface TzProdRelationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagMapper.java new file mode 100644 index 0000000..b98ff4d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdTag; +import org.dromara.mall.domain.vo.TzProdTagVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 商品分组Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdTagMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagReferenceMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagReferenceMapper.java new file mode 100644 index 0000000..1a2e70a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdTagReferenceMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzProdTagReference; +import org.dromara.mall.domain.vo.TzProdTagReferenceVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzProdTagReferenceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdWishlistMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdWishlistMapper.java new file mode 100644 index 0000000..e6748e3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzProdWishlistMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzProdWishlist; +import org.dromara.mall.domain.vo.TzProdWishlistVo; + +/** + * 心愿单Mapper接口 + * + * @author Lion Li + * @date 2024-01-02 + */ +public interface TzProdWishlistMapper extends BaseMapperPlus { + +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzShopDetailMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzShopDetailMapper.java new file mode 100644 index 0000000..16be204 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzShopDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzShopDetail; +import org.dromara.mall.domain.vo.TzShopDetailVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzShopDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSkuMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSkuMapper.java new file mode 100644 index 0000000..b6cb83c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSkuMapper.java @@ -0,0 +1,22 @@ +package org.dromara.mall.mapper; + +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzSku; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.domain.vo.TzSkuVo; + +import java.util.List; + +/** + * 单品SKUMapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzSkuMapper extends BaseMapperPlus { + + void insertBatchList(@Param("prodId") Long prodId, @Param("skuList") List skuList); + + void deleteByProdId(@Param("prodId") Long prodId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSmsLogMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSmsLogMapper.java new file mode 100644 index 0000000..4219df0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzSmsLogMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzSmsLog; +import org.dromara.mall.domain.vo.TzSmsLogVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 短信记录Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzSmsLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTenantRecordMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTenantRecordMapper.java new file mode 100644 index 0000000..4c817e2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTenantRecordMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzTenantRecord; +import org.dromara.mall.domain.vo.TzTenantRecordVo; + +/** + * 租户资金记录Mapper接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface TzTenantRecordMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityFreeMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityFreeMapper.java new file mode 100644 index 0000000..ef728e1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityFreeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzTranscityFree; +import org.dromara.mall.domain.vo.TzTranscityFreeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzTranscityFreeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityMapper.java new file mode 100644 index 0000000..4bef006 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTranscityMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzTranscity; +import org.dromara.mall.domain.vo.TzTranscityVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzTranscityMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeFreeMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeFreeMapper.java new file mode 100644 index 0000000..d2c2566 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeFreeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzTransfeeFree; +import org.dromara.mall.domain.vo.TzTransfeeFreeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzTransfeeFreeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeMapper.java new file mode 100644 index 0000000..c04f428 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransfeeMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzTransfee; +import org.dromara.mall.domain.vo.TzTransfeeVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzTransfeeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransportMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransportMapper.java new file mode 100644 index 0000000..ce83a11 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzTransportMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzTransport; +import org.dromara.mall.domain.vo.TzTransportVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzTransportMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrMapper.java new file mode 100644 index 0000000..ca4cd6d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzUserAddr; +import org.dromara.mall.domain.vo.TzUserAddrVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户配送地址Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzUserAddrMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrOrderMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrOrderMapper.java new file mode 100644 index 0000000..63af394 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddrOrderMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzUserAddrOrder; +import org.dromara.mall.domain.vo.TzUserAddrOrderVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户订单配送地址Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzUserAddrOrderMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddressMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddressMapper.java new file mode 100644 index 0000000..04ca164 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserAddressMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzUserAddress; +import org.dromara.mall.domain.vo.TzUserAddressVo; + +/** + * 客户地址Mapper接口 + * + * @author Maosw + * @date 2024-09-15 + */ +public interface TzUserAddressMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserCollectionMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserCollectionMapper.java new file mode 100644 index 0000000..80c396c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserCollectionMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzUserCollection; +import org.dromara.mall.domain.vo.TzUserCollectionVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzUserCollectionMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserMapper.java new file mode 100644 index 0000000..53f432c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.vo.TzUserVo; + +/** + * 用户Mapper接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface TzUserMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserSearchMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserSearchMapper.java new file mode 100644 index 0000000..9c1433e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzUserSearchMapper.java @@ -0,0 +1,15 @@ +package org.dromara.mall.mapper; + +import org.dromara.mall.domain.TzUserSearch; +import org.dromara.mall.domain.vo.TzUserSearchVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 用户搜索Mapper接口 + * + * @author Maosw + * @date 2024-08-09 + */ +public interface TzUserSearchMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzWithdrawRequestMapper.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzWithdrawRequestMapper.java new file mode 100644 index 0000000..e39d04d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/TzWithdrawRequestMapper.java @@ -0,0 +1,16 @@ +package org.dromara.mall.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.mall.domain.TzWithdrawRequest; +import org.dromara.mall.domain.vo.TzWithdrawRequestVo; + +/** + * 提现申请Mapper接口 + * + * @author Maosw + * @date 2024-12-12 + */ +public interface TzWithdrawRequestMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyBasketService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyBasketService.java new file mode 100644 index 0000000..d4d509c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyBasketService.java @@ -0,0 +1,106 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyBasket; +import org.dromara.mall.domain.bo.HyBasketBo; +import org.dromara.mall.domain.vo.HyBasketVo; + +import java.util.Collection; +import java.util.List; + +/** + * 购物车Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyBasketService extends MPJBaseService { + + /** + * 查询购物车 + * + * @param id 主键 + * @return 购物车 + */ + HyBasketVo queryById(Long id); + + /** + * 分页查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + TableDataInfo queryPageList(HyBasketBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的购物车列表 + * + * @param bo 查询条件 + * @return 购物车列表 + */ + List queryList(HyBasketBo bo); + + /** + * 新增购物车 + * + * @param bo 购物车 + * @return 是否新增成功 + */ + Boolean insertByBo(HyBasketBo bo); + + /** + * 修改购物车 + * + * @param bo 购物车 + * @return 是否修改成功 + */ + Boolean updateByBo(HyBasketBo bo); + + /** + * 校验并批量删除购物车信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 批量逻辑删除购物车商品 + * + * @param basketIds 购物车ID列表 + * @param userId 用户ID + * @return 是否删除成功 + */ + boolean logicDeleteByIds(List basketIds, Long userId); + + /** + * APP端分页查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + IPage queryPageListApp(HyBasketBo bo, @Valid PageQuery pageQuery); + + /** + * 查询用户购物车商品数量 + * + * @param userId 用户ID + * @return 商品数量 + */ + Long countByUserId(Long userId); + + /** + * 根据ID列表查询购物车商品 + * + * @param basketIds 购物车ID列表 + * @return 购物车商品列表 + */ + List selectVoByIds(List basketIds); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCodeOrderService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCodeOrderService.java new file mode 100644 index 0000000..ebca194 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCodeOrderService.java @@ -0,0 +1,123 @@ +package org.dromara.mall.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyCodeOrder; +import org.dromara.mall.domain.bo.HyCodeOrderBo; +import org.dromara.mall.domain.vo.HyCodeOrderSumVo; +import org.dromara.mall.domain.vo.HyCodeOrderVo; + +import java.util.Collection; +import java.util.List; + +/** + * 会员码订单Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyCodeOrderService extends MPJBaseService { + + /** + * 查询会员码订单 + * + * @param id 主键 + * @return 会员码订单 + */ + HyCodeOrderVo queryById(Long id); + + /** + * 分页查询会员码订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员码订单分页列表 + */ + TableDataInfo queryPageList(HyCodeOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的会员码订单列表 + * + * @param bo 查询条件 + * @return 会员码订单列表 + */ + List queryList(HyCodeOrderBo bo); + + /** + * 新增会员码订单 + * + * @param bo 会员码订单 + * @return 是否新增成功 + */ + Boolean insertByBo(HyCodeOrderBo bo); + + /** + * 修改会员码订单 + * + * @param bo 会员码订单 + * @return 是否修改成功 + */ + Boolean updateByBo(HyCodeOrderBo bo); + + /** + * 校验并批量删除会员码订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 创建会员码订单 + * + * @param bo 订单信息 + * @return 是否成功 + */ + JSONObject createOrder(HyCodeOrderBo bo) throws Exception; + + /** + * APP端分页查询会员订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员订单分页列表 + */ + IPage queryPageListAPP(HyCodeOrderBo bo, PageQuery pageQuery); + + /** + * 批量逻辑删除订单 + * + * @param orderIds 订单ID列表 + * @param userId 用户ID + * @return 是否删除成功 + */ + Boolean logicDeleteByIds(List orderIds, Long userId, Integer roleType); + + /** + * 生成会员兑换码 + * + * @param orderId 订单ID + * @return 是否成功 + */ + Boolean generateMemberCodes(Long orderId); + + /** + * 根据订单号查询订单信息 + * + * @param orderNo 订单号 + * @param payOrderNo 支付订单号 + * @return 订单信息 + */ + HyCodeOrder queryByOrderNo(String orderNo, String payOrderNo); + + /** + * 查询会员码订单统计信息 + * @param bo + * @return + */ + HyCodeOrderSumVo querySum(HyCodeOrderBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCouponRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCouponRecordService.java new file mode 100644 index 0000000..93e4702 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyCouponRecordService.java @@ -0,0 +1,52 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.HyCouponRecordBo; +import org.dromara.mall.domain.vo.HyCouponRecordVo; + +import java.util.List; + +public interface IHyCouponRecordService { + + /** + * 查询会员券抵金记录 + */ + HyCouponRecordVo queryById(Long id); + + /** + * 查询会员券抵金记录列表 + */ + TableDataInfo queryPageList(HyCouponRecordBo bo, PageQuery pageQuery); + + /** + * 查询会员券抵金记录列表 + */ + List queryList(HyCouponRecordBo bo); + + /** + * 新增会员券抵金记录 + */ + Boolean insertByBo(HyCouponRecordBo bo); + + /** + * 修改会员券抵金记录 + */ + Boolean updateByBo(HyCouponRecordBo bo); + + /** + * 批量删除会员券抵金记录 + */ + Boolean deleteByIds(Long[] ids); + + /** + * 删除会员券抵金记录信息 + */ + Boolean deleteById(Long id); + + /** + * APP端分页查询会员券抵金记录列表 + */ + IPage queryPageListAPP(HyCouponRecordBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyMemberCodeService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyMemberCodeService.java new file mode 100644 index 0000000..4c3f8ad --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyMemberCodeService.java @@ -0,0 +1,104 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyMemberCode; +import org.dromara.mall.domain.bo.HyMemberCodeBo; +import org.dromara.mall.domain.vo.HyMemberCodeVo; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.List; + +/** + * 会员码兑换Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyMemberCodeService extends MPJBaseService { + + /** + * 查询会员码兑换 + * + * @param id 主键 + * @return 会员码兑换 + */ + HyMemberCodeVo queryById(Long id); + + /** + * 分页查询会员码兑换列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员码兑换分页列表 + */ + TableDataInfo queryPageList(HyMemberCodeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的会员码兑换列表 + * + * @param bo 查询条件 + * @return 会员码兑换列表 + */ + List queryList(HyMemberCodeBo bo); + + /** + * 新增会员码兑换 + * + * @param bo 会员码兑换 + * @return 是否新增成功 + */ + Boolean insertByBo(HyMemberCodeBo bo); + + /** + * 修改会员码兑换 + * + * @param bo 会员码兑换 + * @return 是否修改成功 + */ + Boolean updateByBo(HyMemberCodeBo bo); + + /** + * 校验并批量删除会员码兑换信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询会员码兑换列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员码兑换分页列表 + */ + IPage queryPageListAPP(HyMemberCodeBo bo, PageQuery pageQuery); + + /** + * 兑换会员码 + * + * @param code 兑换码 + * @param userId 用户ID + * @return 是否兑换成功 + */ + Boolean redeemCode(String code, Long userId); + + /** + * 复制兑换码 + * @param bo + * @return + */ + String copyCode(HyMemberCodeBo bo); + + /** + * 获取会员价格 1-会员价格 2-推广员价格 + * @param id + * @return + */ + BigDecimal getMemberPrice(Integer id); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderItemService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderItemService.java new file mode 100644 index 0000000..b5ab4ac --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderItemService.java @@ -0,0 +1,185 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyOrderItem; +import org.dromara.mall.domain.bo.BasketBo; +import org.dromara.mall.domain.bo.HyOrderItemBo; +import org.dromara.mall.domain.vo.HyOrderItemSumVo; +import org.dromara.mall.domain.vo.HyOrderItemVo; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantVo; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 订单详情Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyOrderItemService extends MPJBaseService { + + /** + * 查询订单详情 + * + * @param id 主键 + * @return 订单详情 + */ + HyOrderItemVo queryById(Long id); + + /** + * 分页查询订单详情列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单详情分页列表 + */ + TableDataInfo queryPageList(HyOrderItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单详情列表 + * + * @param bo 查询条件 + * @return 订单详情列表 + */ + List queryList(HyOrderItemBo bo); + + /** + * 新增订单详情 + * + * @param bo 订单详情 + * @return 是否新增成功 + */ + Long insertByBo(HyOrderItemBo bo) throws Exception; + + /** + * 修改订单详情 + * + * @param bo 订单详情 + * @return 是否修改成功 + */ + Boolean updateByBo(HyOrderItemBo bo); + + /** + * 校验并批量删除订单详情信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP查询订单详情列表 + * + * @param bo 订单详情 + * @return 订单详情 + */ + IPage queryPageListApp(HyOrderItemBo bo, @Valid PageQuery pageQuery); + + /** + * 批量逻辑删除订单 + * + * @param orderIds 订单ID列表 + * @param userId 用户ID + * @return 是否删除成功 + */ + boolean logicDeleteByIds(List orderIds, Long userId); + + /** + * 查询订单详情 + * + * @param orderId 订单ID + * @param userId 用户ID + * @return 订单详情 + */ + HyOrderItemVo queryOrderDetail(Long orderId, Long userId); + + /** + * 从购物车提交订单 + * + * @param basketBo 购物车ID列表 + * @param userId 用户ID + * @return 是否成功 + */ + Long insertByBasketIds(BasketBo basketBo, Long userId) throws Exception; + + /** + * 根据订单ID查询子订单列表 + * + * @param orderId 订单ID + * @param userId 用户ID + * @return 订单详情列表 + */ + List queryOrderItemsByOrderId(Long orderId, Long userId); + + /** + * 批量取消订单 + * + * @param orderIds 订单ID列表 + * @param userId 用户ID + * @return 是否取消成功 + */ + boolean cancelByIds(List orderIds, Long userId); + + /** + * 统计用户各状态订单数量 + * + * @param userId 用户ID + * @return 状态统计结果 + */ + Map countByStatus(Long userId); + + /** + * 确认订单 + * + * @param id 订单ID + * @return 是否成功 + */ + Boolean confirmOrder(@NotNull(message = "主键不能为空") Long id); + + /** + * 订单调价 + * + * @param bo 订单详情 + * @return 是否成功 + */ + Boolean editOrder(HyOrderItemBo bo); + + /** + * 查询租户销量排行榜列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 租户分页列表 + */ + TableDataInfo queryPageListChart(SysTenantBo bo, PageQuery pageQuery); + + /** + * 查询订单详情统计信息 + * @param bo + * @return + */ + HyOrderItemSumVo querySum(HyOrderItemBo bo); + + /** + * 确认收货 + * @param orderId + * @return + */ + boolean confirmOrderById(Long orderId); + + /** + * 订单退款 + * @param bo + * @return + */ + int refund(HyOrderItemBo bo) throws Exception; +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderPaymentService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderPaymentService.java new file mode 100644 index 0000000..f2622d1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderPaymentService.java @@ -0,0 +1,97 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyOrderPayment; +import org.dromara.mall.domain.bo.HyOrderPaymentBo; +import org.dromara.mall.domain.vo.HyOrderPaymenSumVo; +import org.dromara.mall.domain.vo.HyOrderPaymentVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单打款Service接口 + * + * @author Maosw + * @date 2024-12-27 + */ +public interface IHyOrderPaymentService extends MPJBaseService { + + /** + * 查询订单打款 + * + * @param id 主键 + * @return 订单打款 + */ + HyOrderPaymentVo queryById(Long id); + + /** + * 分页查询订单打款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单打款分页列表 + */ + TableDataInfo queryPageList(HyOrderPaymentBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单打款列表 + * + * @param bo 查询条件 + * @return 订单打款列表 + */ + List queryList(HyOrderPaymentBo bo); + + /** + * 新增订单打款 + * + * @param bo 订单打款 + * @return 是否新增成功 + */ + Boolean insertByBo(HyOrderPaymentBo bo); + + /** + * 修改订单打款 + * + * @param bo 订单打款 + * @return 是否修改成功 + */ + Boolean updateByBo(HyOrderPaymentBo bo); + + /** + * 校验并批量删除订单打款信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 租户提现 + * @param bo + * @return + */ + int withdrawal(HyOrderPaymentBo bo); + + /** + * 订单打款 + * @param bo + * @return + */ + int mark(HyOrderPaymentBo bo); + + /** + * 查询订单打款统计信息 + */ + HyOrderPaymenSumVo querySum(HyOrderPaymentBo bo); + + /** + * 审核拒绝 + * @param bo + * @return + */ + int refuse(HyOrderPaymentBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderService.java new file mode 100644 index 0000000..e564b4d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyOrderService.java @@ -0,0 +1,147 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyOrder; +import org.dromara.mall.domain.bo.HyOrderBo; +import org.dromara.mall.domain.vo.HyOrderSumVo; +import org.dromara.mall.domain.vo.HyOrderVo; + +import java.util.Collection; +import java.util.List; + +/** + * 总订单Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyOrderService extends MPJBaseService { + + /** + * 查询总订单 + * + * @param id 主键 + * @return 总订单 + */ + HyOrderVo queryById(Long id); + + /** + * 分页查询总订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 总订单分页列表 + */ + TableDataInfo queryPageList(HyOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的总订单列表 + * + * @param bo 查询条件 + * @return 总订单列表 + */ + List queryList(HyOrderBo bo); + + /** + * 新增总订单 + * + * @param bo 总订单 + * @return 是否新增成功 + */ + Boolean insertByBo(HyOrderBo bo); + + /** + * 修改总订单 + * + * @param bo 总订单 + * @return 是否修改成功 + */ + Boolean updateByBo(HyOrderBo bo); + + /** + * 校验并批量删除总订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 订单支付回调 + * + * @param orderId + * @return + */ + Boolean callbackOrder(Long orderId,String tradeNo,String logNo); + + /** + * 根据订单号查询订单 + * @param orderNo + * @param payOrderNo + * @return + */ + HyOrder queryByOrderNo(String orderNo, String payOrderNo); + + /** + * 根据订单号查询订单 + * @return + */ + int updateById1(HyOrder hyOrder); + + /** + * app端查询订单列表 + * @param bo + * @param pageQuery + * @return + */ + IPage queryPageListApp(HyOrderBo bo, @Valid PageQuery pageQuery); + + /** + * 取消订单 + * @param orderId + * @param userId + * @return + */ + Boolean cancelById(Long orderId, Long userId); + + /** + * 获取总订单待付款的数量 + * @param userId + * @return + */ + Long countByStatus(Long userId); + + /** + * 逻辑删除订单 + * @param orderId + * @param userId + * @return + */ + Boolean logicDeleteByIds(Long orderId, Long userId); + + /** + * 查询总订单统计信息 + * @param bo + * @return + */ + HyOrderSumVo querySum(HyOrderBo bo); + + /** + * 订单退款 + * @param bo + * @return + */ + int refund(HyOrderBo bo) throws Exception; + + /** + * 修改订单地址 + * @param bo + * @return + */ + boolean editOrderAddr(HyOrderBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterRecordService.java new file mode 100644 index 0000000..77506e1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterRecordService.java @@ -0,0 +1,78 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.HyPromoterRecordBo; +import org.dromara.mall.domain.vo.HyPromoterRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 推广员资金记录Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyPromoterRecordService { + + /** + * 查询推广员资金记录 + * + * @param id 主键 + * @return 推广员资金记录 + */ + HyPromoterRecordVo queryById(Long id); + + /** + * 分页查询推广员资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 推广员资金记录分页列表 + */ + TableDataInfo queryPageList(HyPromoterRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的推广员资金记录列表 + * + * @param bo 查询条件 + * @return 推广员资金记录列表 + */ + List queryList(HyPromoterRecordBo bo); + + /** + * 新增推广员资金记录 + * + * @param bo 推广员资金记录 + * @return 是否新增成功 + */ + Boolean insertByBo(HyPromoterRecordBo bo); + + /** + * 修改推广员资金记录 + * + * @param bo 推广员资金记录 + * @return 是否修改成功 + */ + Boolean updateByBo(HyPromoterRecordBo bo); + + /** + * 校验并批量删除推广员资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询推广员资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 资金记录分页列表 + */ + IPage queryPageListAPP(HyPromoterRecordBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterService.java new file mode 100644 index 0000000..33e4871 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyPromoterService.java @@ -0,0 +1,125 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyPromoter; +import org.dromara.mall.domain.bo.HyPromoterBo; +import org.dromara.mall.domain.vo.HyPromoterSumVo; +import org.dromara.mall.domain.vo.HyPromoterVo; + +import java.util.Collection; +import java.util.List; + +/** + * 推广员Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyPromoterService extends MPJBaseService { + + /** + * 查询推广员 + * + * @param id 主键 + * @return 推广员 + */ + HyPromoterVo queryById(Long id); + + /** + * 分页查询推广员列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 推广员分页列表 + */ + TableDataInfo queryPageList(HyPromoterBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的推广员列表 + * + * @param bo 查询条件 + * @return 推广员列表 + */ + List queryList(HyPromoterBo bo); + + /** + * 新增推广员 + * + * @param bo 推广员 + * @return 是否新增成功 + */ + Boolean insertByBo(HyPromoterBo bo); + + /** + * 修改推广员 + * + * @param bo 推广员 + * @return 是否修改成功 + */ + Boolean updateByBo(HyPromoterBo bo); + + /** + * 校验并批量删除推广员信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 推广员注册 + */ + Boolean register(HyPromoterBo bo); + + /** + * 推广员登录 + */ + HyPromoter login(String phone, String password); + + /** + * 检查手机号是否已注册 + */ + Boolean checkPhoneUnique(String phone); + + /** + * 提交推广员实名认证 + * + * @param bo 推广员认证信息 + * @return 是否提交成功 + */ + Boolean submitAuth(HyPromoterBo bo); + + /** + * 重置推广员密码 + * @param phone + * @param oldPassword + * @param newPassword + * @return + */ + Boolean resetPassword(String phone, String oldPassword, String newPassword); + + /** + * 后台重置密码 + * @param bo + * @return + */ + Boolean resetPasswordAdmin(HyPromoterBo bo); + + /** + * 查询渠道下单排行榜列表 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo queryPageListChart(HyPromoterBo bo, PageQuery pageQuery); + + /** + * 查询推广员统计信息 + * @param bo + * @return + */ + HyPromoterSumVo querySum(HyPromoterBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyUserRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyUserRecordService.java new file mode 100644 index 0000000..efebb28 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IHyUserRecordService.java @@ -0,0 +1,78 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.HyUserRecordBo; +import org.dromara.mall.domain.vo.HyUserRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户资金记录Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface IHyUserRecordService { + + /** + * 查询用户资金记录 + * + * @param id 主键 + * @return 用户资金记录 + */ + HyUserRecordVo queryById(Long id); + + /** + * 分页查询用户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户资金记录分页列表 + */ + TableDataInfo queryPageList(HyUserRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户资金记录列表 + * + * @param bo 查询条件 + * @return 用户资金记录列表 + */ + List queryList(HyUserRecordBo bo); + + /** + * 新增用户资金记录 + * + * @param bo 用户资金记录 + * @return 是否新增成功 + */ + Boolean insertByBo(HyUserRecordBo bo); + + /** + * 修改用户资金记录 + * + * @param bo 用户资金记录 + * @return 是否修改成功 + */ + Boolean updateByBo(HyUserRecordBo bo); + + /** + * 校验并批量删除用户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询用户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户资金记录分页列表 + */ + IPage queryPageListAPP(HyUserRecordBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAgreementService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAgreementService.java new file mode 100644 index 0000000..87f4a6d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAgreementService.java @@ -0,0 +1,76 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzAgreement; +import org.dromara.mall.domain.bo.TzAgreementBo; +import org.dromara.mall.domain.vo.TzAgreementVo; + +import java.util.Collection; +import java.util.List; + +/** + * 协议Service接口 + * + * @author Maosw + * @date 2024-12-26 + */ +public interface ITzAgreementService { + + /** + * 查询协议 + * + * @param id 主键 + * @return 协议 + */ + TzAgreementVo queryById(Long id); + + /** + * 分页查询协议列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 协议分页列表 + */ + TableDataInfo queryPageList(TzAgreementBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的协议列表 + * + * @param bo 查询条件 + * @return 协议列表 + */ + List queryList(TzAgreementBo bo); + + /** + * 新增协议 + * + * @param bo 协议 + * @return 是否新增成功 + */ + Boolean insertByBo(TzAgreementBo bo); + + /** + * 修改协议 + * + * @param bo 协议 + * @return 是否修改成功 + */ + Boolean updateByBo(TzAgreementBo bo); + + /** + * 校验并批量删除协议信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据条件查询数据 + * @return 查询结果 + */ + TzAgreement selectOne(LambdaQueryWrapper eq); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAreaService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAreaService.java new file mode 100644 index 0000000..bb5d878 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAreaService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzAreaBo; +import org.dromara.mall.domain.vo.TzAreaVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzAreaService { + + /** + * 查询【请填写功能名称】 + * + * @param areaId 主键 + * @return 【请填写功能名称】 + */ + TzAreaVo queryById(Long areaId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzAreaBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzAreaBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzAreaBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzAreaBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAttachFileService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAttachFileService.java new file mode 100644 index 0000000..0150aaa --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzAttachFileService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzAttachFileBo; +import org.dromara.mall.domain.vo.TzAttachFileVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzAttachFileService { + + /** + * 查询【请填写功能名称】 + * + * @param fileId 主键 + * @return 【请填写功能名称】 + */ + TzAttachFileVo queryById(Long fileId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzAttachFileBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzAttachFileBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzAttachFileBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzAttachFileBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBankCardService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBankCardService.java new file mode 100644 index 0000000..465ac6d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBankCardService.java @@ -0,0 +1,127 @@ +package org.dromara.mall.service; + +import com.lakala.zf.laop.java.sdk.demo.bo.AddOrUpdateBankCardReq; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzBankCard; +import org.dromara.mall.domain.bo.TzBankCardBo; +import org.dromara.mall.domain.vo.TzBankCardVo; + +import java.util.Collection; +import java.util.List; + +/** + * 绑定银行卡信息Service接口 + * + * @author Maosw + * @date 2024-12-12 + */ +public interface ITzBankCardService { + + /** + * 查询绑定银行卡信息 + * + * @param id 主键 + * @return 绑定银行卡信息 + */ + TzBankCardVo queryById(Long id); + + /** + * 分页查询绑定银行卡信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 绑定银行卡信息分页列表 + */ + TableDataInfo queryPageList(TzBankCardBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的绑定银行卡信息列表 + * + * @param bo 查询条件 + * @return 绑定银行卡信息列表 + */ + List queryList(TzBankCardBo bo); + + /** + * 新增绑定银行卡信息 + * + * @param bo 绑定银行卡信息 + * @return 是否新增成功 + */ + Boolean insertByBo(TzBankCardBo bo); + + /** + * 修改绑定银行卡信息 + * + * @param bo 绑定银行卡信息 + * @return 是否修改成功 + */ + Boolean updateByBo(TzBankCardBo bo); + + /** + * 校验并批量删除绑定银行卡信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 逻辑删除银行卡 + * + * @param cardId 银行卡ID + * @param userId 用户ID + * @return 是否删除成功 + */ + Boolean logicDeleteByCardId(Long cardId, Long userId); + + /** + * APP端查询银行卡列表 + * + * @param bo 查询条件 + * @return 银行卡列表 + */ + List queryListAPP(TzBankCardBo bo); + + /** + * 设置默认银行卡 + * + * @param cardId 银行卡ID + * @param userId 用户ID + * @return 是否设置成功 + */ + Boolean setDefaultCard(Long cardId, Long userId,Integer roleType); + + /** + * 查询用户是否已绑定银行卡 + * + * @param userId 用户ID + * @return 是否已绑定 + */ + Boolean hasBankCard(Long userId, Integer roleType); + + /** + * 添加或修改银行卡信息 + * + * @param req 银行卡信息 + * @param userId 用户ID + * @return 是否添加或修改成功 + */ + Boolean addOrUpdateBankCard(AddOrUpdateBankCardReq req, Long userId); + + /** + * 根据拉卡拉接收方编号查询银行卡信息 + * @param receiverNo + * @return + */ + TzBankCard queryByReceiverNo(String receiverNo); + + /** + * 根据银行卡ID更新银行卡信息 + * @param bankCard + * @return + */ + Boolean updateById(TzBankCard bankCard); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBasketService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBasketService.java new file mode 100644 index 0000000..9284596 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBasketService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzBasketBo; +import org.dromara.mall.domain.vo.TzBasketVo; + +import java.util.Collection; +import java.util.List; + +/** + * 购物车Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzBasketService { + + /** + * 查询购物车 + * + * @param basketId 主键 + * @return 购物车 + */ + TzBasketVo queryById(Long basketId); + + /** + * 分页查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + TableDataInfo queryPageList(TzBasketBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的购物车列表 + * + * @param bo 查询条件 + * @return 购物车列表 + */ + List queryList(TzBasketBo bo); + + /** + * 新增购物车 + * + * @param bo 购物车 + * @return 是否新增成功 + */ + Boolean insertByBo(TzBasketBo bo); + + /** + * 修改购物车 + * + * @param bo 购物车 + * @return 是否修改成功 + */ + Boolean updateByBo(TzBasketBo bo); + + /** + * 校验并批量删除购物车信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBrandService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBrandService.java new file mode 100644 index 0000000..6646efd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzBrandService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzBrandBo; +import org.dromara.mall.domain.vo.TzBrandVo; + +import java.util.Collection; +import java.util.List; + +/** + * 品牌Service接口 + * + * @author Maosw + * @date 2024-09-26 + */ +public interface ITzBrandService { + + /** + * 查询品牌 + * + * @param id 主键 + * @return 品牌 + */ + TzBrandVo queryById(Long id); + + /** + * 分页查询品牌列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 品牌分页列表 + */ + TableDataInfo queryPageList(TzBrandBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的品牌列表 + * + * @param bo 查询条件 + * @return 品牌列表 + */ + List queryList(TzBrandBo bo); + + /** + * 新增品牌 + * + * @param bo 品牌 + * @return 是否新增成功 + */ + Boolean insertByBo(TzBrandBo bo); + + /** + * 修改品牌 + * + * @param bo 品牌 + * @return 是否修改成功 + */ + Boolean updateByBo(TzBrandBo bo); + + /** + * 校验并批量删除品牌信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryBrandService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryBrandService.java new file mode 100644 index 0000000..a5a923b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryBrandService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzCategoryBrandBo; +import org.dromara.mall.domain.vo.TzCategoryBrandVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzCategoryBrandService { + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + TzCategoryBrandVo queryById(Long id); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzCategoryBrandBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzCategoryBrandBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzCategoryBrandBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzCategoryBrandBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryPropService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryPropService.java new file mode 100644 index 0000000..9fc0460 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryPropService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzCategoryPropBo; +import org.dromara.mall.domain.vo.TzCategoryPropVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzCategoryPropService { + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + TzCategoryPropVo queryById(Long id); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzCategoryPropBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzCategoryPropBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzCategoryPropBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzCategoryPropBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryService.java new file mode 100644 index 0000000..ec4eae3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCategoryService.java @@ -0,0 +1,71 @@ +package org.dromara.mall.service; + +import org.dromara.mall.domain.bo.TzCategoryBo; +import org.dromara.mall.domain.vo.TzCategoryVo; + +import java.util.Collection; +import java.util.List; + +/** + * 产品类目Service接口 + * + * @author Lion Li + * @date 2024-07-31 + */ +public interface ITzCategoryService { + + /** + * 查询产品类目 + * + * @param categoryId 主键 + * @return 产品类目 + */ + TzCategoryVo queryById(Long categoryId); + + + /** + * 查询符合条件的产品类目列表 + * + * @param bo 查询条件 + * @return 产品类目列表 + */ + List queryList(TzCategoryBo bo); + + /** + * 新增产品类目 + * + * @param bo 产品类目 + * @return 是否新增成功 + */ + Boolean insertByBo(TzCategoryBo bo); + + /** + * 修改产品类目 + * + * @param bo 产品类目 + * @return 是否修改成功 + */ + Boolean updateByBo(TzCategoryBo bo); + + /** + * 校验并批量删除产品类目信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 分类信息列表 + * @param parentId + * @return + */ + List listByParentId(Long parentId); + + /** + * 全部分类信息列表 + * @return + */ + List categoryAll(); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerRecordService.java new file mode 100644 index 0000000..a376ab4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerRecordService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzCustomerRecordBo; +import org.dromara.mall.domain.vo.TzCustomerRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 客户资金记录Service接口 + * + * @author Maosw + * @date 2024-09-12 + */ +public interface ITzCustomerRecordService { + + /** + * 查询客户资金记录 + * + * @param id 主键 + * @return 客户资金记录 + */ + TzCustomerRecordVo queryById(Long id); + + /** + * 分页查询客户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户资金记录分页列表 + */ + TableDataInfo queryPageList(TzCustomerRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户资金记录列表 + * + * @param bo 查询条件 + * @return 客户资金记录列表 + */ + List queryList(TzCustomerRecordBo bo); + + /** + * 新增客户资金记录 + * + * @param bo 客户资金记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzCustomerRecordBo bo); + + /** + * 修改客户资金记录 + * + * @param bo 客户资金记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzCustomerRecordBo bo); + + /** + * 校验并批量删除客户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerService.java new file mode 100644 index 0000000..2ff8253 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzCustomerService.java @@ -0,0 +1,81 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzCustomerBo; +import org.dromara.mall.domain.vo.TzCustomerSumVo; +import org.dromara.mall.domain.vo.TzCustomerVo; + +import java.util.Collection; +import java.util.List; + +/** + * 客户Service接口 + * + * @author Maosw + * @date 2024-09-04 + */ +public interface ITzCustomerService { + + /** + * 查询客户 + * + * @param id 主键 + * @return 客户 + */ + TzCustomerVo queryById(Long id); + + /** + * 分页查询客户列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户分页列表 + */ + TableDataInfo queryPageList(TzCustomerBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户列表 + * + * @param bo 查询条件 + * @return 客户列表 + */ + List queryList(TzCustomerBo bo); + + /** + * 新增客户 + * + * @param bo 客户 + * @return 是否新增成功 + */ + Boolean insertByBo(TzCustomerBo bo); + + /** + * 修改客户 + * + * @param bo 客户 + * @return 是否修改成功 + */ + Boolean updateByBo(TzCustomerBo bo); + + /** + * 校验并批量删除客户信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 申请退款(客服) + */ + Boolean refund(TzCustomerBo bo); + + /** + * 查询客户列表统计 + * @param bo + * @return + */ + TzCustomerSumVo queryListCount(TzCustomerBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzDeliveryService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzDeliveryService.java new file mode 100644 index 0000000..3bbb2ff --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzDeliveryService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzDeliveryBo; +import org.dromara.mall.domain.vo.TzDeliveryVo; + +import java.util.Collection; +import java.util.List; + +/** + * 物流公司Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzDeliveryService { + + /** + * 查询物流公司 + * + * @param dvyId 主键 + * @return 物流公司 + */ + TzDeliveryVo queryById(Long dvyId); + + /** + * 分页查询物流公司列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 物流公司分页列表 + */ + TableDataInfo queryPageList(TzDeliveryBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的物流公司列表 + * + * @param bo 查询条件 + * @return 物流公司列表 + */ + List queryList(TzDeliveryBo bo); + + /** + * 新增物流公司 + * + * @param bo 物流公司 + * @return 是否新增成功 + */ + Boolean insertByBo(TzDeliveryBo bo); + + /** + * 修改物流公司 + * + * @param bo 物流公司 + * @return 是否修改成功 + */ + Boolean updateByBo(TzDeliveryBo bo); + + /** + * 校验并批量删除物流公司信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzHotSearchService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzHotSearchService.java new file mode 100644 index 0000000..8abcf8f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzHotSearchService.java @@ -0,0 +1,91 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzHotSearchBo; +import org.dromara.mall.domain.vo.TzHotSearchVo; + +import java.util.Collection; +import java.util.List; + +/** + * 热搜Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzHotSearchService { + + /** + * 查询热搜 + * + * @param hotSearchId 主键 + * @return 热搜 + */ + TzHotSearchVo queryById(Long hotSearchId); + + /** + * 分页查询热搜列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 热搜分页列表 + */ + TableDataInfo queryPageList(TzHotSearchBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的热搜列表 + * + * @param bo 查询条件 + * @return 热搜列表 + */ + List queryList(TzHotSearchBo bo); + + /** + * 新增热搜 + * + * @param bo 热搜 + * @return 是否新增成功 + */ + Boolean insertByBo(TzHotSearchBo bo); + + /** + * 修改热搜 + * + * @param bo 热搜 + * @return 是否修改成功 + */ + Boolean updateByBo(TzHotSearchBo bo); + + /** + * 校验并批量删除热搜信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 模糊查询搜索关键词 + * @param bo + * @param pageQuery + * @return + */ + IPage pageSearchByName(TzHotSearchBo bo, PageQuery pageQuery); + + /** + * 猜你想搜 + * @param pageQuery + * @return + */ + IPage searchList(PageQuery pageQuery); + + /** + * 更新搜索关键词次数 + * @param title + * @return + */ + void setSearchNum(String title); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexImgService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexImgService.java new file mode 100644 index 0000000..427a33e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexImgService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzIndexImgBo; +import org.dromara.mall.domain.vo.TzIndexImgVo; + +import java.util.Collection; +import java.util.List; + +/** + * 主页轮播图Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzIndexImgService { + + /** + * 查询主页轮播图 + * + * @param imgId 主键 + * @return 主页轮播图 + */ + TzIndexImgVo queryById(Long imgId); + + /** + * 分页查询主页轮播图列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 主页轮播图分页列表 + */ + TableDataInfo queryPageList(TzIndexImgBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的主页轮播图列表 + * + * @param bo 查询条件 + * @return 主页轮播图列表 + */ + List queryList(TzIndexImgBo bo); + + /** + * 新增主页轮播图 + * + * @param bo 主页轮播图 + * @return 是否新增成功 + */ + Boolean insertByBo(TzIndexImgBo bo); + + /** + * 修改主页轮播图 + * + * @param bo 主页轮播图 + * @return 是否修改成功 + */ + Boolean updateByBo(TzIndexImgBo bo); + + /** + * 校验并批量删除主页轮播图信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexService.java new file mode 100644 index 0000000..f5aa5be --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzIndexService.java @@ -0,0 +1,163 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.mall.domain.vo.IndexCountVo; +import org.dromara.mall.domain.vo.IndexSumVo; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; + +import java.util.List; + +/** + * 首页Service接口 + * + * @author Maosw + * @date 2024-08-30 + */ +public interface ITzIndexService { + + /** + * 系统角色首页 + * @return + */ + IndexSumVo sysUser(); + + /** + * 系统用户统计 + * @return + */ + IndexCountVo sysUserCount(); + + /** + * 租户角色首页 + * @return + */ + IndexCountVo zhUser(); + + + /** + * 业绩按月统计 + * @param month + * @return + */ + List monthPer(String month); + + /** + * 业绩按年统计 + * @param year + * @return + */ + List yearPer(String year); + + /** + * 产品数量按月统计 + * @param month + * @return + */ + List monthPerProd(String month); + + + /** + * 产品销量排行榜 + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + IPage prodSalesVolumeCount(PageQuery pageQuery, String startDay, String endDay); + + /** + * 产品销售额排行榜 + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + IPage prodSalesVolumeSum(PageQuery pageQuery, String startDay, String endDay); + + /** + * 产品数量按年统计 + * @param year + * @return + */ + List yearPerProd(String year); + + /** + * 会员码数量按月统计 + * @return + */ + List monthPerCode(String month); + + /** + * 会员码数量按年统计 + * @param year + * @return + */ + List yearPerCode(String year); + + /** + * 推广员下单数量排行榜 + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + IPage promoterCountMonth(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 推广员下单金额排行榜 + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + IPage promoterSumMonth(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 小程序用户数量排行榜 + * @param startDay + * @param endDay + * @return + */ + IPage xcxUserCountMonth(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 小程序用户下单金额排行榜 + * @param startDay + * @param endDay + * @return + */ + IPage xcxUserSumMonth(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 工厂销售数量排行榜 + * @param startDay + * @param endDay + * @return + */ + IPage factorySalesVolumeCount(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 工厂销售金额排行榜 + * @param startDay + * @param endDay + * @return + */ + IPage factorySalesVolumeSum(@Valid PageQuery pageQuery, String startDay, String endDay); + + /** + * 会员码销售额按月统计 + * @param month + * @return + */ + List monthPerCodePer(String month); + + /** + * 会员码销售额按年统计 + * @param year + * @return + */ + List yearPerCodePer(String year); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceApplyService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceApplyService.java new file mode 100644 index 0000000..0f0f0a1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceApplyService.java @@ -0,0 +1,90 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzInvoiceApplyBo; +import org.dromara.mall.domain.vo.TzInvoicApplySumVo; +import org.dromara.mall.domain.vo.TzInvoiceApplyVo; + +import java.util.Collection; +import java.util.List; + +/** + * 发票申请记录Service接口 + * + * @author Maosw + * @date 2024-12-25 + */ +public interface ITzInvoiceApplyService { + + /** + * 查询发票申请记录 + * + * @param id 主键 + * @return 发票申请记录 + */ + TzInvoiceApplyVo queryById(Long id); + + /** + * 分页查询发票申请记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 发票申请记录分页列表 + */ + TableDataInfo queryPageList(TzInvoiceApplyBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的发票申请记录列表 + * + * @param bo 查询条件 + * @return 发票申请记录列表 + */ + List queryList(TzInvoiceApplyBo bo); + + /** + * 新增发票申请记录 + * + * @param bo 发票申请记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzInvoiceApplyBo bo); + + /** + * 修改发票申请记录 + * + * @param bo 发票申请记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzInvoiceApplyBo bo); + + /** + * 校验并批量删除发票申请记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询发票记录列表 + */ + IPage queryPageListAPP(TzInvoiceApplyBo bo, PageQuery pageQuery); + + /** + * 取消发票申请 + */ + Boolean cancelApply(Long id); + + /** + * 根据订单ID查询发票申请记录 + */ + TzInvoiceApplyVo queryByOrderId(Long orderId, Long userId); + + /** + * 查询发票申请记录统计信息 + */ + TzInvoicApplySumVo querySum(TzInvoiceApplyBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceTitleService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceTitleService.java new file mode 100644 index 0000000..635cc24 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzInvoiceTitleService.java @@ -0,0 +1,76 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzInvoiceTitle; +import org.dromara.mall.domain.bo.TzInvoiceTitleBo; +import org.dromara.mall.domain.vo.TzInvoiceTitleVo; + +import java.util.Collection; +import java.util.List; + +/** + * 发票抬头信息Service接口 + * + * @author Maosw + * @date 2024-12-25 + */ +public interface ITzInvoiceTitleService extends IService { + + /** + * 查询发票抬头信息 + * + * @param id 主键 + * @return 发票抬头信息 + */ + TzInvoiceTitleVo queryById(Long id); + + /** + * 分页查询发票抬头信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 发票抬头信息分页列表 + */ + TableDataInfo queryPageList(TzInvoiceTitleBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的发票抬头信息列表 + * + * @param bo 查询条件 + * @return 发票抬头信息列表 + */ + List queryList(TzInvoiceTitleBo bo); + + /** + * 新增发票抬头信息 + * + * @param bo 发票抬头信息 + * @return 是否新增成功 + */ + Boolean insertByBo(TzInvoiceTitleBo bo); + + /** + * 修改发票抬头信息 + * + * @param bo 发票抬头信息 + * @return 是否修改成功 + */ + Boolean updateByBo(TzInvoiceTitleBo bo); + + /** + * 校验并批量删除发票抬头信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询发票抬头列表 + */ + IPage queryPageListAPP(TzInvoiceTitleBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzMessageService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzMessageService.java new file mode 100644 index 0000000..bbadc4c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzMessageService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzMessageBo; +import org.dromara.mall.domain.vo.TzMessageVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzMessageService { + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + TzMessageVo queryById(Long id); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzMessageBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzMessageBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzMessageBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzMessageBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzNoticeService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzNoticeService.java new file mode 100644 index 0000000..7fa0931 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzNoticeService.java @@ -0,0 +1,80 @@ +package org.dromara.mall.service; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzNoticeBo; +import org.dromara.mall.domain.vo.TzNoticeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 公告Service接口 + * + * @author Maosw + * @date 2025-01-13 + */ +public interface ITzNoticeService { + + /** + * 查询公告 + * + * @param id 主键 + * @return 公告 + */ + TzNoticeVo queryById(Long id); + + /** + * 分页查询公告列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 公告分页列表 + */ + TableDataInfo queryPageList(TzNoticeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的公告列表 + * + * @param bo 查询条件 + * @return 公告列表 + */ + List queryList(TzNoticeBo bo); + + /** + * 新增公告 + * + * @param bo 公告 + * @return 是否新增成功 + */ + Boolean insertByBo(TzNoticeBo bo); + + /** + * 修改公告 + * + * @param bo 公告 + * @return 是否修改成功 + */ + Boolean updateByBo(TzNoticeBo bo); + + /** + * 校验并批量删除公告信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 公告分页列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 公告分页列表 + */ + IPage queryPageListAPP(TzNoticeBo bo, @Valid PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderAllService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderAllService.java new file mode 100644 index 0000000..27b9a82 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderAllService.java @@ -0,0 +1,75 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderAll; +import org.dromara.mall.domain.bo.TzOrderAllBo; +import org.dromara.mall.domain.vo.TzOrderAllVo; + +import java.util.List; + +/** + * 订单汇总Service接口 + * + * @author Maosw + * @date 2024-09-04 + */ +public interface ITzOrderAllService extends MPJBaseService { + + /** + * 查询订单汇总 + * + * @param id 主键 + * @return 订单汇总 + */ + TzOrderAllVo queryById(Long id); + + /** + * 分页查询订单汇总列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单汇总分页列表 + */ + TableDataInfo queryPageList(TzOrderAllBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单汇总列表 + * + * @param bo 查询条件 + * @return 订单汇总列表 + */ + List queryList(TzOrderAllBo bo); + + /** + * 新增订单汇总 + * + * @param bo 订单汇总 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderAllBo bo); + + /** + * 修改订单汇总 + * + * @param bo 订单汇总 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderAllBo bo); + + /** + * 校验并批量删除订单汇总信息 + * + * @param id 待删除的主键集合 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Long id); + + /** + * 总订单确认 + * @param id + * @return + */ + Boolean confirm(Long id); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderItemService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderItemService.java new file mode 100644 index 0000000..7d15217 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderItemService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzOrderItemBo; +import org.dromara.mall.domain.vo.TzOrderItemVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单项Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzOrderItemService { + + /** + * 查询订单项 + * + * @param orderItemId 主键 + * @return 订单项 + */ + TzOrderItemVo queryById(Long orderItemId); + + /** + * 分页查询订单项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单项分页列表 + */ + TableDataInfo queryPageList(TzOrderItemBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单项列表 + * + * @param bo 查询条件 + * @return 订单项列表 + */ + List queryList(TzOrderItemBo bo); + + /** + * 新增订单项 + * + * @param bo 订单项 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderItemBo bo); + + /** + * 修改订单项 + * + * @param bo 订单项 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderItemBo bo); + + /** + * 校验并批量删除订单项信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderReceiveService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderReceiveService.java new file mode 100644 index 0000000..084d726 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderReceiveService.java @@ -0,0 +1,99 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderReceive; +import org.dromara.mall.domain.bo.TzOrderReceiveBo; +import org.dromara.mall.domain.vo.TzOrderReceiveSumVo; +import org.dromara.mall.domain.vo.TzOrderReceiveVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单汇款Service接口 + * + * @author Maosw + * @date 2024-09-03 + */ +public interface ITzOrderReceiveService extends MPJBaseService { + + /** + * 查询订单汇款 + * + * @param id 主键 + * @return 订单汇款 + */ + TzOrderReceiveVo queryById(Long id); + + /** + * 分页查询订单汇款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单汇款分页列表 + */ + TableDataInfo queryPageList(TzOrderReceiveBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单汇款列表 + * + * @param bo 查询条件 + * @return 订单汇款列表 + */ + List queryList(TzOrderReceiveBo bo); + + /** + * 新增订单汇款 + * + * @param bo 订单汇款 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderReceiveBo bo); + + /** + * 修改订单汇款 + * + * @param bo 订单汇款 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderReceiveBo bo); + + /** + * 作废汇款(财务) + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 审核汇款(财务) + * @param bo + * @return + */ + Boolean examine(TzOrderReceiveBo bo); + + /** + * 查询订单汇款列表统计 + * @param bo + * @return + */ + TzOrderReceiveSumVo queryListCount(TzOrderReceiveBo bo); + + /** + * 领取汇款(客服) + * @param bo + * @return + */ + Boolean receive(TzOrderReceiveBo bo); + + /** + * 回退汇款(财务) + * @param bo + * @return + */ + Boolean fallback(TzOrderReceiveBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRecordService.java new file mode 100644 index 0000000..6501fc0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRecordService.java @@ -0,0 +1,80 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderRecord; +import org.dromara.mall.domain.bo.TzOrderRecordBo; +import org.dromara.mall.domain.vo.TzOrderRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单修改记录Service接口 + * + * @author Lion Li + * @date 2024-08-03 + */ +public interface ITzOrderRecordService extends MPJBaseService { + + /** + * 查询订单修改记录 + * + * @param id 主键 + * @return 订单修改记录 + */ + TzOrderRecordVo queryById(Long id); + + /** + * 分页查询订单修改记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单修改记录分页列表 + */ + TableDataInfo queryPageList(TzOrderRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单修改记录列表 + * + * @param bo 查询条件 + * @return 订单修改记录列表 + */ + List queryList(TzOrderRecordBo bo); + + /** + * 新增订单修改记录 + * + * @param bo 订单修改记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderRecordBo bo); + + /** + * 修改订单修改记录 + * + * @param bo 订单修改记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderRecordBo bo); + + /** + * 订单操作历史记录 + * @param allId + * @param orderId + * @param type + * @param content + * @return + */ + public Boolean insertOrderRecord(Long allId, String orderId, String type, String content); + + /** + * 校验并批量删除订单修改记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRefundService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRefundService.java new file mode 100644 index 0000000..80480c7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderRefundService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzOrderRefundBo; +import org.dromara.mall.domain.vo.TzOrderRefundVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzOrderRefundService { + + /** + * 查询【请填写功能名称】 + * + * @param refundId 主键 + * @return 【请填写功能名称】 + */ + TzOrderRefundVo queryById(Long refundId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzOrderRefundBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzOrderRefundBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderRefundBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderRefundBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderService.java new file mode 100644 index 0000000..baae10d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderService.java @@ -0,0 +1,184 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrder; +import org.dromara.mall.domain.bo.TzOrderBo; +import org.dromara.mall.domain.vo.TzCustomerVo; +import org.dromara.mall.domain.vo.TzOrderSumVo; +import org.dromara.mall.domain.vo.TzOrderVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单Service接口 + * + * @author Maosw + * @date 2024-08-03 + */ +public interface ITzOrderService extends MPJBaseService { + + /** + * 查询订单 + * + * @param orderId 主键 + * @return 订单 + */ + TzOrderVo queryById(Long orderId); + + /** + * 分页查询订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单分页列表 + */ + TableDataInfo queryPageList(TzOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单列表 + * + * @param bo 查询条件 + * @return 订单列表 + */ + List queryList(TzOrderBo bo); + + /** + * 新增订单 + * + * @param bo 订单 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderBo bo); + + /** + * 修改订单 + * + * @param bo 订单 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderBo bo); + + /** + * 提交打款信息(采购) + * + * @param bo 订单 + * @return 是否成功 + */ + Boolean remitInfo(TzOrderBo bo); + + /** + * 校验并批量删除订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 客服改价 + * @param bo + * @return + */ + Boolean updateGJ(TzOrderBo bo); + + /** + * 订单支付 + */ + Boolean payOrder(TzOrderBo bo); + + /** + * 关闭订单 + * @param orderId + * @return + */ + Boolean closeOrder(Long[] orderId); + + /** + * 修改订单 + * @param bo + * @return + */ + Boolean updateByTzOrderBo(TzOrderBo bo); + + /** + * 修改发货地址 + * @param bo + * @return + */ + Boolean editAddress(TzOrderBo bo); + + /** + * 订单发货 + * @param bo + * @return + */ + Boolean deliverGoods(TzOrderBo bo); + + /** + * 修改快递单号 + * @param bo + * @return + */ + Boolean editExpress(TzOrderBo bo); + + /** + * 标记已签收 + * @param bo + * @return + */ + Boolean signFeceipt(TzOrderBo bo); + + /** + * 标记已处理 + * @param bo + * @return + */ + Boolean processed(TzOrderBo bo); + + /** + * 标记已采购 + * @param bo + * @return + */ + Boolean purchased(TzOrderBo bo); + + /** + * 获取客户信息和余额 + * @param type + * @param orderId + * @return + */ + TzCustomerVo getUserInfo(Integer type, Integer orderId); + + /** + * 查询订单列表统计 + * @param bo + * @return + */ + TzOrderSumVo queryListCount(TzOrderBo bo); + + /** + * 查询订单列表统计(采购) + * @param bo + * @return + */ + TzOrderSumVo queryListCountCG(TzOrderBo bo); + + /** + * 订单指派 + * @param bo + * @return + */ + Boolean assign(TzOrderBo bo); + + /** + * 定金采购 + * @param bo + * @return + */ + Boolean depositPurchase(TzOrderBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderSettlementService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderSettlementService.java new file mode 100644 index 0000000..a87d9cf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderSettlementService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzOrderSettlementBo; +import org.dromara.mall.domain.vo.TzOrderSettlementVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzOrderSettlementService { + + /** + * 查询【请填写功能名称】 + * + * @param settlementId 主键 + * @return 【请填写功能名称】 + */ + TzOrderSettlementVo queryById(Long settlementId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzOrderSettlementBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzOrderSettlementBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzOrderSettlementBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderSettlementBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderShareService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderShareService.java new file mode 100644 index 0000000..5268053 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzOrderShareService.java @@ -0,0 +1,70 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderShare; +import org.dromara.mall.domain.bo.TzOrderShareBo; +import org.dromara.mall.domain.vo.TzOrderShareVo; + +import java.util.Collection; +import java.util.List; + +/** + * 订单分享Service接口 + * + * @author Maosw + * @date 2024-09-14 + */ +public interface ITzOrderShareService extends MPJBaseService { + + /** + * 查询订单分享 + * + * @param id 主键 + * @return 订单分享 + */ + TzOrderShareVo queryById(Long id); + + /** + * 分页查询订单分享列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单分享分页列表 + */ + TableDataInfo queryPageList(TzOrderShareBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的订单分享列表 + * + * @param bo 查询条件 + * @return 订单分享列表 + */ + List queryList(TzOrderShareBo bo); + + /** + * 新增订单分享 + * + * @param bo 订单分享 + * @return 是否新增成功 + */ + Long insertByBo(TzOrderShareBo bo); + + /** + * 修改订单分享 + * + * @param bo 订单分享 + * @return 是否修改成功 + */ + Boolean updateByBo(TzOrderShareBo bo); + + /** + * 校验并批量删除订单分享信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPickAddrService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPickAddrService.java new file mode 100644 index 0000000..593f92a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPickAddrService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzPickAddrBo; +import org.dromara.mall.domain.vo.TzPickAddrVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户配送地址Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzPickAddrService { + + /** + * 查询用户配送地址 + * + * @param addrId 主键 + * @return 用户配送地址 + */ + TzPickAddrVo queryById(Long addrId); + + /** + * 分页查询用户配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配送地址分页列表 + */ + TableDataInfo queryPageList(TzPickAddrBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户配送地址列表 + * + * @param bo 查询条件 + * @return 用户配送地址列表 + */ + List queryList(TzPickAddrBo bo); + + /** + * 新增用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否新增成功 + */ + Boolean insertByBo(TzPickAddrBo bo); + + /** + * 修改用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否修改成功 + */ + Boolean updateByBo(TzPickAddrBo bo); + + /** + * 校验并批量删除用户配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPictureAlbumService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPictureAlbumService.java new file mode 100644 index 0000000..033c0f4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzPictureAlbumService.java @@ -0,0 +1,78 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzPictureAlbumBo; +import org.dromara.mall.domain.vo.TzPictureAlbumVo; + +import java.util.Collection; +import java.util.List; + +/** + * 画册Service接口 + * + * @author Maosw + * @date 2024-10-04 + */ +public interface ITzPictureAlbumService { + + /** + * 查询画册 + * + * @param id 主键 + * @return 画册 + */ + TzPictureAlbumVo queryById(Long id); + + /** + * 分页查询画册列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 画册分页列表 + */ + TableDataInfo queryPageList(TzPictureAlbumBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的画册列表 + * + * @param bo 查询条件 + * @return 画册列表 + */ + List queryList(TzPictureAlbumBo bo); + + /** + * 新增画册 + * + * @param bo 画册 + * @return 是否新增成功 + */ + Boolean insertByBo(TzPictureAlbumBo bo); + + /** + * 修改画册 + * + * @param bo 画册 + * @return 是否修改成功 + */ + Boolean updateByBo(TzPictureAlbumBo bo); + + /** + * 校验并批量删除画册信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 画册列表 + * @param bo + * @param pageQuery + * @return + */ + IPage pictureAlbumList(TzPictureAlbumBo bo, @Valid PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdBrowseService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdBrowseService.java new file mode 100644 index 0000000..58438bd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdBrowseService.java @@ -0,0 +1,100 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdBrowse; +import org.dromara.mall.domain.bo.TzProdBrowseBo; +import org.dromara.mall.domain.vo.TzProdBrowseVo; +import org.dromara.mall.domain.vo.TzProdVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品浏览Service接口 + * + * @author Maosw + * @date 2024-08-05 + */ +public interface ITzProdBrowseService { + + /** + * 查询商品浏览 + * + * @param id 主键 + * @return 商品浏览 + */ + TzProdBrowseVo queryById(Long id); + + /** + * 分页查询商品浏览列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品浏览分页列表 + */ + TableDataInfo queryPageList(TzProdBrowseBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的商品浏览列表 + * + * @param bo 查询条件 + * @return 商品浏览列表 + */ + List queryList(TzProdBrowseBo bo); + + /** + * 新增商品浏览 + * + * @param bo 商品浏览 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdBrowseBo bo); + + /** + * 修改商品浏览 + * + * @param bo 商品浏览 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdBrowseBo bo); + + /** + * 校验并批量删除商品浏览信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据用户ID分页查询浏览记录列表 + * @param userId + * @param pageQuery + * @return + */ + IPage queryPageListByUserId(Long userId, PageQuery pageQuery); + + /** + * 查询浏览记录 + * @param userId + * @param prodId + * @return + */ + TzProdBrowse queryListOne(Long userId,Long prodId); + + /** + * 更新浏览记录 + * @param prodBrowse + */ + void update(TzProdBrowse prodBrowse); + + /** + * 根据用户ID查询浏览记录数量 + * @param userId + * @return + */ + Long countByUserId(Long userId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdCommService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdCommService.java new file mode 100644 index 0000000..2368330 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdCommService.java @@ -0,0 +1,94 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdCommBo; +import org.dromara.mall.domain.vo.TzProdCommVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品评论Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdCommService { + + /** + * 查询商品评论 + * + * @param prodCommId 主键 + * @return 商品评论 + */ + TzProdCommVo queryById(Long prodCommId); + + /** + * 分页查询商品评论列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品评论分页列表 + */ + TableDataInfo queryPageList(TzProdCommBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的商品评论列表 + * + * @param bo 查询条件 + * @return 商品评论列表 + */ + List queryList(TzProdCommBo bo); + + /** + * 新增商品评论 + * + * @param bo 商品评论 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdCommBo bo); + + /** + * 修改商品评论 + * + * @param bo 商品评论 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdCommBo bo); + + /** + * 校验并批量删除商品评论信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据商品ID查询商品评论列表 + * + * @param prodId 商品ID + * @return 商品评论列表 + */ + IPage queryPageListByProdId(Long prodId, PageQuery pageQuery); + + /** + * 查询商品评论数量 + * + * @param prodId 商品ID + * @return 评论数量 + */ + Long countByProdId(Long prodId); + + /** + * 根据用户ID分页查询商品评论列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品评论分页列表 + */ + IPage queryPageListByUser(TzProdCommBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdFavoriteService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdFavoriteService.java new file mode 100644 index 0000000..334cda3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdFavoriteService.java @@ -0,0 +1,101 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdFavoriteBo; +import org.dromara.mall.domain.vo.TzProdFavoriteVo; +import org.dromara.mall.domain.vo.TzProdVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品收藏Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdFavoriteService { + + /** + * 查询商品收藏 + * + * @param favoriteId 主键 + * @return 商品收藏 + */ + TzProdFavoriteVo queryById(Long favoriteId); + + /** + * 分页查询商品收藏列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品收藏分页列表 + */ + TableDataInfo queryPageList(TzProdFavoriteBo bo, PageQuery pageQuery); + + /** + * 根据ID分页查询收藏商品列表 + * @param userId + * @param pageQuery + * @return + */ + IPage queryPageListByUserId(Long userId, PageQuery pageQuery); + + /** + * 查询符合条件的商品收藏列表 + * + * @param bo 查询条件 + * @return 商品收藏列表 + */ + List queryList(TzProdFavoriteBo bo); + + /** + * 新增商品收藏 + * + * @param bo 商品收藏 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdFavoriteBo bo); + + /** + * 修改商品收藏 + * + * @param bo 商品收藏 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdFavoriteBo bo); + + /** + * 校验并批量删除商品收藏信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 取消收藏 + * @param userId + * @param prodId + */ + Boolean clearProdFavor(Long userId, Long prodId); + + /** + * 判断是否已收藏 + * @param userId + * @param prodId + * @return + */ + Boolean exists(Long userId, Long prodId); + + + /** + * 根据用户ID查询收藏数量 + * @param userId + * @return + */ + Long countByUserId(Long userId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropService.java new file mode 100644 index 0000000..cc9bb27 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdPropBo; +import org.dromara.mall.domain.vo.TzProdPropVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdPropService { + + /** + * 查询【请填写功能名称】 + * + * @param propId 主键 + * @return 【请填写功能名称】 + */ + TzProdPropVo queryById(Long propId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzProdPropBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzProdPropBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdPropBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdPropBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropValueService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropValueService.java new file mode 100644 index 0000000..b352b81 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdPropValueService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdPropValueBo; +import org.dromara.mall.domain.vo.TzProdPropValueVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdPropValueService { + + /** + * 查询【请填写功能名称】 + * + * @param valueId 主键 + * @return 【请填写功能名称】 + */ + TzProdPropValueVo queryById(Long valueId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzProdPropValueBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzProdPropValueBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdPropValueBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdPropValueBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRecordService.java new file mode 100644 index 0000000..1ac8014 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRecordService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdRecordBo; +import org.dromara.mall.domain.vo.TzProdRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 产品价格记录Service接口 + * + * @author Maosw + * @date 2024-09-12 + */ +public interface ITzProdRecordService { + + /** + * 查询产品价格记录 + * + * @param id 主键 + * @return 产品价格记录 + */ + TzProdRecordVo queryById(Long id); + + /** + * 分页查询产品价格记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 产品价格记录分页列表 + */ + TableDataInfo queryPageList(TzProdRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的产品价格记录列表 + * + * @param bo 查询条件 + * @return 产品价格记录列表 + */ + List queryList(TzProdRecordBo bo); + + /** + * 新增产品价格记录 + * + * @param bo 产品价格记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdRecordBo bo); + + /** + * 修改产品价格记录 + * + * @param bo 产品价格记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdRecordBo bo); + + /** + * 校验并批量删除产品价格记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRelationService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRelationService.java new file mode 100644 index 0000000..bfef831 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdRelationService.java @@ -0,0 +1,76 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdRelationBo; +import org.dromara.mall.domain.vo.TzProdRelationVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品推荐关联Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface ITzProdRelationService { + + /** + * 查询商品推荐关联 + * + * @param id 主键 + * @return 商品推荐关联 + */ + TzProdRelationVo queryById(Long id); + + /** + * 分页查询商品推荐关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品推荐关联分页列表 + */ + TableDataInfo queryPageList(TzProdRelationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的商品推荐关联列表 + * + * @param bo 查询条件 + * @return 商品推荐关联列表 + */ + List queryList(TzProdRelationBo bo); + + /** + * 新增商品推荐关联 + * + * @param bo 商品推荐关联 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdRelationBo bo); + + /** + * 修改商品推荐关联 + * + * @param bo 商品推荐关联 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdRelationBo bo); + + /** + * 校验并批量删除商品推荐关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 获取推荐商品ID列表 + * + * @param prodId 商品ID + * @return 推荐商品ID列表 + */ + List getRelatedProdIds(Long prodId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdService.java new file mode 100644 index 0000000..5a47d70 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdService.java @@ -0,0 +1,164 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import jakarta.validation.Valid; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.bo.TzProdBo; +import org.dromara.mall.domain.vo.TzProdSumVo; +import org.dromara.mall.domain.vo.TzProdVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdService extends MPJBaseService { + + /** + * 查询商品 + * + * @param prodId 主键 + * @return 商品 + */ + TzProdVo queryById(Long prodId); + + /** + * 分页查询商品列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品分页列表 + */ + TableDataInfo queryPageList(TzProdBo bo, PageQuery pageQuery); + + /** + * 根据分类id分页获取商品列表 + * @param pageQuery + * @param categoryId + * @return + */ + IPage pageByCategoryId(PageQuery pageQuery, List categoryId); + + /** + * 查询符合条件的商品列表 + * + * @param bo 查询条件 + * @return 商品列表 + */ + List queryList(TzProdBo bo); + + /** + * 根据上架时间倒序分页获取商品 + * @param pageQuery + * @return + */ + IPage pageByPutAwayTime(PageQuery pageQuery); + + /** + * 随机推荐分页获取商品 + * @param pageQuery + * @return + */ + IPage randomProdPage(PageQuery pageQuery); + + /** + * 热门推荐分页获取商品 + * @param pageQuery + * @return + */ + IPage hotProdPage(PageQuery pageQuery); + + /** + * 新增商品 + * + * @param bo 商品 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdBo bo); + + /** + * 修改商品 + * + * @param bo 商品 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdBo bo); + + /** + * 校验并批量删除商品信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + *分页排序搜索商品 + * @param pageQuery + * @param prodName + * @param sort + * @param orderBy + * @return + */ + IPage getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, Integer floor, Integer sort, Integer orderBy); + + /** + * 商品收藏 + * @param userId + * @param prodId + * @return + */ + Boolean updateCollectNum(Long userId,Long prodId); + + /** + * 增加产品销量 + * @param prodCode + * @return + */ + Boolean updateSoldNum(String prodCode); + + /** + * 查询商品列表统计 + * @param bo + * @return + */ + TzProdSumVo queryListCount(TzProdBo bo); + + /** + * 特价专区 + * @param pageQuery + * @return + */ + IPage saleProdPage(@Valid PageQuery pageQuery); + + /** + * 根据商品id获取商品列表 + * @param relatedProdIds + * @param pageQuery + * @return + */ + IPage getProdListByProdIds(List relatedProdIds, PageQuery pageQuery); + + /** + * 根据商品ID查询关联商品列表 + * + * @param prodId 商品ID + * @param pageQuery 分页参数 + * @return 关联商品分页列表 + */ + TableDataInfo getRelatedProducts(Long prodId, PageQuery pageQuery); + + /** + * 查询商品销量排行榜列表 + * @return 关联商品列表 + */ + TableDataInfo queryPageListChart(TzProdBo bo, PageQuery pageQuery); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagReferenceService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagReferenceService.java new file mode 100644 index 0000000..ce90d44 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagReferenceService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdTagReferenceBo; +import org.dromara.mall.domain.vo.TzProdTagReferenceVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdTagReferenceService { + + /** + * 查询【请填写功能名称】 + * + * @param referenceId 主键 + * @return 【请填写功能名称】 + */ + TzProdTagReferenceVo queryById(Long referenceId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzProdTagReferenceBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzProdTagReferenceBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdTagReferenceBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdTagReferenceBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagService.java new file mode 100644 index 0000000..276b601 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdTagService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdTagBo; +import org.dromara.mall.domain.vo.TzProdTagVo; + +import java.util.Collection; +import java.util.List; + +/** + * 商品分组Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzProdTagService { + + /** + * 查询商品分组 + * + * @param id 主键 + * @return 商品分组 + */ + TzProdTagVo queryById(Long id); + + /** + * 分页查询商品分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品分组分页列表 + */ + TableDataInfo queryPageList(TzProdTagBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的商品分组列表 + * + * @param bo 查询条件 + * @return 商品分组列表 + */ + List queryList(TzProdTagBo bo); + + /** + * 新增商品分组 + * + * @param bo 商品分组 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdTagBo bo); + + /** + * 修改商品分组 + * + * @param bo 商品分组 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdTagBo bo); + + /** + * 校验并批量删除商品分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdWishlistService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdWishlistService.java new file mode 100644 index 0000000..7230623 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzProdWishlistService.java @@ -0,0 +1,74 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzProdWishlistBo; +import org.dromara.mall.domain.vo.TzProdWishlistVo; + +import java.util.Collection; +import java.util.List; + +/** + * 心愿单Service接口 + * + * @author Lion Li + * @date 2024-01-02 + */ +public interface ITzProdWishlistService { + + /** + * 查询心愿单 + * + * @param id 主键 + * @return 心愿单 + */ + TzProdWishlistVo queryById(Long id); + + /** + * 分页查询心愿单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 心愿单分页列表 + */ + TableDataInfo queryPageList(TzProdWishlistBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的心愿单列表 + * + * @param bo 查询条件 + * @return 心愿单列表 + */ + List queryList(TzProdWishlistBo bo); + + /** + * 新增心愿单 + * + * @param bo 心愿单 + * @return 是否新增成功 + */ + Boolean insertByBo(TzProdWishlistBo bo); + + /** + * 修改心愿单 + * + * @param bo 心愿单 + * @return 是否修改成功 + */ + Boolean updateByBo(TzProdWishlistBo bo); + + /** + * 校验并批量删除心愿单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * APP端分页查询心愿单列表 + */ + IPage queryPageListAPP(TzProdWishlistBo bo, PageQuery pageQuery); +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzShopDetailService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzShopDetailService.java new file mode 100644 index 0000000..eb04f70 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzShopDetailService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzShopDetailBo; +import org.dromara.mall.domain.vo.TzShopDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzShopDetailService { + + /** + * 查询【请填写功能名称】 + * + * @param shopId 主键 + * @return 【请填写功能名称】 + */ + TzShopDetailVo queryById(Long shopId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzShopDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzShopDetailBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzShopDetailBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzShopDetailBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSkuService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSkuService.java new file mode 100644 index 0000000..0e79281 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSkuService.java @@ -0,0 +1,75 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.domain.vo.TzSkuVo; + +import java.util.Collection; +import java.util.List; + +/** + * 单品SKUService接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzSkuService { + + /** + * 查询单品SKU + * + * @param skuId 主键 + * @return 单品SKU + */ + TzSkuVo queryById(Long skuId); + + /** + * 分页查询单品SKU列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 单品SKU分页列表 + */ + TableDataInfo queryPageList(TzSkuBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的单品SKU列表 + * + * @param bo 查询条件 + * @return 单品SKU列表 + */ + List queryList(TzSkuBo bo); + + /** + * 新增单品SKU + * + * @param bo 单品SKU + * @return 是否新增成功 + */ + Boolean insertByBo(TzSkuBo bo); + + /** + * 修改单品SKU + * + * @param bo 单品SKU + * @return 是否修改成功 + */ + Boolean updateByBo(TzSkuBo bo); + + /** + * 校验并批量删除单品SKU信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 通过prodId获取商品全部规格列表 + * @param prodId + * @return + */ + List listByProdId(Long prodId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSmsLogService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSmsLogService.java new file mode 100644 index 0000000..8e51243 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzSmsLogService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzSmsLogBo; +import org.dromara.mall.domain.vo.TzSmsLogVo; + +import java.util.Collection; +import java.util.List; + +/** + * 短信记录Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzSmsLogService { + + /** + * 查询短信记录 + * + * @param id 主键 + * @return 短信记录 + */ + TzSmsLogVo queryById(Long id); + + /** + * 分页查询短信记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 短信记录分页列表 + */ + TableDataInfo queryPageList(TzSmsLogBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的短信记录列表 + * + * @param bo 查询条件 + * @return 短信记录列表 + */ + List queryList(TzSmsLogBo bo); + + /** + * 新增短信记录 + * + * @param bo 短信记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzSmsLogBo bo); + + /** + * 修改短信记录 + * + * @param bo 短信记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzSmsLogBo bo); + + /** + * 校验并批量删除短信记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTenantRecordService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTenantRecordService.java new file mode 100644 index 0000000..79dcbbd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTenantRecordService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTenantRecordBo; +import org.dromara.mall.domain.vo.TzTenantRecordVo; + +import java.util.Collection; +import java.util.List; + +/** + * 租户资金记录Service接口 + * + * @author Maosw + * @date 2024-12-09 + */ +public interface ITzTenantRecordService { + + /** + * 查询租户资金记录 + * + * @param id 主键 + * @return 租户资金记录 + */ + TzTenantRecordVo queryById(Long id); + + /** + * 分页查询租户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 租户资金记录分页列表 + */ + TableDataInfo queryPageList(TzTenantRecordBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的租户资金记录列表 + * + * @param bo 查询条件 + * @return 租户资金记录列表 + */ + List queryList(TzTenantRecordBo bo); + + /** + * 新增租户资金记录 + * + * @param bo 租户资金记录 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTenantRecordBo bo); + + /** + * 修改租户资金记录 + * + * @param bo 租户资金记录 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTenantRecordBo bo); + + /** + * 校验并批量删除租户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityFreeService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityFreeService.java new file mode 100644 index 0000000..21327c9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityFreeService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTranscityFreeBo; +import org.dromara.mall.domain.vo.TzTranscityFreeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzTranscityFreeService { + + /** + * 查询【请填写功能名称】 + * + * @param transcityFreeId 主键 + * @return 【请填写功能名称】 + */ + TzTranscityFreeVo queryById(Long transcityFreeId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzTranscityFreeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzTranscityFreeBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTranscityFreeBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTranscityFreeBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityService.java new file mode 100644 index 0000000..8f6a48a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTranscityService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTranscityBo; +import org.dromara.mall.domain.vo.TzTranscityVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzTranscityService { + + /** + * 查询【请填写功能名称】 + * + * @param transcityId 主键 + * @return 【请填写功能名称】 + */ + TzTranscityVo queryById(Long transcityId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzTranscityBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzTranscityBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTranscityBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTranscityBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeFreeService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeFreeService.java new file mode 100644 index 0000000..cb2cd10 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeFreeService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTransfeeFreeBo; +import org.dromara.mall.domain.vo.TzTransfeeFreeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzTransfeeFreeService { + + /** + * 查询【请填写功能名称】 + * + * @param transfeeFreeId 主键 + * @return 【请填写功能名称】 + */ + TzTransfeeFreeVo queryById(Long transfeeFreeId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzTransfeeFreeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzTransfeeFreeBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTransfeeFreeBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTransfeeFreeBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeService.java new file mode 100644 index 0000000..dbd6feb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransfeeService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTransfeeBo; +import org.dromara.mall.domain.vo.TzTransfeeVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzTransfeeService { + + /** + * 查询【请填写功能名称】 + * + * @param transfeeId 主键 + * @return 【请填写功能名称】 + */ + TzTransfeeVo queryById(Long transfeeId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzTransfeeBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzTransfeeBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTransfeeBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTransfeeBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransportService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransportService.java new file mode 100644 index 0000000..70bf131 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzTransportService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzTransportBo; +import org.dromara.mall.domain.vo.TzTransportVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzTransportService { + + /** + * 查询【请填写功能名称】 + * + * @param transportId 主键 + * @return 【请填写功能名称】 + */ + TzTransportVo queryById(Long transportId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzTransportBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzTransportBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzTransportBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzTransportBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrOrderService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrOrderService.java new file mode 100644 index 0000000..3e191b7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrOrderService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzUserAddrOrderBo; +import org.dromara.mall.domain.vo.TzUserAddrOrderVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户订单配送地址Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzUserAddrOrderService { + + /** + * 查询用户订单配送地址 + * + * @param addrOrderId 主键 + * @return 用户订单配送地址 + */ + TzUserAddrOrderVo queryById(Long addrOrderId); + + /** + * 分页查询用户订单配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户订单配送地址分页列表 + */ + TableDataInfo queryPageList(TzUserAddrOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户订单配送地址列表 + * + * @param bo 查询条件 + * @return 用户订单配送地址列表 + */ + List queryList(TzUserAddrOrderBo bo); + + /** + * 新增用户订单配送地址 + * + * @param bo 用户订单配送地址 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserAddrOrderBo bo); + + /** + * 修改用户订单配送地址 + * + * @param bo 用户订单配送地址 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserAddrOrderBo bo); + + /** + * 校验并批量删除用户订单配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrService.java new file mode 100644 index 0000000..cbc3b52 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddrService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzUserAddrBo; +import org.dromara.mall.domain.vo.TzUserAddrVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户配送地址Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzUserAddrService { + + /** + * 查询用户配送地址 + * + * @param addrId 主键 + * @return 用户配送地址 + */ + TzUserAddrVo queryById(Long addrId); + + /** + * 分页查询用户配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配送地址分页列表 + */ + TableDataInfo queryPageList(TzUserAddrBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户配送地址列表 + * + * @param bo 查询条件 + * @return 用户配送地址列表 + */ + List queryList(TzUserAddrBo bo); + + /** + * 新增用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserAddrBo bo); + + /** + * 修改用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserAddrBo bo); + + /** + * 校验并批量删除用户配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddressService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddressService.java new file mode 100644 index 0000000..5db0396 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserAddressService.java @@ -0,0 +1,88 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzUserAddressBo; +import org.dromara.mall.domain.vo.TzUserAddressVo; + +import java.util.Collection; +import java.util.List; + +/** + * 客户地址Service接口 + * + * @author Maosw + * @date 2024-09-15 + */ +public interface ITzUserAddressService { + + /** + * 查询客户地址 + * + * @param id 主键 + * @return 客户地址 + */ + TzUserAddressVo queryById(Long id); + + /** + * 分页查询客户地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户地址分页列表 + */ + TableDataInfo queryPageList(TzUserAddressBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的客户地址列表 + * + * @param bo 查询条件 + * @return 客户地址列表 + */ + List queryList(TzUserAddressBo bo); + + /** + * 新增客户地址 + * + * @param bo 客户地址 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserAddressBo bo); + + /** + * 修改客户地址 + * + * @param bo 客户地址 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserAddressBo bo); + + /** + * 校验并批量删除客户地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 查看用户默认地址信息 + * @param userId + * @return + */ + TzUserAddressVo userAddress(Long userId); + + /** + * 查看用户全部地址信息 + * @param userId + * @return + */ + List userAddressList(Long userId); + + /** + * 清空用户默认地址 + * @param userId + */ + void clearAddressList(Long userId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserCollectionService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserCollectionService.java new file mode 100644 index 0000000..48a8566 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserCollectionService.java @@ -0,0 +1,68 @@ +package org.dromara.mall.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.bo.TzUserCollectionBo; +import org.dromara.mall.domain.vo.TzUserCollectionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzUserCollectionService { + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + TzUserCollectionVo queryById(Long id); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(TzUserCollectionBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(TzUserCollectionBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserCollectionBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserCollectionBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserSearchService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserSearchService.java new file mode 100644 index 0000000..a87366f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserSearchService.java @@ -0,0 +1,86 @@ +package org.dromara.mall.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserSearch; +import org.dromara.mall.domain.bo.TzUserSearchBo; +import org.dromara.mall.domain.vo.TzUserSearchVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户搜索Service接口 + * + * @author Maosw + * @date 2024-08-09 + */ +public interface ITzUserSearchService extends IService { + + /** + * 查询用户搜索 + * + * @param id 主键 + * @return 用户搜索 + */ + TzUserSearchVo queryById(Long id); + + /** + * 分页查询用户搜索列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户搜索分页列表 + */ + TableDataInfo queryPageList(TzUserSearchBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户搜索列表 + * + * @param bo 查询条件 + * @return 用户搜索列表 + */ + List queryList(TzUserSearchBo bo); + + /** + * 新增用户搜索 + * + * @param bo 用户搜索 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserSearchBo bo); + + /** + * 修改用户搜索 + * + * @param bo 用户搜索 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserSearchBo bo); + + /** + * 校验并批量删除用户搜索信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 用户搜索词记录 + * @param prodName + * @param userId + */ + void setSearchNumByUserID(String prodName, Long userId); + + /** + * 分页查询用户搜索关键词 + * @param pageQuery + * @param userId + * @return + */ + IPage querySearchList(PageQuery pageQuery, Long userId); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserService.java new file mode 100644 index 0000000..9c7f3d6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzUserService.java @@ -0,0 +1,104 @@ +package org.dromara.mall.service; + +import com.github.yulichang.base.MPJBaseService; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.bo.TzUserBo; +import org.dromara.mall.domain.vo.TzUserSumVo; +import org.dromara.mall.domain.vo.TzUserVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户Service接口 + * + * @author Lion Li + * @date 2024-07-30 + */ +public interface ITzUserService extends MPJBaseService { + + /** + * 查询用户 + * + * @param userId 主键 + * @return 用户 + */ + TzUserVo queryById(Long userId); + + /** + * 分页查询用户列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分页列表 + */ + TableDataInfo queryPageList(TzUserBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的用户列表 + * + * @param bo 查询条件 + * @return 用户列表 + */ + List queryList(TzUserBo bo); + + /** + * 新增用户 + * + * @param bo 用户 + * @return 是否新增成功 + */ + Boolean insertByBo(TzUserBo bo); + + /** + * 修改用户 + * + * @param bo 用户 + * @return 是否修改成功 + */ + Boolean updateByBo(TzUserBo bo); + + /** + * 校验并批量删除用户信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 开启设计师开关 + * @param userPhone + * @param status + * @return + */ + Boolean queryByUserPhone(String userPhone, Integer status); + + /** + * 提交实名认证 + * + * @param bo 用户认证信息 + * @return 是否提交成功 + */ + Boolean submitAuth(TzUserBo bo); + + /** + * 提交设计师认证 + */ + Boolean submitSjsAuth(TzUserBo bo); + + /** + * 查询用户下单排行榜列表 + */ + TableDataInfo queryPageListChart(TzUserBo bo, PageQuery pageQuery); + + /** + * 查询用户统计信息 + * @param bo + * @return + */ + TzUserSumVo querySum(TzUserBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzWithdrawRequestService.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzWithdrawRequestService.java new file mode 100644 index 0000000..1f85d99 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/ITzWithdrawRequestService.java @@ -0,0 +1,136 @@ +package org.dromara.mall.service; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.yulichang.base.MPJBaseService; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzWithdrawRequest; +import org.dromara.mall.domain.bo.TzWithdrawRequestBo; +import org.dromara.mall.domain.vo.TzWithdrawRequestVo; +import org.dromara.mall.domain.vo.TzWithdrawSumVo; + +import java.util.Collection; +import java.util.List; + +/** + * 提现申请Service接口 + * + * @author Maosw + * @date 2024-12-12 + */ +public interface ITzWithdrawRequestService extends MPJBaseService { + + /** + * 查询提现申请 + * + * @param id 主键 + * @return 提现申请 + */ + TzWithdrawRequestVo queryById(Long id); + + /** + * 分页查询提现申请列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 提现申请分页列表 + */ + TableDataInfo queryPageList(TzWithdrawRequestBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的提现申请列表 + * + * @param bo 查询条件 + * @return 提现申请列表 + */ + List queryList(TzWithdrawRequestBo bo); + + /** + * 新增提现申请 + * + * @param bo 提现申请 + * @return 是否新增成功 + */ + Boolean insertByBo(TzWithdrawRequestBo bo); + + /** + * 修改提现申请 + * + * @param bo 提现申请 + * @return 是否修改成功 + */ + Boolean updateByBo(TzWithdrawRequestBo bo); + + /** + * 校验并批量删除提现申请信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 申请提现 + * + * @param bo 提现申请信息 + * @return 处理结果消息 + */ + Boolean applyWithdraw(TzWithdrawRequestBo bo); + + /** + * 推广员申请提现 + * + * @param bo 提现申请信息 + * @return 处理结果消息 + */ + Boolean applyWithdrawPromoter(TzWithdrawRequestBo bo); + + /** + * 获取提现记录列表 + * + * @param bo 用户ID + * @param pageQuery 分页参数 + * @return 提现记录分页列表 + */ + IPage getWithdrawList(TzWithdrawRequestBo bo, PageQuery pageQuery); + + /** + * 审核提现 + * + * @param bo 提现申请信息 + * @return 处理结果消息 + */ + Boolean examine(TzWithdrawRequestBo bo) throws Exception; + + /** + * 根据分账系统生成唯一流水查询提现申请 + * + * @param separateNo 分账系统生成唯一流水 + * @param outSeparateNo 商户外部订单号 + * @return 提现申请 + */ + TzWithdrawRequest queryWithdrawRequest(String separateNo, String outSeparateNo); + + /** + * 根据提现申请ID更新提现申请 + * + * @param withdrawRequest 提现申请 + * @return 是否更新成功 + */ + Boolean updateById1(TzWithdrawRequest withdrawRequest); + + /** + * 查询提现申请详情 + * @param id + * @return + */ + JSONObject queryPlus(@NotNull(message = "主键不能为空") Long id) throws Exception; + + /** + * 查询提现申请统计信息 + */ + TzWithdrawSumVo querySum(TzWithdrawRequestBo bo); +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java new file mode 100644 index 0000000..22d85b9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyBasketServiceImpl.java @@ -0,0 +1,199 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyBasket; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.TzSku; +import org.dromara.mall.domain.bo.HyBasketBo; +import org.dromara.mall.domain.vo.HyBasketVo; +import org.dromara.mall.mapper.HyBasketMapper; +import org.dromara.mall.mapper.TzProdMapper; +import org.dromara.mall.service.IHyBasketService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 购物车Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyBasketServiceImpl extends MPJBaseServiceImpl implements IHyBasketService { + + private final HyBasketMapper baseMapper; + + private final TzProdMapper prodMapper; + + /** + * 查询购物车 + * + * @param id 主键 + * @return 购物车 + */ + @Override + public HyBasketVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + @Override + public TableDataInfo queryPageList(HyBasketBo bo, PageQuery pageQuery) { + // 使用MPJ进行多表关联查询 + MPJLambdaWrapper wrapper = buildQueryWrapper(bo) + .selectAll(HyBasket.class) + .select(TzProd::getProdName, TzProd::getPic) + .select(TzSku::getSkuName, TzSku::getPrice) + .leftJoin(TzProd.class, TzProd::getProdId, HyBasket::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyBasket::getSkuId) + .orderByDesc(HyBasket::getCreateTime); + + Page result = baseMapper.selectJoinPage(pageQuery.build(), HyBasketVo.class, wrapper); + return TableDataInfo.build(result); + } + + /** + * APP端查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + @Override + public IPage queryPageListApp(HyBasketBo bo, PageQuery pageQuery) { + // 使用MPJ进行多表关联查询 + MPJLambdaWrapper wrapper = buildQueryWrapper(bo) + .selectAll(HyBasket.class) + .select(TzProd::getProdCode, TzProd::getProdName, TzProd::getPic, TzProd::getUnit) + .select(TzSku::getSkuCode, TzSku::getSkuFactoryCode, TzSku::getSkuName) + .selectAs(TzSku::getPrice, HyBasketVo::getOriPrice) + .leftJoin(TzProd.class, TzProd::getProdId, HyBasket::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyBasket::getSkuId) + .orderByDesc(HyBasket::getCreateTime); + + return baseMapper.selectJoinPage(pageQuery.build(), HyBasketVo.class, wrapper); + } + + /** + * 查询符合条件的购物车列表 + * + * @param bo 查询条件 + * @return 购物车列表 + */ + @Override + public List queryList(HyBasketBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(HyBasketBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.orderByAsc(HyBasket::getId); + lqw.eq(bo.getProdId() != null, HyBasket::getProdId, bo.getProdId()); + lqw.eq(bo.getSkuId() != null, HyBasket::getSkuId, bo.getSkuId()); + lqw.eq(bo.getUserId() != null, HyBasket::getUserId, bo.getUserId()); + lqw.eq(bo.getNum() != null, HyBasket::getNum, bo.getNum()); + lqw.eq(bo.getPrice() != null, HyBasket::getPrice, bo.getPrice()); + lqw.eq(bo.getDelFlag() != null, HyBasket::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyBasket::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增购物车 + * + * @param bo 购物车 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(HyBasketBo bo) { + bo.setPrice(null); + // 根据商品ID查询tenantId + TzProd prod = prodMapper.selectById(bo.getProdId()); + if (prod != null) { + bo.setTenantId(prod.getTenantId()); + } + HyBasket add = MapstructUtils.convert(bo, HyBasket.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag){ + return flag; + } + return null; + } + + /** + * 修改购物车 + * + * @param bo 购物车 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyBasketBo bo) { + HyBasket update = MapstructUtils.convert(bo, HyBasket.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除购物车信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public boolean logicDeleteByIds(List basketIds, Long userId) { + return baseMapper.update(null, + Wrappers.lambdaUpdate().set(HyBasket::getDelFlag, 2).in(HyBasket::getId, basketIds).eq(HyBasket::getUserId, userId)) > 0; + } + + @Override + public Long countByUserId(Long userId) { + return baseMapper.selectCount(new MPJLambdaWrapper().eq(HyBasket::getUserId, userId).eq(HyBasket::getDelFlag, 1)); + } + + /** + * 根据购物车ID集合查询购物车信息 + * + * @param basketIds 购物车ID集合 + * @return 购物车信息集合 + */ + @Override + public List selectVoByIds(List basketIds) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(HyBasket.class) + .select(TzProd::getProdCode, TzProd::getProdName, TzProd::getTenantId) + .select(TzSku::getSkuCode, TzSku::getSkuFactoryCode, TzSku::getSkuName, TzSku::getOriPrice, TzSku::getPic) + .leftJoin(TzProd.class, TzProd::getProdId, HyBasket::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyBasket::getSkuId) + .in(HyBasket::getId, basketIds) + .eq(HyBasket::getDelFlag, 1); + return baseMapper.selectJoinList(HyBasketVo.class, wrapper); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCodeOrderServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCodeOrderServiceImpl.java new file mode 100644 index 0000000..df74d97 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCodeOrderServiceImpl.java @@ -0,0 +1,371 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant; +import com.lakala.zf.laop.java.sdk.demo.utils.LakalaUtils; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyCodeOrder; +import org.dromara.mall.domain.HyMemberCode; +import org.dromara.mall.domain.HyPromoter; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.bo.HyCodeOrderBo; +import org.dromara.mall.domain.vo.HyCodeOrderSumVo; +import org.dromara.mall.domain.vo.HyCodeOrderVo; +import org.dromara.mall.mapper.HyCodeOrderMapper; +import org.dromara.mall.mapper.HyMemberCodeMapper; +import org.dromara.mall.service.IHyCodeOrderService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 会员码订单Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyCodeOrderServiceImpl extends MPJBaseServiceImpl implements IHyCodeOrderService { + + private final HyCodeOrderMapper baseMapper; + + private final HyMemberCodeMapper memberCodeBaseMapper; + + /** + * 查询会员码订单 + * + * @param id 主键 + * @return 会员码订单 + */ + @Override + public HyCodeOrderVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询会员码订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员码订单分页列表 + */ + @Override + public TableDataInfo queryPageList(HyCodeOrderBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryMPJWrapper(bo); + lqw.selectAll(HyCodeOrder.class); + lqw.selectAs("u.user_mobile",HyCodeOrderVo::getSjsPhone); + lqw.selectAs("i.user_mobile",HyCodeOrderVo::getYqrPhone); + lqw.selectAs(HyPromoter::getPhone,HyCodeOrderVo::getTgyPhone); + lqw.leftJoin(TzUser.class,"u",TzUser::getUserId,HyCodeOrder::getUserId); + lqw.leftJoin(TzUser.class,"i",TzUser::getUserId,HyCodeOrder::getInviteUserId); + lqw.leftJoin(HyPromoter.class,HyPromoter::getId,HyCodeOrder::getPromoterId); + lqw.orderByDesc(HyCodeOrder::getCreateTime); + IPage result = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), HyCodeOrderVo.class, lqw); + return TableDataInfo.build(result); + } + + /** + * 查询会员码订单统计信息 + * + * @param bo + * @return + */ + @Override + public HyCodeOrderSumVo querySum(HyCodeOrderBo bo) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectCount(HyCodeOrder::getId, HyCodeOrderSumVo::getTotalNum) + .selectSum(HyCodeOrder::getNum, HyCodeOrderSumVo::getBuyNum) + .selectSum(HyCodeOrder::getOrderAmount, HyCodeOrderSumVo::getTotalPrice); + + // 执行查询 + return baseMapper.selectJoinOne(HyCodeOrderSumVo.class, wrapper); + } + + /** + * 查询符合条件的会员码订单列表 + * + * @param bo 查询条件 + * @return 会员码订单列表 + */ + @Override + public List queryList(HyCodeOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(HyCodeOrderBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), HyCodeOrder::getOrderNo, bo.getOrderNo()); + lqw.eq(bo.getMerchantId() != null, HyCodeOrder::getMerchantId, bo.getMerchantId()); + lqw.eq(bo.getPromoterId() != null, HyCodeOrder::getPromoterId, bo.getPromoterId()); + lqw.eq(bo.getTgyPhone() != null, HyPromoter::getPhone, bo.getTgyPhone()); + lqw.eq(bo.getSjsPhone() != null, "u.user_mobile", bo.getSjsPhone()); + lqw.eq(bo.getYqrPhone() != null, "i.user_mobile", bo.getYqrPhone()); + lqw.eq(bo.getNum() != null, HyCodeOrder::getNum, bo.getNum()); + lqw.eq(bo.getPrice() != null, HyCodeOrder::getPrice, bo.getPrice()); + lqw.eq(bo.getDelFlag() != null, HyCodeOrder::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getOrderAmount() != null, HyCodeOrder::getOrderAmount, bo.getOrderAmount()); + lqw.eq(bo.getOrderStatus() != null, HyCodeOrder::getOrderStatus, bo.getOrderStatus()); + lqw.eq(bo.getType() != null, HyCodeOrder::getType, bo.getType()); + lqw.between(params.get("beginPaymentTime") != null && params.get("endPaymentTime") != null, + HyCodeOrder::getPaymentTime ,params.get("beginPaymentTime"), params.get("endPaymentTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyCodeOrder::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + private LambdaQueryWrapper buildQueryWrapper(HyCodeOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), HyCodeOrder::getOrderNo, bo.getOrderNo()); + lqw.eq(bo.getMerchantId() != null, HyCodeOrder::getMerchantId, bo.getMerchantId()); + lqw.eq(bo.getPromoterId() != null, HyCodeOrder::getPromoterId, bo.getPromoterId()); + lqw.eq(bo.getNum() != null, HyCodeOrder::getNum, bo.getNum()); + lqw.eq(bo.getPrice() != null, HyCodeOrder::getPrice, bo.getPrice()); + lqw.eq(bo.getDelFlag() != null, HyCodeOrder::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getOrderAmount() != null, HyCodeOrder::getOrderAmount, bo.getOrderAmount()); + lqw.eq(bo.getOrderStatus() != null, HyCodeOrder::getOrderStatus, bo.getOrderStatus()); + lqw.eq(bo.getType() != null, HyCodeOrder::getType, bo.getType()); + lqw.between(params.get("beginPaymentTime") != null && params.get("endPaymentTime") != null, + HyCodeOrder::getPaymentTime ,params.get("beginPaymentTime"), params.get("endPaymentTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyCodeOrder::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增会员码订单 + * + * @param bo 会员码订单 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(HyCodeOrderBo bo) { + //1. 生成订单 + bo.setOrderNo(genOrderNum()); + bo.setOrderAmount(bo.getPrice().multiply(new BigDecimal(bo.getNum()))); + bo.setType(2); + bo.setCreateTime(new Date()); + HyCodeOrder add = MapstructUtils.convert(bo, HyCodeOrder.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + // 2. 批量生成会员码 + List memberCodes = new ArrayList<>(); + for (int i = 0; i < add.getNum(); i++) { + HyMemberCode memberCode = new HyMemberCode(); + memberCode.setOrderId(add.getId()); + if(add.getUserId()!= null){ + memberCode.setUserId(add.getUserId()); + } + if(add.getMerchantId()!= null){ + memberCode.setMerchantId(add.getMerchantId()); + } + if(add.getPromoterId()!= null){ + memberCode.setPromoterId(add.getPromoterId()); + } + memberCode.setCode(genMemberCode()); + memberCode.setPrice(add.getPrice()); + memberCode.setStatus(1); + memberCode.setDelFlag(1); + memberCode.setType(add.getType()); + memberCode.setCreateTime(new Date()); + memberCodes.add(memberCode); + } + // 3. 批量插入会员码 + if (!memberCodeBaseMapper.insertBatch(memberCodes)) { + throw new ServiceException("生成会员码失败"); + } + } + return flag; + } + + /** + * 修改会员码订单 + * + * @param bo 会员码订单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyCodeOrderBo bo) { + HyCodeOrder update = MapstructUtils.convert(bo, HyCodeOrder.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除会员码订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public JSONObject createOrder(HyCodeOrderBo bo) throws Exception { + HyCodeOrder order = MapstructUtils.convert(bo, HyCodeOrder.class); + String orderNo = genOrderNum(); + order.setOrderNo(orderNo); + order.setOrderAmount(order.getPrice().multiply(new BigDecimal(bo.getNum()))); + order.setType(3); + order.setCreateTime(new Date()); + + JSONObject jsonObject = LakalaUtils.createOrderPay(orderNo, order.getOrderAmount(), KlkConstant.MEMBER_CODE_ORDER); + if ("000000".equals(jsonObject.get("code"))) { + System.out.println(jsonObject.get("resp_data").toString()); + JSONObject respData = jsonObject.getJSONObject("resp_data"); + String payOrderNo = respData.getString("pay_order_no"); + order.setPayOrderNo(payOrderNo); + } else { + System.out.println(jsonObject.get("msg").toString()); + } + boolean flag = baseMapper.insert(order) > 0; + if (!flag) { + throw new ServiceException("创建订单失败"); + } + return jsonObject; + } + + @Override + public IPage queryPageListAPP(HyCodeOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(HyCodeOrder::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + public Boolean logicDeleteByIds(List orderIds, Long userId, Integer roleType) { + // 查询订单状态 + List orders = new ArrayList<>(); + if(roleType == 3){ + orders = baseMapper.selectList( + Wrappers.lambdaQuery() + .in(HyCodeOrder::getId, orderIds) + .eq(HyCodeOrder::getPromoterId, userId)); + }else if(roleType == 4){ + orders = baseMapper.selectList( + Wrappers.lambdaQuery() + .in(HyCodeOrder::getId, orderIds) + .eq(HyCodeOrder::getUserId, userId)); + } + // 检查是否存在已付款订单 + for (HyCodeOrder order : orders) { + if (order.getOrderStatus() == 2) { + throw new ServiceException("该订单已付款!不可删除"); + } + } + // 执行逻辑删除 + if(roleType == 3){ + return baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyCodeOrder::getDelFlag, 2) + .in(HyCodeOrder::getId, orderIds) + .eq(HyCodeOrder::getPromoterId, userId) + .ne(HyCodeOrder::getOrderStatus, 2)) > 0; + }else if(roleType == 4){ + return baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyCodeOrder::getDelFlag, 2) + .in(HyCodeOrder::getId, orderIds) + .eq(HyCodeOrder::getUserId, userId) + .ne(HyCodeOrder::getOrderStatus, 2)) > 0; + } + return false; + } + + /** + * 批量生成会员码 + * + * @return 订单编号 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean generateMemberCodes(Long orderId) { + // 1. 查询订单信息 + HyCodeOrder order = baseMapper.selectById(orderId); + if (order == null) { + throw new ServiceException("订单不存在"); + } +// if (order.getOrderStatus() != 2) { +// throw new ServiceException("订单未支付"); +// } + + // 2. 批量生成会员码 + List memberCodes = new ArrayList<>(); + for (int i = 0; i < order.getNum(); i++) { + HyMemberCode memberCode = new HyMemberCode(); + memberCode.setOrderId(orderId); + if(order.getUserId()!= null){ + memberCode.setUserId(order.getUserId()); + } + if(order.getMerchantId()!= null){ + memberCode.setMerchantId(order.getMerchantId()); + } + if(order.getPromoterId()!= null){ + memberCode.setPromoterId(order.getPromoterId()); + } + memberCode.setCode(genMemberCode()); + memberCode.setPrice(order.getPrice()); + memberCode.setStatus(1); + memberCode.setDelFlag(1); + memberCode.setType(order.getType()); + memberCode.setCreateTime(new Date()); + memberCodes.add(memberCode); + } + // 3. 批量插入会员码 + if (!memberCodeBaseMapper.insertBatch(memberCodes)) { + throw new ServiceException("生成会员码失败"); + } + order.setOrderStatus(2); + order.setPaymentTime(new Date()); + if (baseMapper.updateById(order) <= 0) { + throw new ServiceException("更新订单状态失败"); + } + return true; + } + + /** + * 根据订单号查询订单信息 + * + * @param orderNo 订单号 + * @param payOrderNo 支付订单号 + * @return 订单信息 + */ + @Override + public HyCodeOrder queryByOrderNo(String orderNo, String payOrderNo) { + return baseMapper.selectOne( + Wrappers.lambdaQuery() + .eq(HyCodeOrder::getOrderNo, orderNo) + .eq(HyCodeOrder::getPayOrderNo, payOrderNo)); + } + + private String genOrderNum() { + return "HY" + System.currentTimeMillis() + RandomUtil.randomNumbers(4); + } + + private String genMemberCode() { + return "MC" + System.currentTimeMillis() + RandomUtil.randomNumbers(6); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCouponRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCouponRecordServiceImpl.java new file mode 100644 index 0000000..54c547e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyCouponRecordServiceImpl.java @@ -0,0 +1,125 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyCouponRecord; +import org.dromara.mall.domain.bo.HyCouponRecordBo; +import org.dromara.mall.domain.vo.HyCouponRecordVo; +import org.dromara.mall.mapper.HyCouponRecordMapper; +import org.dromara.mall.service.IHyCouponRecordService; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author admin + */ +@RequiredArgsConstructor +@Service +public class HyCouponRecordServiceImpl implements IHyCouponRecordService { + + private final HyCouponRecordMapper baseMapper; + + /** + * 查询会员券抵金记录 + * + * @param id + */ + @Override + public HyCouponRecordVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询优惠券记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 优惠券记录分页列表 + */ + @Override + public TableDataInfo queryPageList(HyCouponRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(HyCouponRecord::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的优惠券记录列表 + * + * @param bo 查询条件 + * @return 优惠券记录列表 + */ + @Override + public List queryList(HyCouponRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HyCouponRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getId() != null, HyCouponRecord::getId, bo.getId()); + lqw.eq(bo.getUserId() != null, HyCouponRecord::getUserId, bo.getUserId()); + lqw.eq(bo.getPhone() != null, HyCouponRecord::getPhone, bo.getPhone()); + lqw.eq(bo.getType() != null, HyCouponRecord::getType, bo.getType()); + lqw.eq(bo.getOrderId() != null, HyCouponRecord::getOrderId, bo.getOrderId()); + lqw.like(bo.getOrderNum() != null, HyCouponRecord::getOrderNum, bo.getOrderNum()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, HyCouponRecord::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增优惠券记录 + * + * @param bo 优惠券记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyCouponRecordBo bo) { + HyCouponRecord add = MapstructUtils.convert(bo, HyCouponRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改优惠券记录 + * + * @param bo 优惠券记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyCouponRecordBo bo) { + HyCouponRecord update = MapstructUtils.convert(bo, HyCouponRecord.class); + return baseMapper.updateById(update) > 0; + } + + @Override + public Boolean deleteByIds(Long[] ids) { + return baseMapper.deleteBatchIds(Arrays.asList(ids)) > 0; + } + + @Override + public Boolean deleteById(Long id) { + return baseMapper.deleteById(id) > 0; + } + + @Override + public IPage queryPageListAPP(HyCouponRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(HyCouponRecord::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyMemberCodeServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyMemberCodeServiceImpl.java new file mode 100644 index 0000000..96a77f9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyMemberCodeServiceImpl.java @@ -0,0 +1,326 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.HyMemberCodeBo; +import org.dromara.mall.domain.vo.HyMemberCodeVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.IHyMemberCodeService; +import org.dromara.system.domain.SysDictData; +import org.dromara.system.mapper.SysDictDataMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 会员码兑换Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyMemberCodeServiceImpl extends MPJBaseServiceImpl implements IHyMemberCodeService { + + private final HyMemberCodeMapper baseMapper; + + private final HyCodeOrderMapper codeOrderMapper; + + private final HyCouponRecordMapper couponRecordMapper; + + private final TzUserMapper userMapper; + + private final HyPromoterMapper promoterMapper; + + private final SysDictDataMapper dictDataMapper; + + /** + * 查询会员码兑换 + * + * @param id 主键 + * @return 会员码兑换 + */ + @Override + public HyMemberCodeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询会员码兑换列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 会员码兑换分页列表 + */ + @Override + public TableDataInfo queryPageList(HyMemberCodeBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryMPJWrapper(bo); + lqw.selectAll(HyMemberCode.class); + lqw.selectAs(HyPromoter::getPhone,HyMemberCodeVo::getTgyPhone); + lqw.selectAs(TzUser::getUserMobile,HyMemberCodeVo::getSjsPhone); + lqw.leftJoin(HyPromoter.class,HyPromoter::getId,HyMemberCode::getPromoterId); + lqw.leftJoin(TzUser.class,TzUser::getUserId,HyMemberCode::getUserId); + lqw.orderByDesc(HyMemberCode::getCreateTime); + IPage result = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), HyMemberCodeVo.class, lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的会员码兑换列表 + * + * @param bo 查询条件 + * @return 会员码兑换列表 + */ + @Override + public List queryList(HyMemberCodeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(HyMemberCodeBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getOrderId() != null, HyMemberCode::getOrderId, bo.getOrderId()); + lqw.eq(bo.getUserId() != null, HyMemberCode::getUserId, bo.getUserId()); + lqw.eq(bo.getMerchantId() != null, HyMemberCode::getMerchantId, bo.getMerchantId()); + lqw.eq(bo.getPromoterId() != null, HyMemberCode::getPromoterId, bo.getPromoterId()); + lqw.eq(bo.getRedeemTime() != null, HyMemberCode::getRedeemTime, bo.getRedeemTime()); + lqw.eq(bo.getTgyPhone() != null, HyPromoter::getPhone, bo.getTgyPhone()); + lqw.eq(bo.getSjsPhone() != null, TzUser::getUserMobile, bo.getSjsPhone()); + lqw.eq(bo.getPrice() != null, HyMemberCode::getPrice, bo.getPrice()); + lqw.eq(bo.getMemberId() != null, HyMemberCode::getMemberId, bo.getMemberId()); + lqw.eq(StringUtils.isNotBlank(bo.getMemberPhone()), HyMemberCode::getMemberPhone, bo.getMemberPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), HyMemberCode::getCode, bo.getCode()); + lqw.eq(bo.getStatus() != null, HyMemberCode::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, HyMemberCode::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getType() != null, HyMemberCode::getType, bo.getType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyMemberCode::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.between(params.get("beginRedeemTime") != null && params.get("endRedeemTime") != null, + HyMemberCode::getUpdateTime ,params.get("beginRedeemTime"), params.get("endRedeemTime")); + lqw.between(params.get("beginValidTo") != null && params.get("endValidTo") != null, + HyMemberCode::getValidTo ,params.get("beginValidTo"), params.get("endValidTo")); + return lqw; + } + + private LambdaQueryWrapper buildQueryWrapper(HyMemberCodeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(HyMemberCode::getId); + lqw.eq(bo.getOrderId() != null, HyMemberCode::getOrderId, bo.getOrderId()); + lqw.eq(bo.getUserId() != null, HyMemberCode::getUserId, bo.getUserId()); + lqw.eq(bo.getMerchantId() != null, HyMemberCode::getMerchantId, bo.getMerchantId()); + lqw.eq(bo.getPromoterId() != null, HyMemberCode::getPromoterId, bo.getPromoterId()); + lqw.eq(bo.getRedeemTime() != null, HyMemberCode::getRedeemTime, bo.getRedeemTime()); + lqw.eq(bo.getPrice() != null, HyMemberCode::getPrice, bo.getPrice()); + lqw.eq(bo.getMemberId() != null, HyMemberCode::getMemberId, bo.getMemberId()); + lqw.eq(StringUtils.isNotBlank(bo.getMemberPhone()), HyMemberCode::getMemberPhone, bo.getMemberPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), HyMemberCode::getCode, bo.getCode()); + lqw.eq(bo.getStatus() != null, HyMemberCode::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, HyMemberCode::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getType() != null, HyMemberCode::getType, bo.getType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyMemberCode::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.between(params.get("beginRedeemTime") != null && params.get("endRedeemTime") != null, + HyMemberCode::getUpdateTime ,params.get("beginRedeemTime"), params.get("endRedeemTime")); + lqw.between(params.get("beginValidTo") != null && params.get("endValidTo") != null, + HyMemberCode::getValidTo ,params.get("beginValidTo"), params.get("endValidTo")); + return lqw; + } + + /** + * 新增会员码兑换 + * + * @param bo 会员码兑换 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyMemberCodeBo bo) { + HyMemberCode add = MapstructUtils.convert(bo, HyMemberCode.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改会员码兑换 + * + * @param bo 会员码兑换 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyMemberCodeBo bo) { + HyMemberCode update = MapstructUtils.convert(bo, HyMemberCode.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除会员码兑换信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage queryPageListAPP(HyMemberCodeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(HyMemberCode::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean redeemCode(String code, Long userId) { + // 1. 查询兑换码信息 + HyMemberCode memberCode = baseMapper.selectOne( + new LambdaQueryWrapper() + .eq(HyMemberCode::getCode, code) + .eq(HyMemberCode::getDelFlag, 1)); + + if (memberCode == null) { + throw new ServiceException("兑换码不存在"); + } + if (memberCode.getStatus() == 2) { + throw new ServiceException("兑换码已使用"); + } + + // 2. 查询用户信息 + TzUser user = userMapper.selectById(userId); + if (user == null) { + throw new ServiceException("用户不存在"); + } + + // 3. 更新用户会员信息 + Date now = new Date(); + Date startTime; + Date endTime; + + if (user.getValidTo() == null) { + // 如果用户不是会员,从当前时间开始计算 + startTime = now; + endTime = DateUtil.offsetDay(now, 365); + } else { + // 如果用户已是会员,从当前会员结束时间开始叠加 + startTime = user.getValidTo(); + endTime = DateUtil.offsetDay(startTime, 365); + } + + // 更新用户表 + TzUser updateUser = new TzUser(); + updateUser.setUserId(userId); + updateUser.setIsMember(1); + updateUser.setValidTo(endTime); + if (userMapper.updateById(updateUser) <= 0) { + throw new ServiceException("更新用户会员信息失败"); + } + + // 4. 更新兑换码信息 + HyMemberCode updateCode = new HyMemberCode(); + updateCode.setId(memberCode.getId()); + updateCode.setMemberId(userId); + updateCode.setMemberPhone(user.getUserMobile()); + updateCode.setStatus(2); + updateCode.setRedeemTime(now); + updateCode.setValidFrom(startTime); + updateCode.setValidTo(endTime); + + if (baseMapper.updateById(updateCode) <= 0) { + throw new ServiceException("更新兑换码信息失败"); + } + + // 5. 发放优惠券 + HyCodeOrder order = codeOrderMapper.selectById(memberCode.getOrderId()); + if(order.getInviteUserId() != null){ + TzUser tzUser = userMapper.selectById(order.getInviteUserId()); + BigDecimal deductionFee = new BigDecimal(500); + + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(tzUser.getUserId()); + couponRecord.setPhone(user.getUserMobile()); + couponRecord.setAmount(deductionFee); + couponRecord.setBalance(deductionFee.add(user.getDeductionFee())); + couponRecord.setType(1); + couponRecord.setCreateTime(now); + + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + + tzUser.setDeductionFee(tzUser.getDeductionFee().add(deductionFee)); + if(userMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + + //推广员推广人数+1 + if (order.getPromoterId() != null) { + int res = promoterMapper.update(null, + Wrappers.lambdaUpdate() + .setSql("num = num + 1") + .eq(HyPromoter::getId, order.getPromoterId())); + if (res <= 0) { + throw new ServiceException("更新推广员推广人数失败"); + } + } + + return true; + } + + /** + * 复制兑换码 + * + * @param bo + * @return + */ + @Override + public String copyCode(HyMemberCodeBo bo) { + HyMemberCode memberCode = baseMapper.selectById(bo.getId()); + memberCode.setIsCopy(2); + baseMapper.updateById(memberCode); + return memberCode.getCode(); + } + + /** + * 获取会员价格 1-会员价格 2-推广员价格 + * + * @param id + * @return + */ + @Override + public BigDecimal getMemberPrice(Integer id) { + SysDictData hyPrice = null; + if (id == 1){ + hyPrice = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_hy_price").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); + }else if(id == 2){ + hyPrice = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_tgy_price").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); + } + if (hyPrice == null) { + throw new ServiceException("获取会员单价失败"); + } + return new BigDecimal(hyPrice.getDictValue()); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderItemServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderItemServiceImpl.java new file mode 100644 index 0000000..fc77dc0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderItemServiceImpl.java @@ -0,0 +1,984 @@ +package org.dromara.mall.service.impl; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaOrderUtils; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils; +import com.lkl.laop.sdk.request.V3LabsRelationRefundRequest; +import com.lkl.laop.sdk.request.V3SacsBalanceSeparateRequest; +import com.lkl.laop.sdk.request.model.V3LabsTradeLocationInfo; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.BasketBo; +import org.dromara.mall.domain.bo.HyBasketBo; +import org.dromara.mall.domain.bo.HyOrderItemBo; +import org.dromara.mall.domain.vo.HyBasketVo; +import org.dromara.mall.domain.vo.HyOrderItemSumVo; +import org.dromara.mall.domain.vo.HyOrderItemVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.IHyBasketService; +import org.dromara.mall.service.IHyOrderItemService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantVo; +import org.dromara.system.mapper.SysDictDataMapper; +import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysTenantService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 订单详情Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyOrderItemServiceImpl extends MPJBaseServiceImpl implements IHyOrderItemService { + + private final HyOrderMapper orderMapper; + + private final HyOrderItemMapper baseMapper; + + private final HyCouponRecordMapper couponRecordMapper; + + private final TzProdMapper tzProdMapper; + + private final TzUserMapper tzUserMapper; + + private final TzSkuMapper tzSkuMapper; + + private final IHyBasketService hyBasketService; + + private final SysTenantMapper tenantMapper; + + private final ISysTenantService tenantService; + + private final TzTenantRecordMapper tenantRecordMapper; + + private final HyUserRecordMapper userRecordMapper; + + private final SysDictDataMapper dictDataMapper; + + /** + * 查询订单详情 + * + * @param id 主键 + * @return 订单详情 + */ + @Override + public HyOrderItemVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单详情列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单详情分页列表 + */ + @Override + public TableDataInfo queryPageList(HyOrderItemBo bo, PageQuery pageQuery) { + MPJLambdaWrapper wrapper = buildQueryWrapper(bo) + .selectAll(HyOrderItem.class) + .select(TzProd::getProdName, TzProd::getPic) + .select(TzSku::getSkuName, TzSku::getPrice) + .leftJoin(TzProd.class, TzProd::getProdId, HyOrderItem::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyOrderItem::getSkuId) + .orderByDesc(HyOrderItem::getCreateTime); + + Page result = baseMapper.selectJoinPage(pageQuery.build(), HyOrderItemVo.class, wrapper); + return TableDataInfo.build(result); + } + + /** + * 查询订单详情统计信息 + * + * @param bo + * @return + */ + @Override + public HyOrderItemSumVo querySum(HyOrderItemBo bo) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = buildQueryWrapper(bo) + .selectCount(HyOrderItem::getId, HyOrderItemSumVo::getTotalOrderNum) + .selectSum(HyOrderItem::getTotal, HyOrderItemSumVo::getTotalOrderPrice) + .selectSum(HyOrderItem::getActualTotal, HyOrderItemSumVo::getTotalOrderCostPrice) + .selectSum(HyOrderItem::getDvyPrice, HyOrderItemSumVo::getTotalOrderFreight); + + // 执行查询 + HyOrderItemSumVo orderPaymenSum = baseMapper.selectJoinOne(HyOrderItemSumVo.class, wrapper); + + //待发货数量 + MPJLambdaWrapper lqw1 = buildQueryWrapper(bo); + lqw1.eq(HyOrderItem::getStatus, 2); + Long dfhNum = baseMapper.selectJoinCount(lqw1); + orderPaymenSum.setWaitSendNum(dfhNum); + + return orderPaymenSum; + } + + /** + * APP查询订单详情列表 + * + * @param bo 订单详情 + * @param pageQuery + * @return 订单详情 + */ + @Override + public IPage queryPageListApp(HyOrderItemBo bo, PageQuery pageQuery) { + MPJLambdaWrapper wrapper = buildQueryWrapper(bo) + .selectAll(HyOrderItem.class) + .select(TzProd::getProdName, TzProd::getPic,TzProd::getUnit) + .select(TzSku::getSkuName, TzSku::getPrice) + .leftJoin(TzProd.class, TzProd::getProdId, HyOrderItem::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyOrderItem::getSkuId) + .orderByDesc(HyOrderItem::getCreateTime); + + return baseMapper.selectJoinPage(pageQuery.build(), HyOrderItemVo.class, wrapper); + } + + /** + * 查询符合条件的订单详情列表 + * + * @param bo 查询条件 + * @return 订单详情列表 + */ + @Override + public List queryList(HyOrderItemBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(HyOrderItemBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNum()), HyOrderItem::getOrderNum, bo.getOrderNum()); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), HyOrderItem::getTenantId, bo.getTenantId()); + lqw.eq(bo.getOrderId() != null, HyOrderItem::getOrderId, bo.getOrderId()); + lqw.eq(bo.getProdId() != null, HyOrderItem::getProdId, bo.getProdId()); + lqw.eq(StringUtils.isNotBlank(bo.getProdCode()), HyOrderItem::getProdCode, bo.getProdCode()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), HyOrderItem::getProdName, bo.getProdName()); + lqw.eq(bo.getSkuId() != null, HyOrderItem::getSkuId, bo.getSkuId()); + lqw.eq(StringUtils.isNotBlank(bo.getSkuCode()), HyOrderItem::getSkuCode, bo.getSkuCode()); + lqw.eq(StringUtils.isNotBlank(bo.getSkuFactoryCode()), HyOrderItem::getSkuFactoryCode, bo.getSkuFactoryCode()); + lqw.like(StringUtils.isNotBlank(bo.getSkuName()), HyOrderItem::getSkuName, bo.getSkuName()); + lqw.eq(StringUtils.isNotBlank(bo.getPic()), HyOrderItem::getPic, bo.getPic()); + lqw.eq(bo.getSaleId() != null, HyOrderItem::getSaleId, bo.getSaleId()); + lqw.eq(bo.getBuyerId() != null, HyOrderItem::getBuyerId, bo.getBuyerId()); + lqw.eq(bo.getUserId() != null, HyOrderItem::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), HyOrderItem::getUserName, bo.getUserName()); + lqw.eq(bo.getNum() != null, HyOrderItem::getNum, bo.getNum()); + lqw.eq(bo.getPrice() != null, HyOrderItem::getPrice, bo.getPrice()); + lqw.eq(bo.getTotal() != null, HyOrderItem::getTotal, bo.getTotal()); + lqw.eq(bo.getActualTotal() != null, HyOrderItem::getActualTotal, bo.getActualTotal()); + lqw.eq(bo.getPayPrice() != null, HyOrderItem::getPayPrice, bo.getPayPrice()); + lqw.eq(bo.getPayState() != null, HyOrderItem::getPayState, bo.getPayState()); + lqw.eq(bo.getPayType() != null, HyOrderItem::getPayType, bo.getPayType()); + lqw.like(StringUtils.isNotBlank(bo.getRemarks()), HyOrderItem::getRemarks, bo.getRemarks()); + lqw.eq(bo.getStatus() != null, HyOrderItem::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, HyOrderItem::getDelFlag, bo.getDelFlag()); + lqw.like(StringUtils.isNotBlank(bo.getDvyFlowId()), HyOrderItem::getDvyFlowId, bo.getDvyFlowId()); + lqw.eq(bo.getDvyPrice() != null, HyOrderItem::getDvyPrice, bo.getDvyPrice()); + lqw.eq(StringUtils.isNotBlank(bo.getDeliveryLocat()), HyOrderItem::getDeliveryLocat, bo.getDeliveryLocat()); + lqw.like(StringUtils.isNotBlank(bo.getClientName()), HyOrderItem::getClientName, bo.getClientName()); + lqw.eq(StringUtils.isNotBlank(bo.getClientPhone()), HyOrderItem::getClientPhone, bo.getClientPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getClientAddress()), HyOrderItem::getClientAddress, bo.getClientAddress()); + lqw.eq(bo.getPayTime() != null, HyOrderItem::getPayTime, bo.getPayTime()); + lqw.between(params.get("beginDvyTime") != null && params.get("endDvyTime") != null, + HyOrderItem::getDvyTime ,params.get("beginDvyTime"), params.get("endDvyTime")); + lqw.between(params.get("beginFinallyTime") != null && params.get("endFinallyTime") != null, + HyOrderItem::getFinallyTime ,params.get("beginFinallyTime"), params.get("endFinallyTime")); + lqw.between(params.get("beginCancelTime") != null && params.get("endCancelTime") != null, + HyOrderItem::getCancelTime ,params.get("beginCancelTime"), params.get("endCancelTime")); + lqw.eq(bo.getRefundSts() != null, HyOrderItem::getRefundSts, bo.getRefundSts()); + lqw.eq(bo.getAppraisalFlag() != null, HyOrderItem::getAppraisalFlag, bo.getAppraisalFlag()); + lqw.eq(bo.getCloseType() != null, HyOrderItem::getCloseType, bo.getCloseType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderItem::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增订单详情 + * + * @param bo 订单详情 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Long insertByBo(HyOrderItemBo bo) throws Exception { + TzProd tzProd = tzProdMapper.selectById(bo.getProdId()); + TzUser tzUser = tzUserMapper.selectById(bo.getUserId()); + TzSku tzSku = tzSkuMapper.selectById(bo.getSkuId()); + + String orderNo = "Z"+genItemId(); + BigDecimal payPrice = bo.getPrice().multiply(new BigDecimal(bo.getNum())); + HyOrder order = new HyOrder(); + //order.setTenantId(tzProd.getTenantId()); + order.setOrderNum(orderNo); + order.setUserId(bo.getUserId()); + order.setUserName(tzUser.getRealName()); + order.setNum(bo.getNum()); + order.setTotal(payPrice); + order.setDeductionFee(bo.getDeductionFee()); + order.setPayPrice(payPrice.subtract(bo.getDeductionFee())); + order.setActualTotal(tzProd.getOriPrice().multiply(new BigDecimal(bo.getNum()))); + order.setClientName(bo.getClientName()); + order.setClientPhone(bo.getClientPhone()); + order.setClientAddress(bo.getClientAddress()); + order.setRemarks(bo.getRemarks()); + order.setCreateTime(new Date()); + boolean flag = orderMapper.insert(order) > 0; + if (!flag) { + throw new ServiceException("创建订单失败"); + } + bo.setTenantId(tzProd.getTenantId()); + bo.setUserName(tzUser.getRealName()); + bo.setOrderId(order.getId()); + bo.setOrderNum(genItemId()); + bo.setNum(bo.getNum()); + bo.setPrice(bo.getPrice()); + bo.setPayPrice(payPrice.subtract(bo.getDeductionFee())); + bo.setTotal(bo.getPrice().multiply(new BigDecimal(bo.getNum()))); + bo.setActualTotal(tzSku.getOriPrice().multiply(new BigDecimal(bo.getNum()))); + bo.setDeliveryLocat(tzProd.getFactoryAddress()); + bo.setProdCode(tzProd.getProdCode()); + bo.setProdName(tzProd.getProdName()); + bo.setSkuCode(tzSku.getSkuCode()); + bo.setSkuName(tzSku.getSkuName()); + bo.setPic(tzSku.getPic()); + bo.setSkuFactoryCode(tzSku.getSkuFactoryCode()); + bo.setCreateTime(new Date()); + HyOrderItem add = MapstructUtils.convert(bo, HyOrderItem.class); + if (baseMapper.insert(add) <= 0) { + throw new ServiceException("创建订单详情失败"); + } + if (bo.getDeductionFee().compareTo(BigDecimal.ZERO) > 0) { + // 创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(bo.getUserId()); + couponRecord.setOrderId(order.getId()); + couponRecord.setOrderNum(order.getOrderNum()); + couponRecord.setAmount(bo.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().subtract(bo.getDeductionFee())); + couponRecord.setType(2); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + + // 更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().subtract(bo.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + return order.getId(); + } + + /** + * 修改订单详情 + * + * @param bo 订单详情 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyOrderItemBo bo) { + HyOrderItem update = MapstructUtils.convert(bo, HyOrderItem.class); + + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除订单详情信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 逻辑删除订单 + * + * @param orderIds 订单详情主键集合 + * @return 是否删除成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean logicDeleteByIds(List orderIds, Long userId) { + // 查询订单状态,只允许删除未付款和已完成的订单 + List orderItems = this.baseMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getUserId, userId) + .in(HyOrderItem::getId, orderIds) + ); + + if (orderItems.isEmpty()) { + throw new ServiceException("订单不存在"); + } + + // 检查订单状态 + for (HyOrderItem item : orderItems) { + if (item.getStatus() == 1) { + throw new ServiceException("先取消订单再删除"); + } + if (item.getStatus() == 2 || item.getStatus() == 3 || item.getStatus() == 4) { + throw new ServiceException("该订单状态不可删除"); + } + } + + // 收集需要删除的主订单ID + Set mainOrderIds = orderItems.stream() + .map(HyOrderItem::getOrderId) + .collect(Collectors.toSet()); + + // 逻辑删除订单详情 + boolean itemResult = this.baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getDelFlag, 2) + .in(HyOrderItem::getId, orderIds) + .eq(HyOrderItem::getUserId, userId)) > 0; + + // 逻辑删除主订单 + boolean orderResult = orderMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getDelFlag, 2) + .in(HyOrder::getId, mainOrderIds) + .eq(HyOrder::getUserId, userId)) > 0; + return itemResult && orderResult; + } + + /** + * 查询订单详情 + * + * @param orderId 订单详情主键 + * @return 订单详情 + */ + @Override + public HyOrderItemVo queryOrderDetail(Long orderId, Long userId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(HyOrderItem.class) + .select(TzProd::getProdName, TzProd::getPic,TzProd::getUnit) + .select(TzSku::getSkuName, TzSku::getPrice) + .leftJoin(TzProd.class, TzProd::getProdId, HyOrderItem::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyOrderItem::getSkuId) + .eq(HyOrderItem::getId, orderId) + .eq(HyOrderItem::getUserId, userId) + .eq(HyOrderItem::getDelFlag, 1); + + return baseMapper.selectJoinOne(HyOrderItemVo.class, wrapper); + } + + + public static String genItemId() { + //取当前时间的长整形值包含毫秒 + long millis = System.currentTimeMillis(); + //加上两位随机数 + Random random = new Random(); + int end2 = random.nextInt(99); + //如果不足两位前面补0 + return "DD" + millis + String.format("%02d", end2); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Long insertByBasketIds(BasketBo basketBo, Long userId) throws Exception { + List basketIds = basketBo.getBasketBoList().stream().map(HyBasketBo::getId).collect(Collectors.toList()); + // 1. 查询购物车商品信息 + List basketList = hyBasketService.selectVoByIds(basketIds); + if (basketList.isEmpty()) { + throw new ServiceException("购物车商品不存在"); + } + + TzUser tzUser = tzUserMapper.selectById(userId); + + String orderNo = "Z"+genItemId(); + + // 2. 创建订单主表记录 + HyOrder order = new HyOrder(); +// order.setTenantId(basketBo.getTenantId()); + order.setOrderNum(orderNo); + order.setUserId(userId); + order.setUserName(tzUser.getRealName()); + order.setClientName(basketBo.getClientName()); + order.setClientPhone(basketBo.getClientPhone()); + order.setClientAddress(basketBo.getClientAddress()); + order.setRemarks(basketBo.getRemarks()); + order.setCreateTime(new Date()); + + // 计算订单总金额 + long totalNum = 0; + BigDecimal totalAmount = BigDecimal.ZERO; + BigDecimal actualAmount = BigDecimal.ZERO; + + for (HyBasketBo basket : basketBo.getBasketBoList()) { + totalNum += basket.getNum(); + totalAmount = totalAmount.add(basket.getPrice().multiply(new BigDecimal(basket.getNum()))); + } + + for (HyBasketVo basket : basketList) { + actualAmount = actualAmount.add(basket.getOriPrice().multiply(new BigDecimal(basket.getNum()))); + } + + order.setDeductionFee(basketBo.getDeductionFee()); + order.setNum(totalNum); + order.setTotal(totalAmount); + order.setPayPrice(totalAmount.subtract(basketBo.getDeductionFee())); + order.setActualTotal(actualAmount); + boolean flag = orderMapper.insert(order) > 0; + if (!flag) { + throw new ServiceException("创建订单失败"); + } + // 每单均摊优惠金额 + BigDecimal deductionFee = new BigDecimal(0); + + if(basketBo.getDeductionFee().compareTo(BigDecimal.ZERO) > 0){ + deductionFee = basketBo.getDeductionFee().divide(new BigDecimal(basketIds.size())); + } + + // 3. 创建订单详情记录 + for (HyBasketBo basket : basketBo.getBasketBoList()) { + HyOrderItem orderItem = new HyOrderItem(); + orderItem.setOrderId(order.getId()); + orderItem.setOrderNum(genItemId()); + orderItem.setUserId(userId); + orderItem.setUserName(tzUser.getRealName()); + orderItem.setClientName(basketBo.getClientName()); + orderItem.setClientPhone(basketBo.getClientPhone()); + orderItem.setClientAddress(basketBo.getClientAddress()); + orderItem.setProdId(basket.getProdId()); + orderItem.setSkuId(basket.getSkuId()); + orderItem.setNum(basket.getNum()); + orderItem.setPrice(basket.getPrice()); + BigDecimal total = basket.getPrice().multiply(new BigDecimal(basket.getNum())); + orderItem.setTotal(total); + orderItem.setDeductionFee(deductionFee); + orderItem.setPayPrice(total.subtract(deductionFee)); + + HyBasketVo basketVo = basketList.stream().filter(b -> b.getId().equals(basket.getId())).findFirst().get(); + orderItem.setTenantId(basketVo.getTenantId()); + orderItem.setActualTotal(basketVo.getOriPrice().multiply(new BigDecimal(basket.getNum()))); + orderItem.setProdCode(basketVo.getProdCode()); + orderItem.setProdName(basketVo.getProdName()); + orderItem.setSkuCode(basketVo.getSkuCode()); + orderItem.setSkuFactoryCode(basketVo.getSkuFactoryCode()); + orderItem.setSkuName(basketVo.getSkuName()); + orderItem.setPic(basketVo.getPic()); + orderItem.setCreateTime(new Date()); + + if (baseMapper.insert(orderItem) <= 0) { + throw new ServiceException("创建订单详情失败"); + } + } + + if(deductionFee.compareTo(BigDecimal.ZERO) > 0){ + // 4.创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(tzUser.getUserId()); + couponRecord.setOrderId(order.getId()); + couponRecord.setOrderNum(order.getOrderNum()); + couponRecord.setAmount(basketBo.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().subtract(basketBo.getDeductionFee())); + couponRecord.setType(2); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + // 5.更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().subtract(basketBo.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + + // 6. 清空购物车 + if(!hyBasketService.logicDeleteByIds(basketIds, userId)){ + throw new ServiceException("清空购物车失败"); + } + return order.getId(); + } + + @Override + public List queryOrderItemsByOrderId(Long orderId, Long userId) { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(HyOrderItem.class) + .select(TzProd::getProdName, TzProd::getPic,TzProd::getUnit) + .select(TzSku::getSkuName) + .leftJoin(TzProd.class, TzProd::getProdId, HyOrderItem::getProdId) + .leftJoin(TzSku.class, TzSku::getSkuId, HyOrderItem::getSkuId) + .eq(HyOrderItem::getOrderId, orderId) + .eq(userId != null,HyOrderItem::getUserId, userId) + .eq(HyOrderItem::getDelFlag, 1); + return baseMapper.selectJoinList(HyOrderItemVo.class, wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean cancelByIds(List orderIds, Long userId) { + // 查询订单状态,只允许取消未付款和待发货的订单 + List orderItems = this.baseMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getUserId, userId) + .in(HyOrderItem::getId, orderIds) + ); + + if (orderItems.isEmpty()) { + throw new ServiceException("订单不存在"); + } + + // 检查订单状态 + for (HyOrderItem item : orderItems) { + if (item.getStatus() != 1) { + throw new ServiceException("该订单状态不可取消"); + } + } + + // 收集需要取消的主订单ID + Set mainOrderIds = orderItems.stream() + .map(HyOrderItem::getOrderId) + .collect(Collectors.toSet()); + + // 更新订单详情状态为已取消 + boolean itemResult = this.baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getStatus, 7) + .set(HyOrderItem::getCloseType, 4) + .set(HyOrderItem::getCancelTime, new Date()) + .in(HyOrderItem::getId, orderIds) + .eq(HyOrderItem::getUserId, userId)) > 0; + + // 更新主订单状态为已取消 + boolean orderResult = orderMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getStatus, 7) + .set(HyOrder::getCloseType, 4) + .in(HyOrder::getId, mainOrderIds) + .eq(HyOrder::getUserId, userId)) > 0; + + + // 抵扣金退回 + for (HyOrderItem item : orderItems) { + if(item.getDeductionFee().compareTo(BigDecimal.ZERO) > 0){ + TzUser tzUser = tzUserMapper.selectById(item.getUserId()); + // 创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(item.getUserId()); + couponRecord.setOrderId(item.getId()); + couponRecord.setOrderNum(item.getOrderNum()); + couponRecord.setAmount(item.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().add(item.getDeductionFee())); + couponRecord.setType(3); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + // 更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().add(item.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + } + + if(!itemResult){ + throw new ServiceException("更新订单详情状态失败"); + } + if(!orderResult){ + throw new ServiceException("更新主订单状态失败"); + } + return true; + } + + @Override + public Map countByStatus(Long userId) { + Map result = new HashMap<>(); + + // 查询所有状态的订单数量 + Long total = baseMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getUserId, userId) + .eq(HyOrderItem::getDelFlag, 1)); + result.put("total", total); + + // 查询各个状态的订单数量 + List> statusCounts = baseMapper.selectMaps( + Wrappers.query() + .select("status, COUNT(*) as count") + .groupBy("status") + .eq("user_id", userId) + .eq("del_flag", 1)); + + // 处理查询结果 + for (Map count : statusCounts) { + Integer status = (Integer) count.get("status"); + Long statusCount = ((Number) count.get("count")).longValue(); + result.put("status_" + status, statusCount); + } + + return result; + } + + /** + * 确认收货 + * + * @param orderId + * @return + */ + @Override + public boolean confirmOrderById(Long orderId) { + HyOrderItem orderItem = baseMapper.selectById(orderId); + if (orderItem != null) { + orderItem.setStatus(4); + } + baseMapper.updateById(orderItem); + + //4.根据详单详情判断订单是否已完成 + List orderItems = baseMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getOrderId, orderItem.getOrderId()) + .eq(HyOrderItem::getDelFlag, 1)); + + if(orderItems.stream().anyMatch(item -> item.getStatus() == 4)){ + HyOrder order = orderMapper.selectById(orderItem.getOrderId()); + order.setStatus(4); + if (orderMapper.updateById(order) <= 0) { + throw new ServiceException("更新订单状态失败"); + } + } + return true; + } + + /** + * 确认订单 + * + * @param id 订单ID + * @return 是否成功 + */ + @Override + public Boolean confirmOrder(Long id) { + //1.修改订单状态 + HyOrderItem orderItem = baseMapper.selectById(id); + if (orderItem == null) { + throw new ServiceException("订单不存在"); + } + orderItem.setStatus(6); + orderItem.setFinallyTime(new Date()); + if(baseMapper.updateById(orderItem) <= 0){ + throw new ServiceException("确认订单失败"); + } + + //2.更新租户余额 + SysTenant tenant = tenantService.queryByCode(orderItem.getTenantId()); + if(tenant == null){ + throw new ServiceException("租户不存在"); + } + tenant.setBalance(tenant.getBalance().add(orderItem.getActualTotal())); + BigDecimal blockedBalance = tenant.getBlockedBalance().subtract(orderItem.getActualTotal()); + if(blockedBalance.compareTo(BigDecimal.ZERO) < 0){ + throw new ServiceException("租户余额不足"); + } + tenant.setBlockedBalance(blockedBalance); + if(tenantMapper.updateById(tenant) <= 0){ + throw new ServiceException("更新租户余额失败"); + } + + //3.更新租户资金记录 + TzTenantRecord record = new TzTenantRecord(); + record.setTenantId(tenant.getTenantId()); + record.setTenantName(tenant.getCompanyName()); + record.setOrderId(orderItem.getOrderId()); + record.setOrderItemId(orderItem.getId()); + record.setAmount(orderItem.getActualTotal()); + record.setBalance(blockedBalance); + record.setType(2); + record.setAmountType(2); + record.setCreateTime(new Date()); + if (tenantRecordMapper.insert(record) <= 0){ + throw new ServiceException("创建资金记录失败"); + } + + TzTenantRecord record1 = new TzTenantRecord(); + record1.setTenantId(tenant.getTenantId()); + record1.setTenantName(tenant.getCompanyName()); + record1.setOrderId(orderItem.getOrderId()); + record1.setOrderItemId(orderItem.getId()); + record1.setAmount(orderItem.getActualTotal()); + record1.setBalance(tenant.getBalance()); + record1.setType(1); + record1.setAmountType(1); + record1.setCreateTime(new Date()); + if (tenantRecordMapper.insert(record1) <= 0){ + throw new ServiceException("创建资金记录失败"); + } + + //4.根据详单详情判断订单是否已完成 + List orderItems = baseMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getOrderId, orderItem.getOrderId()) + .eq(HyOrderItem::getDelFlag, 1)); + + if(orderItems.stream().anyMatch(item -> item.getStatus() != 6)){ + HyOrder order = orderMapper.selectById(orderItem.getOrderId()); + order.setStatus(6); + if (orderMapper.updateById(order) <= 0) { + throw new ServiceException("更新订单状态失败"); + } + } + + if(orderItem.getPayPrice().compareTo(orderItem.getActualTotal()) > 0){ + /* SysDictData zhTaxRate = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_zh_tax_rate").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); + if (zhTaxRate == null) { + throw new ServiceException("获取会员提现增值税税率失败"); + } + + BigDecimal zhRate = BigDecimal.ZERO; + BigDecimal zhAmount = BigDecimal.ZERO; + + //判断zhTaxRate不等于0 + if (new BigDecimal(zhTaxRate.getDictValue()).compareTo(BigDecimal.ZERO) != 0) { + // 增值税税率 + zhRate = new BigDecimal(zhTaxRate.getDictValue()); + // 增值税税金 + zhAmount = orderItem.getPayPrice().multiply(zhRate); + }*/ + + //5.更新用户余额和资金记录添加 + TzUser user = tzUserMapper.selectById(orderItem.getUserId()); + BigDecimal amount = orderItem.getPayPrice().subtract(orderItem.getActualTotal()); + + //判断amount大于0才添加记录 + if(amount.compareTo(BigDecimal.ZERO) > 0){ + HyUserRecord userRecord = new HyUserRecord(); + userRecord.setUserId(user.getUserId()); + userRecord.setUserName(user.getRealName()); + userRecord.setUserPhone(user.getUserMobile()); + userRecord.setOrderId(orderItem.getId()); + userRecord.setAmount(amount); + userRecord.setBalance(user.getBalance().add(amount)); + //userRecord.setZhTaxRate(zhRate); + //userRecord.setZhTaxAmount(zhAmount); + userRecord.setType(1); + userRecord.setCreateTime(new Date()); + userRecord.setRemark("订单结算"); + if (userRecordMapper.insert(userRecord) <= 0) { + throw new ServiceException("创建资金记录失败"); + } + user.setBalance(user.getBalance().add(amount)); + if (tzUserMapper.updateById(user) <= 0) { + throw new ServiceException("更新用户余额失败"); + } + } + } + return true; + } + + /** + * 订单退款 + * + * @param bo + * @return + */ + @Override + public int refund(HyOrderItemBo bo) throws Exception { + HyOrderItem orderItem = baseMapper.selectById(bo.getId()); + if (orderItem == null) { + throw new ServiceException("订单不存在"); + } + + if (orderItem.getPayState() == 1) { + throw new ServiceException("已付款的订单才可以申请退款"); + } + + HyOrder order = orderMapper.selectById(orderItem.getOrderId()); + + Long payPrice = orderItem.getPayPrice().multiply(new BigDecimal(100)).longValue(); + + V3SacsBalanceSeparateRequest separateRequest = new V3SacsBalanceSeparateRequest(); + separateRequest.setMerchantNo(KlkConstant.merchantNo); + separateRequest.setOutSeparateNo(getOutSeparateNo()); + separateRequest.setTotalAmt(String.valueOf(payPrice)); + separateRequest.setRecvDatas(getRecvDatas(payPrice)); + separateRequest.setNotifyUrl(KlkConstant.WITHDRAWAL); + JSONObject jsonObject = V3LakalaUserUtils.withdraw(separateRequest); + if ("SACS0000".equals(jsonObject.getString("code"))) { + V3LabsRelationRefundRequest v3LabsRelationRefundRequest = new V3LabsRelationRefundRequest(); + v3LabsRelationRefundRequest.setMerchantNo(KlkConstant.merchantNo); + v3LabsRelationRefundRequest.setTermNo(KlkConstant.TERM_NO); + v3LabsRelationRefundRequest.setOutTradeNo(getOutSeparateNo()); + v3LabsRelationRefundRequest.setRefundAmount(payPrice.toString()); + v3LabsRelationRefundRequest.setOriginTradeNo(order.getTradeNo()); + v3LabsRelationRefundRequest.setOriginLogNo(order.getLogNo()); + v3LabsRelationRefundRequest.setRefundReason("买家申请退款"); + + V3LabsTradeLocationInfo v3LabsTradeLocationInfo = new V3LabsTradeLocationInfo("124.223.107.31", null, null); + v3LabsRelationRefundRequest.setLocationInfo(v3LabsTradeLocationInfo); + + JSONObject jsonObject1 = V3LakalaOrderUtils.relationRefund(v3LabsRelationRefundRequest); + if ("BBS00000".equals(jsonObject1.getString("code"))) { + // 更新主订单付款金额 + boolean orderResult = orderMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getTotal, order.getTotal().subtract(orderItem.getTotal())) + .set(HyOrder::getPayPrice, order.getPayPrice().subtract(orderItem.getPayPrice())) + .set(HyOrder::getActualTotal, order.getActualTotal().subtract(orderItem.getActualTotal())) + .eq(HyOrder::getId, order.getId())) > 0; + + // 更新订单详情状态为已取消 + boolean orderItemResult = baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getStatus, 7) + .set(HyOrderItem::getCloseType, 2) + .set(HyOrderItem::getCancelTime, new Date()) + .eq(HyOrderItem::getId, orderItem.getId())) > 0; + + //判断子订单都为已取消,则更新主订单状态为已取消 + if(baseMapper.selectList(Wrappers.lambdaQuery().eq(HyOrderItem::getOrderId, order.getId()).eq(HyOrderItem::getStatus, 7).eq(HyOrderItem::getDelFlag, 1)).size() == baseMapper.selectList(Wrappers.lambdaQuery().eq(HyOrderItem::getOrderId, order.getId()).eq(HyOrderItem::getDelFlag, 1)).size()){ + boolean orderResult1 = orderMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getStatus, 7) + .set(HyOrder::getCloseType, 2) + .set(HyOrder::getCancelTime, new Date()) + .eq(HyOrder::getId, order.getId())) > 0; + } + + //抵扣金退回 + if(order.getDeductionFee().compareTo(BigDecimal.ZERO) > 0){ + TzUser tzUser = tzUserMapper.selectById(orderItem.getUserId()); + // 创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(orderItem.getUserId()); + couponRecord.setOrderId(orderItem.getId()); + couponRecord.setOrderNum(orderItem.getOrderNum()); + couponRecord.setAmount(orderItem.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().add(orderItem.getDeductionFee())); + couponRecord.setType(3); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + // 更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().add(orderItem.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + + if(!orderItemResult){ + throw new ServiceException("更新订单详情状态失败"); + } + if(!orderResult){ + throw new ServiceException("更新主订单状态失败"); + } + }else{ + throw new ServiceException(jsonObject1.getString("msg")); + } + }else { + throw new ServiceException(jsonObject.getString("msg")); + } + + return 1; + } + + private List getRecvDatas(Long totalAmt) { + V3SacsBalanceSeparateRequest.RecvData recvData = new V3SacsBalanceSeparateRequest.RecvData(); + recvData.setRecvMerchantNo(KlkConstant.merchantNo); + recvData.setSeparateValue(String.valueOf(totalAmt)); + return Collections.singletonList(recvData); + } + + /** + * 获取分账指令流水号 + * + * @return + */ + private String getOutSeparateNo() { + return UUID.randomUUID().toString().replace("-", ""); + } + + /** + * 订单调价 + * + * @param bo 订单详情 + * @return 是否成功 + */ + @Override + public Boolean editOrder(HyOrderItemBo bo) { + HyOrderItem orderItem = baseMapper.selectById(bo.getId()); + if (orderItem == null) { + throw new ServiceException("订单不存在"); + } + orderItem.setPrice(bo.getPrice()); + orderItem.setTotal(orderItem.getTotal().add(bo.getTotal())); + orderItem.setPayPrice(orderItem.getPayPrice().add(bo.getTotal())); + + HyOrder order = orderMapper.selectById(orderItem.getOrderId()); + order.setTotal(order.getTotal().add(bo.getTotal())); + order.setPayPrice(order.getPayPrice().add(bo.getTotal())); + + if (orderMapper.updateById(order) <= 0) { + throw new ServiceException("更新订单失败"); + } + if (baseMapper.updateById(orderItem) <= 0) { + throw new ServiceException("更新订单详情失败"); + } + return true; + } + + /** + * 查询租户销量排行榜列表 + * + * @param bo + * @param pageQuery + */ + @Override + public TableDataInfo queryPageListChart(SysTenantBo bo, PageQuery pageQuery) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAs(SysTenant::getTenantId, "tenantId") + .selectAs(SysTenant::getCompanyName, "companyName") + .selectCount(HyOrderItem::getId, "orderNum") + .selectSum(HyOrderItem::getActualTotal, "orderTotal") + .leftJoin(HyOrderItem.class, HyOrderItem::getTenantId, SysTenant::getTenantId) + .groupBy(SysTenant::getTenantId) + .orderByDesc("orderTotal"); + + // 添加查询条件 + if (bo != null) { + Map params = bo.getParams(); + wrapper.eq(HyOrderItem::getDelFlag, 1); + wrapper.ne(HyOrderItem::getPayState, 1); + wrapper.like(StringUtils.isNotBlank(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()); + wrapper.like(StringUtils.isNotBlank(bo.getTenantCode()), SysTenant::getTenantCode, bo.getTenantCode()); + wrapper.like(StringUtils.isNotBlank(bo.getCompanyName()),SysTenant::getCompanyName, bo.getCompanyName()); + wrapper.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderItem::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + } + // 执行分页查询 + Page page = tenantMapper.selectJoinPage(pageQuery.build(), SysTenantVo.class, wrapper); + return TableDataInfo.build(page); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderPaymentServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderPaymentServiceImpl.java new file mode 100644 index 0000000..3414796 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderPaymentServiceImpl.java @@ -0,0 +1,337 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.HyCodeOrder; +import org.dromara.mall.domain.HyOrderPayment; +import org.dromara.mall.domain.TzTenantRecord; +import org.dromara.mall.domain.bo.HyOrderPaymentBo; +import org.dromara.mall.domain.vo.HyOrderPaymenSumVo; +import org.dromara.mall.domain.vo.HyOrderPaymentVo; +import org.dromara.mall.mapper.HyOrderPaymentMapper; +import org.dromara.mall.mapper.TzTenantRecordMapper; +import org.dromara.mall.service.IHyOrderPaymentService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysTenantService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 订单打款Service业务层处理 + * + * @author Maosw + * @date 2024-12-27 + */ +@RequiredArgsConstructor +@Service +public class HyOrderPaymentServiceImpl extends MPJBaseServiceImpl implements IHyOrderPaymentService { + + private final HyOrderPaymentMapper baseMapper; + + private final TzTenantRecordMapper tententRecordMapper; + + private final SysTenantMapper tenantMapper; + + private final ISysTenantService tenantService; + +// private final HyOrderItemMapper orderItemMapper; +// +// private final HyOrderMapper orderMapper; +// +// private final SysUserMapper userMapper; + + /** + * 查询订单打款 + * + * @param id 主键 + * @return 订单打款 + */ + @Override + public HyOrderPaymentVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单打款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单打款分页列表 + */ + @Override + public TableDataInfo queryPageList(HyOrderPaymentBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryMPJWrapper(bo); + lqw.selectAll(HyOrderPayment.class); + lqw.selectAs(SysTenant::getCompanyName,HyOrderPaymentVo::getTenantName); + lqw.leftJoin(SysTenant.class,SysTenant::getTenantId,HyOrderPayment::getTenantId); + lqw.orderByDesc(HyCodeOrder::getCreateTime); + IPage result = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), HyOrderPaymentVo.class, lqw); + return TableDataInfo.build(result); + } + + /** + * 查询订单打款统计信息 + * + * @param bo + */ + @Override + public HyOrderPaymenSumVo querySum(HyOrderPaymentBo bo) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper lqw = buildQueryMPJWrapper(bo) + .selectCount(HyOrderPayment::getId, HyOrderPaymenSumVo::getTotalNum) + .selectSum(HyOrderPayment::getTotal, HyOrderPaymenSumVo::getTotalAmount); + + // 执行查询 + HyOrderPaymenSumVo orderPaymenSum = baseMapper.selectJoinOne(HyOrderPaymenSumVo.class, lqw); + + //待打款数量 + LambdaQueryWrapper lqw1 = new LambdaQueryWrapper<>(); + lqw1.eq(HyOrderPayment::getStatus, 1); + Long dshNum = baseMapper.selectCount(lqw1); + orderPaymenSum.setDshNum(dshNum); + + //已打款数量 + LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); + lqw2.eq(HyOrderPayment::getStatus, 2); + Long ydkNum = baseMapper.selectCount(lqw2); + orderPaymenSum.setYdkNum(ydkNum); + + //审核拒绝数量 + LambdaQueryWrapper lqw3 = new LambdaQueryWrapper<>(); + lqw3.eq(HyOrderPayment::getStatus, 3); + Long sjyNum = baseMapper.selectCount(lqw3); + orderPaymenSum.setSjyNum(sjyNum); + return orderPaymenSum; + } + + /** + * 查询符合条件的订单打款列表 + * + * @param bo 查询条件 + * @return 订单打款列表 + */ + @Override + public List queryList(HyOrderPaymentBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(HyOrderPaymentBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), HyOrderPayment::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getTenantName()), SysTenant::getCompanyName, bo.getTenantName()); + lqw.eq(bo.getCwId() != null, HyOrderPayment::getCwId, bo.getCwId()); + lqw.like(StringUtils.isNotBlank(bo.getCwName()), HyOrderPayment::getCwName, bo.getCwName()); + lqw.eq(bo.getTotal() != null, HyOrderPayment::getTotal, bo.getTotal()); + lqw.eq(bo.getStatus() != null, HyOrderPayment::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentImg()), HyOrderPayment::getPaymentImg, bo.getPaymentImg()); + lqw.eq(StringUtils.isNotBlank(bo.getDepict()), HyOrderPayment::getDepict, bo.getDepict()); + lqw.like(StringUtils.isNotBlank(bo.getPayeeName()), HyOrderPayment::getPayeeName, bo.getPayeeName()); + lqw.eq(StringUtils.isNotBlank(bo.getPayeeBank()), HyOrderPayment::getPayeeBank, bo.getPayeeBank()); + lqw.like(StringUtils.isNotBlank(bo.getPayeeBankNum()), HyOrderPayment::getPayeeBankNum, bo.getPayeeBankNum()); + lqw.eq(bo.getType() != null, HyOrderPayment::getType, bo.getType()); + lqw.like(StringUtils.isNotBlank(bo.getRemark()), HyOrderPayment::getRemark, bo.getRemark()); + lqw.between(params.get("beginPayTime") != null && params.get("endPayTime") != null, + HyOrderPayment::getPayTime ,params.get("beginPayTime"), params.get("endPayTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderPayment::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + private LambdaQueryWrapper buildQueryWrapper(HyOrderPaymentBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), HyOrderPayment::getTenantId, bo.getTenantId()); + lqw.eq(bo.getCwId() != null, HyOrderPayment::getCwId, bo.getCwId()); + lqw.like(StringUtils.isNotBlank(bo.getCwName()), HyOrderPayment::getCwName, bo.getCwName()); + lqw.eq(bo.getTotal() != null, HyOrderPayment::getTotal, bo.getTotal()); + lqw.eq(bo.getStatus() != null, HyOrderPayment::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentImg()), HyOrderPayment::getPaymentImg, bo.getPaymentImg()); + lqw.eq(StringUtils.isNotBlank(bo.getDepict()), HyOrderPayment::getDepict, bo.getDepict()); + lqw.like(StringUtils.isNotBlank(bo.getPayeeName()), HyOrderPayment::getPayeeName, bo.getPayeeName()); + lqw.eq(StringUtils.isNotBlank(bo.getPayeeBank()), HyOrderPayment::getPayeeBank, bo.getPayeeBank()); + lqw.between(params.get("beginPayeeBankNum") != null && params.get("endPayeeBankNum") != null, + HyOrderPayment::getPayeeBankNum ,params.get("beginPayeeBankNum"), params.get("endPayeeBankNum")); + lqw.eq(bo.getPayTime() != null, HyOrderPayment::getPayTime, bo.getPayTime()); + lqw.eq(bo.getType() != null, HyOrderPayment::getType, bo.getType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderPayment::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增订单打款 + * + * @param bo 订单打款 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyOrderPaymentBo bo) { + HyOrderPayment add = MapstructUtils.convert(bo, HyOrderPayment.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改订单打款 + * + * @param bo 订单打款 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyOrderPaymentBo bo) { + HyOrderPayment update = MapstructUtils.convert(bo, HyOrderPayment.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除订单打款信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 租户提现 + * + * @param bo + * @return + */ + @Override + public int withdrawal(HyOrderPaymentBo bo) { + SysTenant tenant = tenantService.getTenantByTenantId(bo.getTenantId()); + if (tenant == null) { + throw new ServiceException("租户不存在"); + } + if (tenant.getBalance().compareTo(bo.getTotal()) < 0) { + throw new ServiceException("余额不足"); + } + //账变后金额 + BigDecimal currentBalance = tenant.getBalance().subtract(bo.getTotal()); + tenant.setBalance(currentBalance); + if (tenantMapper.updateById(tenant) <= 0) { + throw new ServiceException("更新租户余额失败"); + } + + bo.setCurrentBalance(currentBalance); + bo.setTenantId(tenant.getTenantId()); + bo.setType(1); + bo.setDepict("租户提现"); + bo.setCreateTime(new Date()); + if (!insertByBo(bo)) { + throw new ServiceException("创建提现申请失败"); + } + + TzTenantRecord record = new TzTenantRecord(); + record.setTenantId(tenant.getTenantId()); + record.setTenantName(tenant.getCompanyName()); + record.setAmount(bo.getTotal()); + record.setBalance(currentBalance); + record.setType(3); + record.setAmountType(1); + record.setCreateTime(new Date()); + record.setRemark("提现申请"); + if (tententRecordMapper.insert(record) <= 0) { + throw new ServiceException("创建资金记录失败"); + } + return 1; + } + + /** + * 订单打款 + * + * @param bo + * @return + */ + @Override + public int mark(HyOrderPaymentBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + HyOrderPayment payment = baseMapper.selectById(bo.getId()); + if (payment == null) { + throw new ServiceException("打款记录不存在"); + } + if (payment.getStatus() == 2) { + throw new ServiceException("该订单已经打款"); + } + payment.setCwId(loginUser.getUserId()); + payment.setCwName(loginUser.getNickname()); + payment.setStatus(2); + payment.setPaymentImg(bo.getPaymentImg()); + payment.setPayTime(new Date()); + return baseMapper.updateById(payment); + } + + /** + * 审核拒绝 + * + * @param bo + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int refuse(HyOrderPaymentBo bo) { + HyOrderPayment payment = baseMapper.selectById(bo.getId()); + + SysTenant tenant = tenantService.getTenantByTenantId(payment.getTenantId()); + if (tenant == null) { + throw new ServiceException("租户不存在"); + } + + //账变后金额 + BigDecimal currentBalance = tenant.getBalance().add(payment.getTotal()); + tenant.setBalance(currentBalance); + if (tenantMapper.updateById(tenant) <= 0) { + throw new ServiceException("更新租户余额失败"); + } + + + payment.setStatus(3); + payment.setRemark(bo.getRemark()); + if (baseMapper.updateById(payment) <= 0) { + throw new ServiceException("更新打款记录失败"); + } + + TzTenantRecord record = new TzTenantRecord(); + record.setTenantId(tenant.getTenantId()); + record.setTenantName(tenant.getCompanyName()); + record.setAmount(payment.getTotal()); + record.setBalance(currentBalance); + record.setType(1); + record.setAmountType(1); + record.setCreateTime(new Date()); + record.setRemark("提现审核拒绝退回"); + if (tententRecordMapper.insert(record) <= 0) { + throw new ServiceException("创建资金记录失败"); + } + return 1; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderServiceImpl.java new file mode 100644 index 0000000..141abef --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyOrderServiceImpl.java @@ -0,0 +1,590 @@ +package org.dromara.mall.service.impl; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaOrderUtils; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils; +import com.lkl.laop.sdk.request.V3LabsRelationRefundRequest; +import com.lkl.laop.sdk.request.V3SacsBalanceSeparateRequest; +import com.lkl.laop.sdk.request.model.V3LabsTradeLocationInfo; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.HyOrderBo; +import org.dromara.mall.domain.vo.HyOrderSumVo; +import org.dromara.mall.domain.vo.HyOrderVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.IHyOrderService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysTenantService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 总订单Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyOrderServiceImpl extends MPJBaseServiceImpl implements IHyOrderService { + + private final HyOrderMapper baseMapper; + + private final TzProdMapper tzProdMapper; + + private final HyOrderItemMapper orderItemMapper; + + private final SysTenantMapper tenantMapper; + + private final ISysTenantService tenantService; + + private final TzTenantRecordMapper tenantRecordMapper; + + private final TzUserMapper tzUserMapper; + + private final HyCouponRecordMapper couponRecordMapper; + + /** + * 查询总订单 + * + * @param id 主键 + * @return 总订单 + */ + @Override + public HyOrderVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询总订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 总订单分页列表 + */ + @Override + public TableDataInfo queryPageList(HyOrderBo bo, PageQuery pageQuery) { + MPJLambdaWrapper wrapper = buildMPJLambdaWrapper(bo) + .selectAll(HyOrder.class) + .selectAs(TzUser::getUserMobile, HyOrderVo::getUserPhone) + .leftJoin(TzUser.class, TzUser::getUserId, HyOrder::getUserId) + .orderByDesc(HyOrder::getCreateTime); + + Page result = baseMapper.selectJoinPage(pageQuery.build(), HyOrderVo.class, wrapper); + return TableDataInfo.build(result); + } + + /** + * 查询总订单统计信息 + * + * @param bo + * @return + */ + @Override + public HyOrderSumVo querySum(HyOrderBo bo) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = buildMPJLambdaWrapper(bo) + .selectCount(HyOrder::getId, HyOrderSumVo::getTotalOrderNum) + .selectSum(HyOrder::getNum, HyOrderSumVo::getTotalOrderNum) + .selectSum(HyOrder::getTotal, HyOrderSumVo::getTotalOrderPrice) + .selectSum(HyOrder::getDeductionFee, HyOrderSumVo::getTotalDeductionPrice) + .selectSum(HyOrder::getPayPrice, HyOrderSumVo::getTotalPayPrice) + .selectSum(HyOrder::getActualTotal, HyOrderSumVo::getTotalCostPrice); + + // 执行查询 + return baseMapper.selectJoinOne(HyOrderSumVo.class, wrapper); + } + + /** + * 查询符合条件的总订单列表 + * + * @param bo 查询条件 + * @return 总订单列表 + */ + @Override + public List queryList(HyOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + /** + * app端查询订单列表 + * + * @param bo + * @param pageQuery + * @return + */ + @Override + public IPage queryPageListApp(HyOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(HyOrder::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + + } + + private MPJLambdaWrapper buildMPJLambdaWrapper(HyOrderBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNum()), HyOrder::getOrderNum, bo.getOrderNum()); + lqw.eq(bo.getSaleId() != null, HyOrder::getSaleId, bo.getSaleId()); + lqw.eq(bo.getBuyerId() != null, HyOrder::getBuyerId, bo.getBuyerId()); + lqw.eq(bo.getUserId() != null, HyOrder::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), HyOrder::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getUserPhone()), TzUser::getUserMobile, bo.getUserPhone()); + lqw.eq(bo.getNum() != null, HyOrder::getNum, bo.getNum()); + lqw.eq(bo.getTotal() != null, HyOrder::getTotal, bo.getTotal()); + lqw.eq(bo.getActualTotal() != null, HyOrder::getActualTotal, bo.getActualTotal()); + lqw.eq(bo.getPayPrice() != null, HyOrder::getPayPrice, bo.getPayPrice()); + lqw.eq(bo.getPayState() != null, HyOrder::getPayState, bo.getPayState()); + lqw.like(StringUtils.isNotBlank(bo.getRemarks()), HyOrder::getRemarks, bo.getRemarks()); + lqw.eq(bo.getStatus() != null, HyOrder::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, HyOrder::getDelFlag, bo.getDelFlag()); + lqw.like(StringUtils.isNotBlank(bo.getClientName()), HyOrder::getClientName, bo.getClientName()); + lqw.eq(StringUtils.isNotBlank(bo.getClientPhone()), HyOrder::getClientPhone, bo.getClientPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getClientAddress()), HyOrder::getClientAddress, bo.getClientAddress()); + lqw.between(params.get("beginDvyTime") != null && params.get("endDvyTime") != null, + HyOrder::getDvyTime ,params.get("beginDvyTime"), params.get("endDvyTime")); + lqw.between(params.get("beginFinallyTime") != null && params.get("endFinallyTime") != null, + HyOrder::getFinallyTime ,params.get("beginFinallyTime"), params.get("endFinallyTime")); + lqw.between(params.get("beginCancelTime") != null && params.get("endCancelTime") != null, + HyOrder::getCancelTime ,params.get("beginCancelTime"), params.get("endCancelTime")); + lqw.eq(bo.getRefundSts() != null, HyOrder::getRefundSts, bo.getRefundSts()); + lqw.eq(bo.getCloseType() != null, HyOrder::getCloseType, bo.getCloseType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrder::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + private LambdaQueryWrapper buildQueryWrapper(HyOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNum()), HyOrder::getOrderNum, bo.getOrderNum()); + lqw.eq(bo.getSaleId() != null, HyOrder::getSaleId, bo.getSaleId()); + lqw.eq(bo.getBuyerId() != null, HyOrder::getBuyerId, bo.getBuyerId()); + lqw.eq(bo.getUserId() != null, HyOrder::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), HyOrder::getUserName, bo.getUserName()); + lqw.eq(bo.getNum() != null, HyOrder::getNum, bo.getNum()); + lqw.eq(bo.getTotal() != null, HyOrder::getTotal, bo.getTotal()); + lqw.eq(bo.getActualTotal() != null, HyOrder::getActualTotal, bo.getActualTotal()); + lqw.eq(bo.getPayPrice() != null, HyOrder::getPayPrice, bo.getPayPrice()); + lqw.eq(bo.getPayState() != null, HyOrder::getPayState, bo.getPayState()); + lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), HyOrder::getRemarks, bo.getRemarks()); + lqw.eq(bo.getStatus() != null, HyOrder::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, HyOrder::getDelFlag, bo.getDelFlag()); + lqw.like(StringUtils.isNotBlank(bo.getClientName()), HyOrder::getClientName, bo.getClientName()); + lqw.eq(StringUtils.isNotBlank(bo.getClientPhone()), HyOrder::getClientPhone, bo.getClientPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getClientAddress()), HyOrder::getClientAddress, bo.getClientAddress()); + lqw.between(params.get("beginDvyTime") != null && params.get("endDvyTime") != null, + HyOrder::getDvyTime ,params.get("beginDvyTime"), params.get("endDvyTime")); + lqw.between(params.get("beginFinallyTime") != null && params.get("endFinallyTime") != null, + HyOrder::getFinallyTime ,params.get("beginFinallyTime"), params.get("endFinallyTime")); + lqw.between(params.get("beginCancelTime") != null && params.get("endCancelTime") != null, + HyOrder::getCancelTime ,params.get("beginCancelTime"), params.get("endCancelTime")); + lqw.eq(bo.getRefundSts() != null, HyOrder::getRefundSts, bo.getRefundSts()); + lqw.eq(bo.getCloseType() != null, HyOrder::getCloseType, bo.getCloseType()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrder::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增总订单 + * + * @param bo 总订单 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyOrderBo bo) { + HyOrder add = MapstructUtils.convert(bo, HyOrder.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改总订单 + * + * @param bo 总订单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyOrderBo bo) { + HyOrder update = MapstructUtils.convert(bo, HyOrder.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除总订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 根据订单号查询订单 + * + * @param orderNo + * @param payOrderNo + * @return + */ + @Override + public HyOrder queryByOrderNo(String orderNo, String payOrderNo) { + return baseMapper.selectOne(Wrappers.lambdaQuery().eq(HyOrder::getOrderNum, orderNo).eq(HyOrder::getPayOrderNo, payOrderNo)); + } + + /** + * 根据订单号查询订单 + * + * @param hyOrder@return + */ + @Override + public int updateById1(HyOrder hyOrder) { + return baseMapper.updateById(hyOrder); + } + + /** + * 订单支付回调 + * + * @param orderId + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean callbackOrder(Long orderId, String tradeNo, String logNo) { + //1.修改总订单状态 + HyOrder order = baseMapper.selectById(orderId); + if (order == null) { + throw new ServiceException("订单不存在"); + } + order.setPayState(3); + order.setStatus(2); + order.setPayTime(new Date()); + order.setTradeNo(tradeNo); + order.setLogNo(logNo); + if (baseMapper.updateById(order) <= 0) { + throw new ServiceException("更新订单状态失败"); + } + + //2.修改订单详情状态 + List orderItems = orderItemMapper.selectList(Wrappers.lambdaQuery().eq(HyOrderItem::getOrderId, orderId).eq(HyOrderItem::getStatus, 1).eq(HyOrderItem::getDelFlag, 1)); + orderItems.forEach(item -> { + item.setStatus(2); + item.setPayState(3); + item.setPayTime(new Date()); + if (orderItemMapper.updateById(item) <= 0) { + throw new ServiceException("更新订单详情状态失败"); + } + }); + + //3.给每个租户增加冻结余额和资金记录 + orderItems.forEach(item -> { + SysTenant tenant = tenantService.queryByCode(item.getTenantId()); + if (tenant == null) { + throw new ServiceException("租户不存在"); + } + tenant.setBlockedBalance(tenant.getBlockedBalance().add(item.getActualTotal())); + if (tenantMapper.updateById(tenant) <= 0){ + throw new ServiceException("更新租户余额失败"); + } + + TzTenantRecord record = new TzTenantRecord(); + record.setTenantId(tenant.getTenantId()); + record.setTenantName(tenant.getCompanyName()); + record.setOrderId(order.getId()); + record.setOrderItemId(item.getId()); + record.setAmount(item.getActualTotal()); + record.setBalance(tenant.getBlockedBalance()); + record.setType(1); + record.setAmountType(2); + record.setCreateTime(new Date()); + if (tenantRecordMapper.insert(record) <= 0){ + throw new ServiceException("创建资金记录失败"); + } + }); + return true; + } + + /** + * 取消订单 + * + * @param orderId + * @param userId + * @return + */ + @Override + public Boolean cancelById(Long orderId, Long userId) { + HyOrder order = baseMapper.selectById(orderId); + if (order == null) { + throw new ServiceException("订单不存在"); + } + + if (order.getStatus() != 1) { + throw new ServiceException("订单状态不可取消"); + } + + // 更新主订单状态为已取消 + boolean orderResult = baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getStatus, 7) + .set(HyOrder::getCloseType, 4) + .set(HyOrder::getCancelTime, new Date()) + .eq(HyOrder::getId, orderId) + .eq(HyOrder::getUserId, userId)) > 0; + + // 更新订单详情状态为已取消 + boolean orderItemResult = orderItemMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getStatus, 7) + .set(HyOrderItem::getCloseType, 4) + .set(HyOrderItem::getCancelTime, new Date()) + .eq(HyOrderItem::getOrderId, orderId) + .eq(HyOrderItem::getUserId, userId)) > 0; + + //抵扣金退回 + if(order.getDeductionFee().compareTo(BigDecimal.ZERO) > 0){ + TzUser tzUser = tzUserMapper.selectById(order.getUserId()); + // 创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(order.getUserId()); + couponRecord.setOrderId(order.getId()); + couponRecord.setOrderNum(order.getOrderNum()); + couponRecord.setAmount(order.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().add(order.getDeductionFee())); + couponRecord.setType(3); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + // 更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().add(order.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + + if(!orderItemResult){ + throw new ServiceException("更新订单详情状态失败"); + } + if(!orderResult){ + throw new ServiceException("更新主订单状态失败"); + } + return true; + } + + /** + * 逻辑删除订单 + * + * @param orderId + * @param userId + * @return + */ + @Override + public Boolean logicDeleteByIds(Long orderId, Long userId) { + HyOrder order = baseMapper.selectById(orderId); + if (order == null) { + throw new ServiceException("订单不存在"); + } + if (order.getStatus() == 1) { + throw new ServiceException("先取消订单再删除"); + } + if (order.getStatus() == 2 || order.getStatus() == 3 || order.getStatus() == 4) { + throw new ServiceException("该订单状态不可删除"); + } + + // 逻辑删除订单 + if (baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getDelFlag, 2) + .eq(HyOrder::getId, orderId) + .eq(HyOrder::getUserId, userId)) <= 0) { + throw new ServiceException("删除订单失败"); + } + + // 逻辑删除订单详情 + if (orderItemMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getDelFlag, 2) + .eq(HyOrderItem::getOrderId, orderId) + .eq(HyOrderItem::getUserId, userId)) <= 0) { + throw new ServiceException("删除订单详情失败"); + } + return true; + } + + /** + * 订单退款 + * + * @param bo + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int refund(HyOrderBo bo) throws Exception { + HyOrder order = baseMapper.selectById(bo.getId()); + if (order == null) { + throw new ServiceException("订单不存在"); + } + + if (order.getPayState() == 1) { + throw new ServiceException("已付款的订单才可以申请退款"); + } + + Long payPrice = order.getPayPrice().multiply(new BigDecimal(100)).longValue(); + + V3SacsBalanceSeparateRequest separateRequest = new V3SacsBalanceSeparateRequest(); + separateRequest.setMerchantNo(KlkConstant.merchantNo); + separateRequest.setOutSeparateNo(getOutSeparateNo()); + separateRequest.setTotalAmt(String.valueOf(payPrice)); + separateRequest.setRecvDatas(getRecvDatas(payPrice)); + separateRequest.setNotifyUrl(KlkConstant.WITHDRAWAL); + JSONObject jsonObject = V3LakalaUserUtils.withdraw(separateRequest); + if ("SACS0000".equals(jsonObject.getString("code"))) { + V3LabsRelationRefundRequest v3LabsRelationRefundRequest = new V3LabsRelationRefundRequest(); + v3LabsRelationRefundRequest.setMerchantNo(KlkConstant.merchantNo); + v3LabsRelationRefundRequest.setTermNo(KlkConstant.TERM_NO); + v3LabsRelationRefundRequest.setOutTradeNo(getOutSeparateNo()); + v3LabsRelationRefundRequest.setRefundAmount(payPrice.toString()); + v3LabsRelationRefundRequest.setOriginTradeNo(order.getTradeNo()); + v3LabsRelationRefundRequest.setOriginLogNo(order.getLogNo()); + v3LabsRelationRefundRequest.setRefundReason("买家申请退款"); + + V3LabsTradeLocationInfo v3LabsTradeLocationInfo = new V3LabsTradeLocationInfo("124.223.107.31", null, null); + v3LabsRelationRefundRequest.setLocationInfo(v3LabsTradeLocationInfo); + + JSONObject jsonObject1 = V3LakalaOrderUtils.relationRefund(v3LabsRelationRefundRequest); + if ("BBS00000".equals(jsonObject1.getString("code"))) { + // 更新主订单状态为已取消 + boolean orderResult = baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrder::getStatus, 7) + .set(HyOrder::getCloseType, 2) + .set(HyOrder::getCancelTime, new Date()) + .eq(HyOrder::getId, order.getId())) > 0; + + // 更新订单详情状态为已取消 + boolean orderItemResult = orderItemMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getStatus, 7) + .set(HyOrderItem::getCloseType, 2) + .set(HyOrderItem::getCancelTime, new Date()) + .eq(HyOrderItem::getOrderId, order.getId())) > 0; + + //抵扣金退回 + if(order.getDeductionFee().compareTo(BigDecimal.ZERO) > 0){ + TzUser tzUser = tzUserMapper.selectById(order.getUserId()); + // 创建优惠券抵金记录 + HyCouponRecord couponRecord = new HyCouponRecord(); + couponRecord.setUserId(order.getUserId()); + couponRecord.setOrderId(order.getId()); + couponRecord.setOrderNum(order.getOrderNum()); + couponRecord.setAmount(order.getDeductionFee()); + couponRecord.setBalance(tzUser.getDeductionFee().add(order.getDeductionFee())); + couponRecord.setType(3); + couponRecord.setCreateTime(new Date()); + if(couponRecordMapper.insert(couponRecord) <= 0){ + throw new ServiceException("创建抵扣券记录失败"); + } + // 更新用户抵扣券余额 + tzUser.setDeductionFee(tzUser.getDeductionFee().add(order.getDeductionFee())); + if(tzUserMapper.updateById(tzUser) <= 0){ + throw new ServiceException("更新用户抵扣券余额失败"); + } + } + + if(!orderItemResult){ + throw new ServiceException("更新订单详情状态失败"); + } + if(!orderResult){ + throw new ServiceException("更新主订单状态失败"); + } + }else{ + throw new ServiceException(jsonObject1.getString("msg")); + } + }else { + throw new ServiceException(jsonObject.getString("msg")); + } + return 1; + } + + /** + * 修改订单地址 + * + * @param bo + * @return + */ + @Override + public boolean editOrderAddr(HyOrderBo bo) { + HyOrder order = MapstructUtils.convert(bo, HyOrder.class); + // 修改订单详情 + if (orderItemMapper.update(null, + Wrappers.lambdaUpdate() + .set(HyOrderItem::getClientName, order.getClientName()) + .set(HyOrderItem::getClientPhone, order.getClientPhone()) + .set(HyOrderItem::getClientAddress, order.getClientAddress()) + .eq(HyOrderItem::getOrderId, order.getId())) <= 0) { + throw new ServiceException("修改订单详情失败"); + } + return baseMapper.updateById(order) > 0; + } + + private List getRecvDatas(Long totalAmt) { + V3SacsBalanceSeparateRequest.RecvData recvData = new V3SacsBalanceSeparateRequest.RecvData(); + recvData.setRecvMerchantNo(KlkConstant.merchantNo); + recvData.setSeparateValue(String.valueOf(totalAmt)); + return Collections.singletonList(recvData); + } + + /** + * 获取分账指令流水号 + * + * @return + */ + private String getOutSeparateNo() { + return UUID.randomUUID().toString().replace("-", ""); + } + + /** + * 获取总订单待付款的数量 + * + * @param userId + * @return + */ + @Override + public Long countByStatus(Long userId) { + return baseMapper.selectCount(Wrappers.lambdaQuery().eq(HyOrder::getUserId, userId).eq(HyOrder::getStatus, 1).eq(HyOrder::getDelFlag, 1)); + } + + public static String genItemId() { + //取当前时间的长整形值包含毫秒 + long millis = System.currentTimeMillis(); + //加上两位随机数 + Random random = new Random(); + int end2 = random.nextInt(99); + //如果不足两位前面补0 + return "DD" + millis + String.format("%02d", end2); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterRecordServiceImpl.java new file mode 100644 index 0000000..843cfce --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterRecordServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyPromoterRecord; +import org.dromara.mall.domain.bo.HyPromoterRecordBo; +import org.dromara.mall.domain.vo.HyPromoterRecordVo; +import org.dromara.mall.mapper.HyPromoterRecordMapper; +import org.dromara.mall.service.IHyPromoterRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 推广员资金记录Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyPromoterRecordServiceImpl implements IHyPromoterRecordService { + + private final HyPromoterRecordMapper baseMapper; + + /** + * 查询推广员资金记录 + * + * @param id 主键 + * @return 推广员资金记录 + */ + @Override + public HyPromoterRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询推广员资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 推广员资金记录分页列表 + */ + @Override + public TableDataInfo queryPageList(HyPromoterRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的推广员资金记录列表 + * + * @param bo 查询条件 + * @return 推广员资金记录列表 + */ + @Override + public List queryList(HyPromoterRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HyPromoterRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(HyPromoterRecord::getId); + lqw.eq(bo.getPromoterId() != null, HyPromoterRecord::getPromoterId, bo.getPromoterId()); + lqw.eq(bo.getAmount() != null, HyPromoterRecord::getAmount, bo.getAmount()); + lqw.eq(bo.getBalance() != null, HyPromoterRecord::getBalance, bo.getBalance()); + lqw.eq(bo.getType() != null, HyPromoterRecord::getType, bo.getType()); + lqw.eq(bo.getOrderId() != null, HyPromoterRecord::getOrderId, bo.getOrderId()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyPromoterRecord::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增推广员资金记录 + * + * @param bo 推广员资金记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyPromoterRecordBo bo) { + HyPromoterRecord add = MapstructUtils.convert(bo, HyPromoterRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改推广员资金记录 + * + * @param bo 推广员资金记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyPromoterRecordBo bo) { + HyPromoterRecord update = MapstructUtils.convert(bo, HyPromoterRecord.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除推广员资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage queryPageListAPP(HyPromoterRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(HyPromoterRecord::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterServiceImpl.java new file mode 100644 index 0000000..06ecdf4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyPromoterServiceImpl.java @@ -0,0 +1,295 @@ +package org.dromara.mall.service.impl; + +import cn.dev33.satoken.secure.BCrypt; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyCodeOrder; +import org.dromara.mall.domain.HyPromoter; +import org.dromara.mall.domain.bo.HyPromoterBo; +import org.dromara.mall.domain.vo.HyPromoterSumVo; +import org.dromara.mall.domain.vo.HyPromoterVo; +import org.dromara.mall.mapper.HyPromoterMapper; +import org.dromara.mall.service.IHyPromoterService; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * 推广员Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyPromoterServiceImpl extends MPJBaseServiceImpl implements IHyPromoterService { + + private final HyPromoterMapper baseMapper; + + /** + * 查询推广员 + * + * @param id 主键 + * @return 推广员 + */ + @Override + public HyPromoterVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询推广员列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 推广员分页列表 + */ + @Override + public TableDataInfo queryPageList(HyPromoterBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询推广员统计信息 + * + * @param bo + * @return + */ + @Override + public HyPromoterSumVo querySum(HyPromoterBo bo) { + HyPromoterSumVo sumVo = new HyPromoterSumVo(); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + // 总人数 + sumVo.setTotalNum(baseMapper.selectCount(lqw)); + + //推广总人数 + Long promoterNum = baseMapper.selectList(lqw).stream().map(HyPromoter::getNum).reduce(0L, Long::sum); + sumVo.setPromoterNum(promoterNum); + return sumVo; + } + + /** + * 查询渠道下单排行榜列表 + * + * @param bo + * @param pageQuery + * @return + */ + @Override + public TableDataInfo queryPageListChart(HyPromoterBo bo, PageQuery pageQuery) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAs(HyPromoter::getId, "id") + .selectAs(HyPromoter::getName, "name") + .selectSum(HyCodeOrder::getNum, "orderNum") + .selectSum(HyCodeOrder::getOrderAmount, "orderTotal") + .leftJoin(HyCodeOrder.class, HyCodeOrder::getPromoterId, HyPromoter::getId) + .groupBy(HyPromoter::getId) + .orderByDesc("orderTotal"); + + // 添加查询条件 + if (bo != null) { + Map params = bo.getParams(); + wrapper.eq(HyCodeOrder::getDelFlag, 1); + wrapper.eq(HyCodeOrder::getType, 2); + wrapper.ne(HyCodeOrder::getOrderStatus, 3); + wrapper.like(StringUtils.isNotBlank(bo.getName()), HyPromoter::getName, bo.getName()); + wrapper.like(StringUtils.isNotBlank(bo.getCode()), HyPromoter::getCode, bo.getCode()); + wrapper.like(StringUtils.isNotBlank(bo.getPhone()), HyPromoter::getPhone, bo.getPhone()); + wrapper.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyCodeOrder::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + } + // 执行分页查询 + Page page = baseMapper.selectJoinPage(pageQuery.build(), HyPromoterVo.class, wrapper); + return TableDataInfo.build(page); + } + + /** + * 查询符合条件的推广员列表 + * + * @param bo 查询条件 + * @return 推广员列表 + */ + @Override + public List queryList(HyPromoterBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HyPromoterBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(HyPromoter::getId); + lqw.like(StringUtils.isNotBlank(bo.getName()), HyPromoter::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), HyPromoter::getCode, bo.getCode()); + lqw.eq(StringUtils.isNotBlank(bo.getPhone()), HyPromoter::getPhone, bo.getPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getPassword()), HyPromoter::getPassword, bo.getPassword()); + lqw.eq(bo.getNum() != null, HyPromoter::getNum, bo.getNum()); + lqw.eq(bo.getTypeFlag() != null, HyPromoter::getTypeFlag, bo.getTypeFlag()); + lqw.eq(bo.getParentId() != null, HyPromoter::getParentId, bo.getParentId()); + lqw.eq(bo.getBalance() != null, HyPromoter::getBalance, bo.getBalance()); + lqw.eq(bo.getStatus() != null, HyPromoter::getStatus, bo.getStatus()); + lqw.like(StringUtils.isNotBlank(bo.getRemark()), HyPromoter::getRemark, bo.getRemark()); + lqw.eq(bo.getDelFlag() != null, HyPromoter::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyPromoter::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增推广员 + * + * @param bo 推广员 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyPromoterBo bo) { + HyPromoter add = MapstructUtils.convert(bo, HyPromoter.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改推广员 + * + * @param bo 推广员 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyPromoterBo bo) { + HyPromoter update = MapstructUtils.convert(bo, HyPromoter.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除推广员信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public Boolean register(HyPromoterBo bo) { + HyPromoter promoter = new HyPromoter(); + promoter.setName(bo.getName()); + String code; + do { + // 生成8位随机数字 + code = "TG" + String.format("%08d", new Random().nextInt(100000000)); + // 检查编号是否已存在 + } while (baseMapper.exists(new LambdaQueryWrapper() + .eq(HyPromoter::getCode, code) + .eq(HyPromoter::getDelFlag, 1))); + + promoter.setCode(code); + promoter.setPassword(BCrypt.hashpw(bo.getPassword(), BCrypt.gensalt())); + promoter.setPhone(bo.getPhone()); + promoter.setTypeFlag(2); + promoter.setCreateTime(new Date()); + return baseMapper.insert(promoter) > 0; + } + + @Override + public HyPromoter login(String phone, String password) { + HyPromoter promoter = baseMapper.selectOne( + new LambdaQueryWrapper() + .eq(HyPromoter::getPhone, phone) + .eq(HyPromoter::getDelFlag, 1)); + if (promoter == null) { + throw new ServiceException("账号不存在"); + } + if (promoter.getStatus() != 1) { + throw new ServiceException("账号已被停用"); + } + boolean isPasswordCorrect = BCrypt.checkpw(password, promoter.getPassword()); + if (!isPasswordCorrect) { + throw new ServiceException("密码错误"); + } + return promoter; + } + + @Override + public Boolean checkPhoneUnique(String phone) { + return baseMapper.exists(new LambdaQueryWrapper() + .eq(HyPromoter::getPhone, phone) + .eq(HyPromoter::getDelFlag, 1)); + } + + @Override + public Boolean submitAuth(HyPromoterBo bo) { + // 检查是否已提交过认证 + HyPromoter promoter = baseMapper.selectById(bo.getId()); + if (promoter == null) { + throw new ServiceException("推广员不存在"); + } + if (promoter.getExamineFlag() == 2 || promoter.getExamineFlag() == 3) { + throw new ServiceException("已提交过认证申请"); + } + HyPromoter update = MapstructUtils.convert(bo, HyPromoter.class); + update.setExamineFlag(2); + return baseMapper.updateById(update) > 0; + } + + /** + * 重置推广员密码 + * + * @param phone + * @param oldPassword + * @param newPassword + * @return + */ + @Override + public Boolean resetPassword(String phone, String oldPassword, String newPassword) { + HyPromoter promoter = baseMapper.selectOne( + new LambdaQueryWrapper() + .eq(HyPromoter::getPhone, phone) + .eq(HyPromoter::getDelFlag, 1)); + if (promoter == null) { + throw new ServiceException("账号不存在"); + } + if (promoter.getStatus() != 1) { + throw new ServiceException("账号已被停用"); + } + boolean isPasswordCorrect = BCrypt.checkpw(oldPassword, promoter.getPassword()); + if (!isPasswordCorrect) { + throw new ServiceException("旧密码密码错误"); + } + promoter.setPassword(BCrypt.hashpw(newPassword, BCrypt.gensalt())); + return baseMapper.updateById(promoter) > 0; + } + + /** + * 后台重置密码 + * + * @param bo + * @return + */ + @Override + public Boolean resetPasswordAdmin(HyPromoterBo bo) { + HyPromoter promoter = baseMapper.selectById(bo.getId()); + if (promoter == null) { + throw new ServiceException("推广员不存在"); + } + promoter.setPassword(BCrypt.hashpw(bo.getPassword(), BCrypt.gensalt())); + return baseMapper.updateById(promoter) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyUserRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyUserRecordServiceImpl.java new file mode 100644 index 0000000..9d31df6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/HyUserRecordServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyUserRecord; +import org.dromara.mall.domain.bo.HyUserRecordBo; +import org.dromara.mall.domain.vo.HyUserRecordVo; +import org.dromara.mall.mapper.HyUserRecordMapper; +import org.dromara.mall.service.IHyUserRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 用户资金记录Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class HyUserRecordServiceImpl implements IHyUserRecordService { + + private final HyUserRecordMapper baseMapper; + + /** + * 查询用户资金记录 + * + * @param id 主键 + * @return 用户资金记录 + */ + @Override + public HyUserRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询用户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户资金记录分页列表 + */ + @Override + public TableDataInfo queryPageList(HyUserRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(HyUserRecord::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户资金记录列表 + * + * @param bo 查询条件 + * @return 用户资金记录列表 + */ + @Override + public List queryList(HyUserRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(HyUserRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, HyUserRecord::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), HyUserRecord::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getUserPhone()), HyUserRecord::getUserPhone, bo.getUserPhone()); + lqw.eq(bo.getAmount() != null, HyUserRecord::getAmount, bo.getAmount()); + lqw.eq(bo.getBalance() != null, HyUserRecord::getBalance, bo.getBalance()); + lqw.eq(bo.getDelFlag() != null, HyUserRecord::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getType() != null, HyUserRecord::getType, bo.getType()); + lqw.eq(bo.getOrderId() != null, HyUserRecord::getOrderId, bo.getOrderId()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, HyUserRecord::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增用户资金记录 + * + * @param bo 用户资金记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(HyUserRecordBo bo) { + HyUserRecord add = MapstructUtils.convert(bo, HyUserRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户资金记录 + * + * @param bo 用户资金记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(HyUserRecordBo bo) { + HyUserRecord update = MapstructUtils.convert(bo, HyUserRecord.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除用户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage queryPageListAPP(HyUserRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(HyUserRecord::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAgreementServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAgreementServiceImpl.java new file mode 100644 index 0000000..a794307 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAgreementServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzAgreement; +import org.dromara.mall.domain.bo.TzAgreementBo; +import org.dromara.mall.domain.vo.TzAgreementVo; +import org.dromara.mall.mapper.TzAgreementMapper; +import org.dromara.mall.service.ITzAgreementService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 协议Service业务层处理 + * + * @author Maosw + * @date 2024-12-26 + */ +@RequiredArgsConstructor +@Service +public class TzAgreementServiceImpl implements ITzAgreementService { + + private final TzAgreementMapper baseMapper; + + /** + * 查询协议 + * + * @param id 主键 + * @return 协议 + */ + @Override + public TzAgreementVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询协议列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 协议分页列表 + */ + @Override + public TableDataInfo queryPageList(TzAgreementBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的协议列表 + * + * @param bo 查询条件 + * @return 协议列表 + */ + @Override + public List queryList(TzAgreementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzAgreementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TzAgreement::getId); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TzAgreement::getTitle, bo.getTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzAgreement::getContent, bo.getContent()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), TzAgreement::getCode, bo.getCode()); + lqw.eq(bo.getDelFlag() != null, TzAgreement::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzAgreement::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增协议 + * + * @param bo 协议 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzAgreementBo bo) { + TzAgreement add = MapstructUtils.convert(bo, TzAgreement.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改协议 + * + * @param bo 协议 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzAgreementBo bo) { + TzAgreement update = MapstructUtils.convert(bo, TzAgreement.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除协议信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 根据条件查询数据 + * + * @param eq + * @return 查询结果 + */ + @Override + public TzAgreement selectOne(LambdaQueryWrapper eq) { + return baseMapper.selectOne(eq); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAreaServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAreaServiceImpl.java new file mode 100644 index 0000000..11ae1dc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAreaServiceImpl.java @@ -0,0 +1,131 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzAreaBo; +import org.dromara.mall.domain.vo.TzAreaVo; +import org.dromara.mall.domain.TzArea; +import org.dromara.mall.mapper.TzAreaMapper; +import org.dromara.mall.service.ITzAreaService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzAreaServiceImpl implements ITzAreaService { + + private final TzAreaMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param areaId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzAreaVo queryById(Long areaId){ + return baseMapper.selectVoById(areaId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzAreaBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzAreaBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzAreaBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getAreaName()), TzArea::getAreaName, bo.getAreaName()); + lqw.eq(bo.getParentId() != null, TzArea::getParentId, bo.getParentId()); + lqw.eq(bo.getLevel() != null, TzArea::getLevel, bo.getLevel()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzAreaBo bo) { + TzArea add = MapstructUtils.convert(bo, TzArea.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAreaId(add.getAreaId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzAreaBo bo) { + TzArea update = MapstructUtils.convert(bo, TzArea.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzArea entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAttachFileServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAttachFileServiceImpl.java new file mode 100644 index 0000000..60c6ff9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzAttachFileServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzAttachFileBo; +import org.dromara.mall.domain.vo.TzAttachFileVo; +import org.dromara.mall.domain.TzAttachFile; +import org.dromara.mall.mapper.TzAttachFileMapper; +import org.dromara.mall.service.ITzAttachFileService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzAttachFileServiceImpl implements ITzAttachFileService { + + private final TzAttachFileMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param fileId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzAttachFileVo queryById(Long fileId){ + return baseMapper.selectVoById(fileId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzAttachFileBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzAttachFileBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzAttachFileBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getFilePath()), TzAttachFile::getFilePath, bo.getFilePath()); + lqw.eq(StringUtils.isNotBlank(bo.getFileType()), TzAttachFile::getFileType, bo.getFileType()); + lqw.eq(bo.getFileSize() != null, TzAttachFile::getFileSize, bo.getFileSize()); + lqw.eq(bo.getUploadTime() != null, TzAttachFile::getUploadTime, bo.getUploadTime()); + lqw.eq(bo.getFileJoinId() != null, TzAttachFile::getFileJoinId, bo.getFileJoinId()); + lqw.eq(bo.getFileJoinType() != null, TzAttachFile::getFileJoinType, bo.getFileJoinType()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzAttachFileBo bo) { + TzAttachFile add = MapstructUtils.convert(bo, TzAttachFile.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setFileId(add.getFileId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzAttachFileBo bo) { + TzAttachFile update = MapstructUtils.convert(bo, TzAttachFile.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzAttachFile entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBankCardServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBankCardServiceImpl.java new file mode 100644 index 0000000..ac06375 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBankCardServiceImpl.java @@ -0,0 +1,771 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.lakala.zf.laop.java.sdk.demo.BaseCommonDemo; +import com.lakala.zf.laop.java.sdk.demo.bo.AddOrUpdateBankCardReq; +import com.lakala.zf.laop.java.sdk.demo.bo.UpdateBankCardReq; +import com.lakala.zf.laop.java.sdk.demo.bo.UploadFileReq; +import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils; +import com.lkl.laop.sdk.LKLSDK; +import com.lkl.laop.sdk.request.*; +import com.lkl.laop.sdk.utils.CommonUtil; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; +import org.apache.poi.util.Units; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; +import org.apache.poi.xwpf.usermodel.XWPFRun; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.excel.utils.ImageRotator; +import org.dromara.common.excel.utils.PdfUtil; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzBankCard; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.bo.TzBankCardBo; +import org.dromara.mall.domain.vo.TzBankCardVo; +import org.dromara.mall.mapper.TzBankCardMapper; +import org.dromara.mall.mapper.TzUserMapper; +import org.dromara.mall.service.ITzBankCardService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StreamUtils; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 绑定银行卡信息Service业务层处理 + * + * @author Maosw + * @date 2024-12-12 + */ +@RequiredArgsConstructor +@Service +public class TzBankCardServiceImpl extends BaseCommonDemo implements ITzBankCardService { + + private final TzBankCardMapper baseMapper; + + private final TzUserMapper userMapper; + +/* private static String basePath = "D:\\lkl\\createFile\\"; + + private static String urlPrefix = "D:\\lkl\\file\\";*/ + + + private static String basePath = "/home/manage/jcs/createFile/"; + + private static String urlPrefix = "/home/manage/jcs/file/"; + + /** + * 1-身份证正面 2-身份证反面 3-银行卡 4-营业执照 5-合作协议-纸质版 6-合作协议-电子版 + * 获取附件类型 + * + * @param attType + * @return + */ + public String getAttType(String attType) { + switch (attType) { + case "1": + return "FR_ID_CARD_FRONT"; + case "2": + return "FR_ID_CARD_BEHIND"; + case "3": + return "BANK_CARD"; + case "4": + return "BUSINESS_LICENCE"; + case "5": + return "XY"; + case "6": + return "NETWORK_XY"; + default: + return ""; + } + } + + /** + * 查询绑定银行卡信息 + * + * @param id 主键 + * @return 绑定银行卡信息 + */ + @Override + public TzBankCardVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询绑定银行卡信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 绑定银行卡信息分页列表 + */ + @Override + public TableDataInfo queryPageList(TzBankCardBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的绑定银行卡信息列表 + * + * @param bo 查询条件 + * @return 绑定银行卡信息列表 + */ + @Override + public List queryList(TzBankCardBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzBankCardBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TzBankCard::getId); + lqw.eq(bo.getUserId() != null, TzBankCard::getUserId, bo.getUserId()); + lqw.eq(bo.getRoleType() != null, TzBankCard::getRoleType, bo.getRoleType()); + lqw.like(StringUtils.isNotBlank(bo.getCardHolderName()), TzBankCard::getCardHolderName, bo.getCardHolderName()); + lqw.like(StringUtils.isNotBlank(bo.getBankName()), TzBankCard::getBankName, bo.getBankName()); + lqw.like(StringUtils.isNotBlank(bo.getBranchName()), TzBankCard::getBranchName, bo.getBranchName()); + lqw.eq(StringUtils.isNotBlank(bo.getCardNumber()), TzBankCard::getCardNumber, bo.getCardNumber()); + lqw.eq(bo.getCardType() != null, TzBankCard::getCardType, bo.getCardType()); + lqw.eq(bo.getIsDefault() != null, TzBankCard::getIsDefault, bo.getIsDefault()); + lqw.eq(bo.getDelFlag() != null, TzBankCard::getDelFlag, bo.getDelFlag()); + lqw.eq(bo.getStatus() != null, TzBankCard::getStatus, bo.getStatus()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzBankCard::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增绑定银行卡信息 + * + * @param bo 绑定银行卡信息 + * @return 是否新增成功 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(TzBankCardBo bo) { + // 如果设置为默认卡,则将该用户的其他卡设为非默认 + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzBankCard::getIsDefault, 2) + .eq(TzBankCard::getUserId, bo.getUserId()) + .eq(TzBankCard::getDelFlag, 1)); + } + TzBankCard add = MapstructUtils.convert(bo, TzBankCard.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改绑定银行卡信息 + * + * @param bo 绑定银行卡信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzBankCardBo bo) { + // 如果设置为默认卡,则将该用户的其他卡设为非默认 + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzBankCard::getIsDefault, 2) + .eq(TzBankCard::getUserId, bo.getUserId()) + .eq(TzBankCard::getDelFlag, 1)); + } + TzBankCard update = MapstructUtils.convert(bo, TzBankCard.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除绑定银行卡信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 根据拉卡拉接收方编号查询银行卡信息 + * + * @param receiverNo + * @return + */ + @Override + public TzBankCard queryByReceiverNo(String receiverNo) { + return baseMapper.selectOne(new LambdaQueryWrapper().eq(TzBankCard::getReceiverNo, receiverNo)); + } + + /** + * 根据银行卡ID更新银行卡信息 + * + * @param bankCard + * @return + */ + @Override + public Boolean updateById(TzBankCard bankCard) { + return baseMapper.updateById(bankCard) > 0; + } + + @Override + public Boolean logicDeleteByCardId(Long cardId, Long userId) { + return baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzBankCard::getDelFlag, 2) + .eq(TzBankCard::getId, cardId) + .eq(TzBankCard::getUserId, userId)) > 0; + } + + @Override + public List queryListAPP(TzBankCardBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(TzBankCard::getCreateTime); + return baseMapper.selectVoList(lqw); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean setDefaultCard(Long cardId, Long userId, Integer roleType) { + // 1. 先将该用户的所有银行卡设置为非默认 + baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzBankCard::getIsDefault, 2) + .eq(TzBankCard::getUserId, userId) + .eq(TzBankCard::getRoleType, roleType) + .eq(TzBankCard::getDelFlag, 1)); + + // 2. 将指定银行卡设置为默认 + return baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzBankCard::getIsDefault, 1) + .eq(TzBankCard::getId, cardId) + .eq(TzBankCard::getUserId, userId) + .eq(TzBankCard::getRoleType, roleType) + .eq(TzBankCard::getDelFlag, 1)) > 0; + } + + @Override + public Boolean hasBankCard(Long userId, Integer roleType) { + return baseMapper.exists(new LambdaQueryWrapper() + .eq(TzBankCard::getUserId, userId) + .eq(TzBankCard::getRoleType, roleType) + .eq(TzBankCard::getDelFlag, 1)); + } + + /** + * 添加或修改银行卡信息 + * + * @param req 银行卡信息 + * @param userId 用户ID + * @return 是否添加或修改成功 + */ + @Override + public Boolean addOrUpdateBankCard(AddOrUpdateBankCardReq req, Long userId) { + // 根据上传id判断是新增还是修改 + if (req.getId() == null) { + //新增 + return addBankCard(req, userId); + } else { + //修改 + UpdateBankCardReq updateReq = new UpdateBankCardReq(); + BeanUtils.copyProperties(req, updateReq); + return updateBankCard(updateReq, userId, req.getId()); + } + } + + private Boolean addBankCard(AddOrUpdateBankCardReq req, Long userId) { + try { + //1、调用三方接口创建卡拉卡账号 + String account = createAccount(req, userId); + if (account == null) { + throw new ServiceException("添加银行卡失败,失败原因:分账接收方创建申请失败"); + } + //2、调用三方接口绑定分账关系 + if (!bindAccount(account, req, userId)) { + throw new ServiceException("添加银行卡失败,失败原因:分账接收方绑定申请失败"); + } + //3、提款模式设置 + /*if (!setWithdrawalMode(account)) { + throw new ServiceException("添加银行卡失败,失败原因:提款模式设置失败"); + }*/ + return true; + } catch (Exception e) { + throw new ServiceException("添加银行卡失败,失败原因:" + e.getMessage()); + } + } + + private String createAccount(AddOrUpdateBankCardReq req, Long userId) throws Exception { + // 步骤一:分账接收方创建申请 + TzUser user = userMapper.selectById(userId); + if (user == null) { + throw new ServiceException("用户不存在"); + } + doInit(); + String orderNo = CommonUtil.getOrderNo(); + V2MmsApplyLedgerReceiverRequest request = new V2MmsApplyLedgerReceiverRequest(); + request.setVersion(KlkConstant.VERSION); + request.setOrderNo(orderNo); + request.setOrgCode(KlkConstant.ORG_CODE); + request.setReceiverName(req.getAcctName()); + request.setContactMobile(user.getUserMobile()); + request.setAcctNo(req.getAcctNo()); + request.setAcctName(req.getAcctName()); + request.setAcctTypeCode(KlkConstant.ACC_TYPE); + request.setAcctCertificateType(KlkConstant.ACC_CERT_TYPE); + request.setAcctCertificateNo(req.getAcctCertificateNo()); + // 步骤二:调用卡BIN接口查询信息 + Map cardBinMap = getCardBinMap(req.getAcctNo()); + request.setAcctOpenBankCode(cardBinMap.get("acctOpenBankCode")); + request.setAcctOpenBankName(req.getAcctOpenBankName()); + request.setAcctClearBankCode(cardBinMap.get("acctClearBankCode")); + request.setAttachList(getAttachList(req.getAttachList())); + String uploadFileResponse = LKLSDK.httpPost(request); + JSONObject jsonObject = JSON.parseObject(uploadFileResponse); + + if ("000000".equals(jsonObject.getString("retCode"))) { + JSONObject respData = jsonObject.getJSONObject("respData"); + String receiverNo = respData.getString("receiverNo"); + //插入银行卡信息 + TzBankCard bankCard = new TzBankCard(); + bankCard.setUserId(userId); + bankCard.setCardHolderName(req.getAcctName()); + bankCard.setCardNumber(req.getAcctNo()); + bankCard.setBankName(cardBinMap.get("bankName")); + bankCard.setBranchName(req.getAcctOpenBankName()); + bankCard.setIsDefault(1); + bankCard.setCreateTime(new Date()); + bankCard.setRoleType(4); + bankCard.setOrderNo(orderNo); + bankCard.setReceiverNo(receiverNo); + baseMapper.insert(bankCard); + return respData.getString("receiverNo"); + }else{ + throw new RuntimeException(jsonObject.getString("retMsg")); + } + } + + /** + * 修改银行卡信息 + */ + public Boolean updateBankCard(UpdateBankCardReq req, Long userId, Long cardId) { + TzUser userVo = userMapper.selectById(userId); + + TzBankCard bankCard = baseMapper.selectById(cardId); + try { + doInit(); + V2MmsModifyLedgerReceiverRequest request = new V2MmsModifyLedgerReceiverRequest(); + request.setVersion(KlkConstant.VERSION); + request.setOrderNo(CommonUtil.getOrderNo()); + request.setOrgCode(KlkConstant.ORG_CODE); + // 根据用户id查询卡拉卡账号 + request.setReceiverNo(bankCard.getReceiverNo()); + request.setReceiverName(req.getAcctName()); + request.setContactMobile(userVo.getUserMobile()); + request.setAcctNo(req.getAcctNo()); + request.setAcctTypeCode(KlkConstant.ACC_TYPE); + Map cardBinMap = getCardBinMap(req.getAcctNo()); + request.setAcctOpenBankCode(cardBinMap.get("acctOpenBankCode")); + request.setAcctOpenBankName(req.getAcctOpenBankName()); + request.setAcctClearBankCode(cardBinMap.get("acctClearBankCode")); + request.setAttachList(getUpdateAttachList(req.getAttachList())); + String response = LKLSDK.httpPost(request); + JSONObject jsonObject = JSON.parseObject(response); + if ("000000".equals(jsonObject.getString("retCode"))) { + //解析返回参数 + JSONObject respData = jsonObject.getJSONObject("respData"); + bankCard.setBankName(respData.getString("bankName")); + bankCard.setCardNumber(respData.getString("cardNo")); + return baseMapper.updateById(bankCard) > 0; + } else { + throw new RuntimeException(jsonObject.getString("retMsg")); + } + } catch (Exception e) { + throw new ServiceException("修改卡拉卡账号信息出现异常:{}"); + } + } + + /** + * 将前端传递的附件信息转换为三方修改需要的参数 + * + * @param attachList + * @return + */ + private List getUpdateAttachList(List attachList) { + return attachList.stream().map(s -> { + V2MmsModifyLedgerReceiverRequest.AttachInfo attachInfo = new V2MmsModifyLedgerReceiverRequest.AttachInfo(); + attachInfo.setAttachName(s.getAttachName()); + attachInfo.setAttachType(getAttType(s.getAttachType())); + UploadFileReq req = new UploadFileReq(); + req.setAttType(attachInfo.getAttachType()); + req.setAttExtName(getExtName(s.getAttachName())); + req.setAttContext(fileToBase64(s.getAttachStorePath())); + attachInfo.setAttachStorePath(uploadFile(req)); + return attachInfo; + }).collect(Collectors.toList()); + } + + /** + * 根据卡号查询卡BIN信息 + * + * @param acctNo + * @return + */ + public Map getCardBinMap(String acctNo) throws Exception { + doInit(); + V2MmsOpenApiCardBin cardBin = new V2MmsOpenApiCardBin(); + cardBin.setVersion(KlkConstant.VERSION); + cardBin.setOrderNo(CommonUtil.getOrderNo()); + cardBin.setOrgCode(KlkConstant.ORG_CODE); + cardBin.setCardNo(acctNo); + String cardBinResponse = LKLSDK.httpPost(cardBin); + JSONObject jsonObject = JSON.parseObject(cardBinResponse); + if ("000000".equals(jsonObject.getString("retCode"))) { + JSONObject respData = jsonObject.getJSONObject("respData"); + Map cardBinMap = new HashMap<>(); + cardBinMap.put("acctOpenBankCode", respData.getString("bankCode")); + cardBinMap.put("acctClearBankCode", respData.getString("clearingBankCode")); + cardBinMap.put("bankName", respData.getString("bankName")); + return cardBinMap; + } + throw new RuntimeException(); + } + + /** + * 分账关系绑定申请 + * + * @param account + * @param req + */ + private Boolean bindAccount(String account, AddOrUpdateBankCardReq req, Long userId) throws Exception { + doInit(); + V2MmsLedgerApplyBindRequest request = new V2MmsLedgerApplyBindRequest(); + request.setVersion(KlkConstant.VERSION); + request.setOrderNo(CommonUtil.getOrderNo()); + request.setOrgCode(KlkConstant.ORG_CODE); + request.setMerCupNo(KlkConstant.merchantNo); + request.setReceiverNo(account); + // 获取合作协议对象 + AddOrUpdateBankCardReq.Attach attach = getAgreement(userId, req); + request.setEntrustFileName(attach.getAttachName()); + request.setEntrustFilePath(attach.getAttachStorePath()); + request.setRetUrl(KlkConstant.BIND_ACC_URL); + String response = LKLSDK.httpPost(request); + JSONObject jsonObject = JSON.parseObject(response); + if (!"000000".equals(jsonObject.getString("retCode"))) { + throw new RuntimeException(jsonObject.getString("retMsg")); + } + JSONObject respData = jsonObject.getJSONObject("respData"); + System.out.println(respData.toString()); + TzBankCard bankCard = baseMapper.selectOne(new LambdaQueryWrapper().eq(TzBankCard::getReceiverNo, account)); + bankCard.setBdOrderNo(respData.getString("orderNo")); + bankCard.setApplyId(respData.getString("applyId")); + if (baseMapper.updateById(bankCard) <= 0) { + throw new RuntimeException("更新银行卡信息失败"); + } + return true; + } + + /** + * 提款模式设置 + */ + private Boolean setWithdrawalMode(String account) throws Exception { + V2LaepIndustryEwalletSettleProfileRequest ewalletSettleProfileRequest = new V2LaepIndustryEwalletSettleProfileRequest(); + ewalletSettleProfileRequest.setBmcpNo(KlkConstant.ORG_CODE); + ewalletSettleProfileRequest.setMercId(account); + ewalletSettleProfileRequest.setSettleType("02"); + ewalletSettleProfileRequest.setPayType("04"); + JSONObject jsonObject1 = V3LakalaUserUtils.setWithdrawMode(ewalletSettleProfileRequest); + if ("000000".equals(jsonObject1.getString("retCode"))) { + return true; + }else { + throw new ServiceException(jsonObject1.getString("retMsg")); + } + } + + /** + * 获取合作协议对象 + * + * @return + */ + @SneakyThrows + private AddOrUpdateBankCardReq.Attach getAgreement(Long userId, AddOrUpdateBankCardReq addOrUpdateBankCardReq) { + String targetUrl = null; + +// targetUrl = urlPrefix + "storeDivideAccountsAgreement.docx"; + targetUrl = urlPrefix + "saleDivideAccountsAgreement.docx"; + + AddOrUpdateBankCardReq.Attach attach = new AddOrUpdateBankCardReq.Attach(); + attach.setAttachName("divideAccountsAgreement.pdf"); + UploadFileReq req = new UploadFileReq(); + req.setAttType("XY"); + req.setAttExtName("pdf"); + + String outWordPath = basePath + UUID.randomUUID() + ".docx"; + convertHtmlToImage(addOrUpdateBankCardReq, targetUrl, outWordPath); + + String oupPdfPath = basePath + UUID.randomUUID() + ".pdf"; + + PdfUtil.doc2pdf(outWordPath, oupPdfPath, urlPrefix + "license.xml"); +// FileInputStream fileInputStream = new FileInputStream(oupPdfPath); + req.setAttContext(fileToBase641(oupPdfPath)); + attach.setAttachStorePath(uploadFile(req)); + return attach; + } + + /** + * 获取附件信息 + * 将前端传的信息转换为三方接口需要的信息 + * + * @param attachList + * @return + */ + private List getAttachList(List attachList) { + return attachList.stream().map(s -> { + V2MmsApplyLedgerReceiverRequest.AttachInfo attachInfo = new V2MmsApplyLedgerReceiverRequest.AttachInfo(); + attachInfo.setAttachName(s.getAttachName()); + attachInfo.setAttachType(getAttType(s.getAttachType())); + UploadFileReq req = new UploadFileReq(); + req.setAttType(attachInfo.getAttachType()); + req.setAttExtName(getExtName(s.getAttachName())); + req.setAttContext(fileToBase64(s.getAttachStorePath())); + attachInfo.setAttachStorePath(uploadFile(req)); + s.setKlkPath(attachInfo.getAttachStorePath()); + return attachInfo; + }).collect(Collectors.toList()); + } + + /** + * 附件上传 + */ + public String uploadFile(UploadFileReq req) { + try { + doInit(); + V2MmsOpenApiUploadFile v2MmsOpenApiUploadFile = new V2MmsOpenApiUploadFile(); + v2MmsOpenApiUploadFile.setVersion(KlkConstant.VERSION); + v2MmsOpenApiUploadFile.setOrderNo(CommonUtil.getOrderNo()); + v2MmsOpenApiUploadFile.setOrgCode(KlkConstant.ORG_CODE); + v2MmsOpenApiUploadFile.setAttType(req.getAttType()); + v2MmsOpenApiUploadFile.setAttExtName(req.getAttExtName()); + v2MmsOpenApiUploadFile.setAttContext(req.getAttContext()); + String response = LKLSDK.httpPost(v2MmsOpenApiUploadFile); + // 解析结果 + JSONObject jsonObject = JSON.parseObject(response); + if ("000000".equals(jsonObject.getString("retCode"))) { + JSONObject respData = jsonObject.getJSONObject("respData"); + return respData.getString("attFileId"); + } + } catch (Exception e) { + throw new ServiceException("附件上传出现异常:{}"); + } + throw new RuntimeException(); + } + + /** + * 从文件名中获取后缀名 + * + * @param attachName + * @return + */ + private String getExtName(String attachName) { + return attachName.substring(attachName.lastIndexOf(".") + 1); + } + + public String fileToBase64(String path) { + String base64 = null; + InputStream in = null; + try { + in = getFileInputStream(path); + if (in == null) { + throw new FileNotFoundException("文件 [" + path + "] 不存在"); + } + byte[] bytes = StreamUtils.copyToByteArray(in); + base64 = new String(Base64.encodeBase64(bytes), "UTF-8"); + System.out.println("将文件[" + path + "]转base64字符串:" + base64); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return base64; + } + + public String fileToBase641(String path) { + System.out.println("将文件[" + path + "]转base64字符串:"); + String base64 = null; + InputStream in = null; + try { + File file = new File(path); + if (!file.exists()) { + throw new FileNotFoundException("文件 [" + path + "] 不存在"); + } + in = new FileInputStream(file); + byte[] bytes = StreamUtils.copyToByteArray(in); + base64 = new String(Base64.encodeBase64(bytes), "UTF-8"); + System.out.println("将文件[" + path + "]转base64字符串:" + base64); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return base64; + } + + /*读取网络文件*/ + public InputStream getFileInputStream(String path) { + URL url = null; + try { + url = new URL(path); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + //设置超时间为3秒 + conn.setConnectTimeout(3 * 1000); + //防止屏蔽程序抓取而返回403错误 + conn.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); + //得到输入流 + return conn.getInputStream(); + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public void convertHtmlToImage(AddOrUpdateBankCardReq req, String input, String outPut) throws Exception { + + // 创建XWPFDocument对象,加载Word文档 + XWPFDocument doc = new XWPFDocument(new FileInputStream(input)); + // 获取文档中的所有段落 + List paragraphs = doc.getParagraphs(); + + Integer year = 5; + + Date date = DateUtil.offsetMonth(new Date(), year * 12); + + // 遍历所有段落,找到需要修改的内容 + for (XWPFParagraph paragraph : paragraphs) { + if (StrUtil.isBlank(paragraph.getText())) { + continue; + } + List runs = paragraph.getRuns(); + for (XWPFRun run : runs) { + String text = run.text(); + if (StrUtil.isBlank(text)) { + continue; + } + String newText = text; + if (newText.contains("${store.name}")) { + newText = newText.replace("${store.name}", req.getAcctName()); + } + if (newText.contains("${store.idno}")) { + newText = newText.replace("${store.idno}", req.getAcctCertificateNo()); + } + if (newText.contains("${year}")) { + newText = newText.replace("${year}", (year + "")); + } + if (newText.contains("${beginYear}")) { + newText = newText.replace("${beginYear}", (DateUtil.year(new Date()) + "")); + } + if (newText.contains("${beginMonth}")) { + newText = newText.replace("${beginMonth}", (DateUtil.month(new Date()) + 1) + ""); + } + if (newText.contains("${beginDay}")) { + newText = newText.replace("${beginDay}", (DateUtil.dayOfMonth(new Date()) + "")); + } + if (newText.contains("${endYear}")) { + newText = newText.replace("${endYear}", (DateUtil.year(date) + "")); + } + if (newText.contains("${endMonth}")) { + newText = newText.replace("${endMonth}", (DateUtil.month(date) + 1) + ""); + } + if (newText.contains("${endDay}")) { + newText = newText.replace("${endDay}", (DateUtil.dayOfMonth(date) + "")); + } + if (newText.contains("${endDay}")) { + newText = newText.replace("${endDay}", (DateUtil.dayOfMonth(date) + "")); + } + if (newText.contains("${date-qy}")) { + newText = newText.replace("${date-qy}", (DateUtil.formatDate(new Date()) + "")); + } + run.setText(newText, 0); + } + String text = paragraph.getText(); + if (StrUtil.isNotBlank(text) && text.contains("签字/盖章") && StrUtil.isNotBlank(req.getSignature())) { + String targetImage = basePath + UUID.randomUUID() + ".png"; + + download(req.getSignature(), targetImage); + // 图片文件 + FileInputStream imageStream = new FileInputStream(getPositionTrueImage(targetImage)); + XWPFRun provincialInfoPicRun = paragraph.createRun(); + provincialInfoPicRun.addPicture(imageStream, 5, "", Units.toEMU(80), Units.toEMU(40)); + } + + } + // 保存修改后的文档 + FileOutputStream out = new FileOutputStream(outPut); + doc.write(out); + out.close(); + } + + /** + * 自动拼接后缀名 如sourceUrl:abc.jpg, targetUrl:cc 则存储的文件名为cc.jpg + * + * @param sourceUrl + * @param targetUrl + */ + public static File download(String sourceUrl, String targetUrl) throws Exception { + if (new File(targetUrl).exists()) { + new File(targetUrl).delete(); + } + URL httpUrl = new URL(sourceUrl); + File file = new File(targetUrl); + FileUtils.copyURLToFile(httpUrl, file); + + return new File(targetUrl); + } + + private String getPositionTrueImage(String image) { + String s = ImageRotator.rotate90DegreesCounterClockwise(image, basePath); + s = ImageRotator.rotate90DegreesCounterClockwise(s, basePath); + s = ImageRotator.rotate90DegreesCounterClockwise(s, basePath); + return s; + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBasketServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBasketServiceImpl.java new file mode 100644 index 0000000..bfdb800 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBasketServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzBasketBo; +import org.dromara.mall.domain.vo.TzBasketVo; +import org.dromara.mall.domain.TzBasket; +import org.dromara.mall.mapper.TzBasketMapper; +import org.dromara.mall.service.ITzBasketService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 购物车Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzBasketServiceImpl implements ITzBasketService { + + private final TzBasketMapper baseMapper; + + /** + * 查询购物车 + * + * @param basketId 主键 + * @return 购物车 + */ + @Override + public TzBasketVo queryById(Long basketId){ + return baseMapper.selectVoById(basketId); + } + + /** + * 分页查询购物车列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 购物车分页列表 + */ + @Override + public TableDataInfo queryPageList(TzBasketBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的购物车列表 + * + * @param bo 查询条件 + * @return 购物车列表 + */ + @Override + public List queryList(TzBasketBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzBasketBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShopId() != null, TzBasket::getShopId, bo.getShopId()); + lqw.eq(bo.getProdId() != null, TzBasket::getProdId, bo.getProdId()); + lqw.eq(bo.getSkuId() != null, TzBasket::getSkuId, bo.getSkuId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzBasket::getUserId, bo.getUserId()); + lqw.eq(bo.getBasketCount() != null, TzBasket::getBasketCount, bo.getBasketCount()); + lqw.eq(bo.getBasketDate() != null, TzBasket::getBasketDate, bo.getBasketDate()); + lqw.eq(bo.getDiscountId() != null, TzBasket::getDiscountId, bo.getDiscountId()); + lqw.eq(StringUtils.isNotBlank(bo.getDistributionCardNo()), TzBasket::getDistributionCardNo, bo.getDistributionCardNo()); + return lqw; + } + + /** + * 新增购物车 + * + * @param bo 购物车 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzBasketBo bo) { + TzBasket add = MapstructUtils.convert(bo, TzBasket.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setBasketId(add.getBasketId()); + } + return flag; + } + + /** + * 修改购物车 + * + * @param bo 购物车 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzBasketBo bo) { + TzBasket update = MapstructUtils.convert(bo, TzBasket.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzBasket entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除购物车信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBrandServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBrandServiceImpl.java new file mode 100644 index 0000000..565e904 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzBrandServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzBrand; +import org.dromara.mall.domain.bo.TzBrandBo; +import org.dromara.mall.domain.vo.TzBrandVo; +import org.dromara.mall.mapper.TzBrandMapper; +import org.dromara.mall.service.ITzBrandService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 品牌Service业务层处理 + * + * @author Maosw + * @date 2024-09-26 + */ +@RequiredArgsConstructor +@Service +public class TzBrandServiceImpl implements ITzBrandService { + + private final TzBrandMapper baseMapper; + + /** + * 查询品牌 + * + * @param id 主键 + * @return 品牌 + */ + @Override + public TzBrandVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询品牌列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 品牌分页列表 + */ + @Override + public TableDataInfo queryPageList(TzBrandBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的品牌列表 + * + * @param bo 查询条件 + * @return 品牌列表 + */ + @Override + public List queryList(TzBrandBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzBrandBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getName()), TzBrand::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getPic()), TzBrand::getPic, bo.getPic()); + lqw.eq(bo.getSeq() != null, TzBrand::getSeq, bo.getSeq()); + lqw.eq(bo.getStatus() != null, TzBrand::getStatus, bo.getStatus()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzBrand::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增品牌 + * + * @param bo 品牌 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzBrandBo bo) { + TzBrand add = MapstructUtils.convert(bo, TzBrand.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改品牌 + * + * @param bo 品牌 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzBrandBo bo) { + TzBrand update = MapstructUtils.convert(bo, TzBrand.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzBrand entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除品牌信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryBrandServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryBrandServiceImpl.java new file mode 100644 index 0000000..411ada3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryBrandServiceImpl.java @@ -0,0 +1,118 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzCategoryBrand; +import org.dromara.mall.domain.bo.TzCategoryBrandBo; +import org.dromara.mall.domain.vo.TzCategoryBrandVo; +import org.dromara.mall.mapper.TzCategoryBrandMapper; +import org.dromara.mall.service.ITzCategoryBrandService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzCategoryBrandServiceImpl implements ITzCategoryBrandService { + + private final TzCategoryBrandMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzCategoryBrandVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzCategoryBrandBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzCategoryBrandBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzCategoryBrandBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCategoryId() != null, TzCategoryBrand::getCategoryId, bo.getCategoryId()); + lqw.eq(bo.getBrandId() != null, TzCategoryBrand::getBrandId, bo.getBrandId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzCategoryBrandBo bo) { + TzCategoryBrand add = MapstructUtils.convert(bo, TzCategoryBrand.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzCategoryBrandBo bo) { + TzCategoryBrand update = MapstructUtils.convert(bo, TzCategoryBrand.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryPropServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryPropServiceImpl.java new file mode 100644 index 0000000..240d487 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryPropServiceImpl.java @@ -0,0 +1,118 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzCategoryProp; +import org.dromara.mall.domain.bo.TzCategoryPropBo; +import org.dromara.mall.domain.vo.TzCategoryPropVo; +import org.dromara.mall.mapper.TzCategoryPropMapper; +import org.dromara.mall.service.ITzCategoryPropService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzCategoryPropServiceImpl implements ITzCategoryPropService { + + private final TzCategoryPropMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzCategoryPropVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzCategoryPropBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzCategoryPropBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzCategoryPropBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCategoryId() != null, TzCategoryProp::getCategoryId, bo.getCategoryId()); + lqw.eq(bo.getPropId() != null, TzCategoryProp::getPropId, bo.getPropId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzCategoryPropBo bo) { + TzCategoryProp add = MapstructUtils.convert(bo, TzCategoryProp.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzCategoryPropBo bo) { + TzCategoryProp update = MapstructUtils.convert(bo, TzCategoryProp.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java new file mode 100644 index 0000000..e0923de --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCategoryServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.mall.domain.TzCategory; +import org.dromara.mall.domain.bo.TzCategoryBo; +import org.dromara.mall.domain.vo.TzCategoryVo; +import org.dromara.mall.mapper.TzCategoryMapper; +import org.dromara.mall.service.ITzCategoryService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 产品类目Service业务层处理 + * + * @author Lion Li + * @date 2024-07-31 + */ +@RequiredArgsConstructor +@Service +public class TzCategoryServiceImpl implements ITzCategoryService { + + private final TzCategoryMapper baseMapper; + + /** + * 查询产品类目 + * + * @param categoryId 主键 + * @return 产品类目 + */ + @Override + public TzCategoryVo queryById(Long categoryId){ + return baseMapper.selectVoById(categoryId); + } + + + /** + * 查询符合条件的产品类目列表 + * + * @param bo 查询条件 + * @return 产品类目列表 + */ + @Override + public List queryList(TzCategoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzCategoryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), TzCategory::getCategoryName, bo.getCategoryName()); + lqw.eq(bo.getStatus() != null, TzCategory::getStatus, bo.getStatus()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, TzCategory::getRecTime, params.get("beginTime"), params.get("endTime")); + return lqw; + } + + /** + * 新增产品类目 + * + * @param bo 产品类目 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzCategoryBo bo) { + if(bo.getParentId() != 0){ + TzCategory category = baseMapper.selectById(bo.getParentId()); + bo.setGrade(category.getGrade()+1); + category.setSubset(1); + baseMapper.updateById(category); + } + bo.setRecTime(new Date()); + TzCategory add = MapstructUtils.convert(bo, TzCategory.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCategoryId(add.getCategoryId()); + } + return flag; + } + + /** + * 修改产品类目 + * + * @param bo 产品类目 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzCategoryBo bo) { + if(bo.getParentId() != 0){ + TzCategory category = baseMapper.selectById(bo.getParentId()); + bo.setGrade(category.getGrade()+1); + category.setSubset(1); + baseMapper.updateById(category); + } + TzCategory update = MapstructUtils.convert(bo, TzCategory.class); + return baseMapper.updateById(update) > 0; + } + + + + /** + * 校验并批量删除产品类目信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List listByParentId(Long parentId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzCategory::getParentId, parentId).eq(TzCategory::getStatus,1)); + } + + /** + * 全部分类信息列表 + * + * @return + */ + @Override + public List categoryAll() { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzCategory::getStatus,1)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerRecordServiceImpl.java new file mode 100644 index 0000000..05b19f5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerRecordServiceImpl.java @@ -0,0 +1,124 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzCustomerRecord; +import org.dromara.mall.domain.bo.TzCustomerRecordBo; +import org.dromara.mall.domain.vo.TzCustomerRecordVo; +import org.dromara.mall.mapper.TzCustomerRecordMapper; +import org.dromara.mall.service.ITzCustomerRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 客户资金记录Service业务层处理 + * + * @author Maosw + * @date 2024-09-12 + */ +@RequiredArgsConstructor +@Service +public class TzCustomerRecordServiceImpl implements ITzCustomerRecordService { + + private final TzCustomerRecordMapper baseMapper; + + /** + * 查询客户资金记录 + * + * @param id 主键 + * @return 客户资金记录 + */ + @Override + public TzCustomerRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询客户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户资金记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzCustomerRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户资金记录列表 + * + * @param bo 查询条件 + * @return 客户资金记录列表 + */ + @Override + public List queryList(TzCustomerRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzCustomerRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzCustomerRecord::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzCustomerRecord::getUserName, bo.getUserName()); + lqw.eq(bo.getType() != null, TzCustomerRecord::getType, bo.getType()); + lqw.eq(bo.getPrice() != null, TzCustomerRecord::getPrice, bo.getPrice()); + lqw.eq(bo.getBalance() != null, TzCustomerRecord::getBalance, bo.getBalance()); + lqw.eq(StringUtils.isNotBlank(bo.getDepict()), TzCustomerRecord::getDepict, bo.getDepict()); + lqw.eq(bo.getCreateTime() != null, TzCustomerRecord::getCreateTime, bo.getCreateTime()); + return lqw; + } + + /** + * 新增客户资金记录 + * + * @param bo 客户资金记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzCustomerRecordBo bo) { + TzCustomerRecord add = MapstructUtils.convert(bo, TzCustomerRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改客户资金记录 + * + * @param bo 客户资金记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzCustomerRecordBo bo) { + TzCustomerRecord update = MapstructUtils.convert(bo, TzCustomerRecord.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除客户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerServiceImpl.java new file mode 100644 index 0000000..85a9d62 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzCustomerServiceImpl.java @@ -0,0 +1,225 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.TzCustomer; +import org.dromara.mall.domain.TzCustomerRecord; +import org.dromara.mall.domain.bo.TzCustomerBo; +import org.dromara.mall.domain.vo.TzCustomerSumVo; +import org.dromara.mall.domain.vo.TzCustomerVo; +import org.dromara.mall.mapper.HyOrderPaymentMapper; +import org.dromara.mall.mapper.TzCustomerMapper; +import org.dromara.mall.mapper.TzCustomerRecordMapper; +import org.dromara.mall.service.ITzCustomerService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 客户Service业务层处理 + * + * @author Maosw + * @date 2024-09-04 + */ +@RequiredArgsConstructor +@Service +public class TzCustomerServiceImpl implements ITzCustomerService { + + private final TzCustomerMapper baseMapper; + + private final HyOrderPaymentMapper tzOrderPaymentMapper; + + private final TzCustomerRecordMapper tzCustomerRecordMapper; + + /** + * 查询客户 + * + * @param id 主键 + * @return 客户 + */ + @Override + public TzCustomerVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询客户列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户分页列表 + */ + @Override + public TableDataInfo queryPageList(TzCustomerBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ + bo.setUserId(loginUser.getUserId()); + } + } + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.eq(TzCustomer::getDelFlag,0); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户列表 + * + * @param bo 查询条件 + * @return 客户列表 + */ + @Override + public List queryList(TzCustomerBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.eq(TzCustomer::getDelFlag,0); + return baseMapper.selectVoList(lqw); + } + + /** + * 查询客户列表统计 + * + * @param bo + * @return + */ + @Override + public TzCustomerSumVo queryListCount(TzCustomerBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.eq(TzCustomer::getDelFlag,0); + + List list = baseMapper.selectList(lqw); + + Long count = (long) list.size(); + BigDecimal sum = list.stream().map(f -> new BigDecimal(String.valueOf(f.getBalance()))).reduce(BigDecimal.ZERO, BigDecimal::add);; + + TzCustomerSumVo sumVo = new TzCustomerSumVo(); + sumVo.setCount(count); + sumVo.setSum(sum); + return sumVo; + } + + private LambdaQueryWrapper buildQueryWrapper(TzCustomerBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzCustomer::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserCode()), TzCustomer::getUserCode, bo.getUserCode()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzCustomer::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getCode()), TzCustomer::getCode, bo.getCode()); + lqw.like(StringUtils.isNotBlank(bo.getName()), TzCustomer::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getPhone()), TzCustomer::getPhone, bo.getPhone()); + lqw.eq(bo.getSex() != null, TzCustomer::getSex, bo.getSex()); + lqw.eq(bo.getType() != null, TzCustomer::getType, bo.getType()); + lqw.eq(bo.getState() != null, TzCustomer::getState, bo.getState()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + TzCustomer::getCreateTime, params.get("beginTime"), params.get("endTime")); + return lqw; + } + + /** + * 新增客户 + * + * @param bo 客户 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzCustomerBo bo) { + boolean exists = baseMapper.exists(new LambdaQueryWrapper().eq(TzCustomer::getCode, bo.getCode())); + if (exists){ + throw new ServiceException("客户编号已存在"); + } + + LoginUser loginUser = LoginHelper.getLoginUser(); + bo.setCreateTime(new Date()); + bo.setUserId(loginUser.getUserId()); + bo.setUserCode(loginUser.getUsername()); + bo.setUserName(loginUser.getNickname()); + bo.setCreateTime(new Date()); + TzCustomer add = MapstructUtils.convert(bo, TzCustomer.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改客户 + * + * @param bo 客户 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzCustomerBo bo) { + TzCustomer update = MapstructUtils.convert(bo, TzCustomer.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 申请退款(客服) + */ + @Override + @Transactional + public Boolean refund(TzCustomerBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzCustomer customer = baseMapper.selectById(bo.getId()); + BigDecimal price = customer.getBalance().subtract(bo.getRefundPrice()); + if(price.compareTo(BigDecimal.ZERO) < 0) { + throw new ServiceException("客户余额不足"); + } + customer.setBalance(price); + + /*HyOrderPayment orderPayment = new HyOrderPayment(); + orderPayment.setTotal(bo.getRefundPrice()); + orderPayment.setUserId(bo.getId()); + orderPayment.setAddUserId(loginUser.getUserId()); + orderPayment.setStatus(1); + orderPayment.setPayeeName(bo.getPayeeName()); + orderPayment.setPayeeBank(bo.getPayeeBank()); + orderPayment.setPayeeBankNum(bo.getPayeeBankNum()); + orderPayment.setDepict(bo.getDepict()); + orderPayment.setType(2); + orderPayment.setCreateTime(new Date()); + tzOrderPaymentMapper.insert(orderPayment);*/ + + if(baseMapper.updateById(customer) > 0){ + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(3); + customerRecord.setPrice(bo.getRefundPrice()); + customerRecord.setBalance(price); + customerRecord.setDepict("客户申请退款"); + customerRecord.setCreateTime(new Date()); + return tzCustomerRecordMapper.insert(customerRecord) > 0; + } + return false; + } + + /** + * 校验并批量删除客户信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + List list = baseMapper.selectByIds(ids); + list.stream().forEach(f ->f.setDelFlag(1)); + return baseMapper.updateBatchById(list); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzDeliveryServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzDeliveryServiceImpl.java new file mode 100644 index 0000000..d0728a4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzDeliveryServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzDelivery; +import org.dromara.mall.domain.bo.TzDeliveryBo; +import org.dromara.mall.domain.vo.TzDeliveryVo; +import org.dromara.mall.mapper.TzDeliveryMapper; +import org.dromara.mall.service.ITzDeliveryService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 物流公司Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class TzDeliveryServiceImpl implements ITzDeliveryService { + + private final TzDeliveryMapper baseMapper; + + /** + * 查询物流公司 + * + * @param id 主键 + * @return 物流公司 + */ + @Override + public TzDeliveryVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询物流公司列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 物流公司分页列表 + */ + @Override + public TableDataInfo queryPageList(TzDeliveryBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的物流公司列表 + * + * @param bo 查询条件 + * @return 物流公司列表 + */ + @Override + public List queryList(TzDeliveryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzDeliveryBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TzDelivery::getId); + lqw.like(StringUtils.isNotBlank(bo.getName()), TzDelivery::getName, bo.getName()); + return lqw; + } + + /** + * 新增物流公司 + * + * @param bo 物流公司 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzDeliveryBo bo) { + TzDelivery add = MapstructUtils.convert(bo, TzDelivery.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改物流公司 + * + * @param bo 物流公司 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzDeliveryBo bo) { + TzDelivery update = MapstructUtils.convert(bo, TzDelivery.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzDelivery entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除物流公司信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzHotSearchServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzHotSearchServiceImpl.java new file mode 100644 index 0000000..a59e2c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzHotSearchServiceImpl.java @@ -0,0 +1,158 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzHotSearch; +import org.dromara.mall.domain.bo.TzHotSearchBo; +import org.dromara.mall.domain.vo.TzHotSearchVo; +import org.dromara.mall.mapper.TzHotSearchMapper; +import org.dromara.mall.service.ITzHotSearchService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 热搜Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzHotSearchServiceImpl implements ITzHotSearchService { + + private final TzHotSearchMapper baseMapper; + + /** + * 查询热搜 + * + * @param hotSearchId 主键 + * @return 热搜 + */ + @Override + public TzHotSearchVo queryById(Long hotSearchId){ + return baseMapper.selectVoById(hotSearchId); + } + + /** + * 分页查询热搜列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 热搜分页列表 + */ + @Override + public TableDataInfo queryPageList(TzHotSearchBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的热搜列表 + * + * @param bo 查询条件 + * @return 热搜列表 + */ + @Override + public List queryList(TzHotSearchBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzHotSearchBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShopId() != null, TzHotSearch::getShopId, bo.getShopId()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzHotSearch::getContent, bo.getContent()); + lqw.eq(bo.getRecDate() != null, TzHotSearch::getRecDate, bo.getRecDate()); + lqw.eq(bo.getSeq() != null, TzHotSearch::getSeq, bo.getSeq()); + lqw.eq(bo.getStatus() != null, TzHotSearch::getStatus, bo.getStatus()); + lqw.like(StringUtils.isNotBlank(bo.getTitle()), TzHotSearch::getTitle, bo.getTitle()); + return lqw; + } + + /** + * 新增热搜 + * + * @param bo 热搜 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzHotSearchBo bo) { + TzHotSearch add = MapstructUtils.convert(bo, TzHotSearch.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setHotSearchId(add.getHotSearchId()); + } + return flag; + } + + /** + * 修改热搜 + * + * @param bo 热搜 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzHotSearchBo bo) { + TzHotSearch update = MapstructUtils.convert(bo, TzHotSearch.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除热搜信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage pageSearchByName(TzHotSearchBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(); + lqw.select(TzHotSearch::getTitle); + lqw.like(TzHotSearch::getTitle, bo.getTitle()).eq(TzHotSearch::getStatus,1).orderByDesc(TzHotSearch::getNum); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + public IPage searchList(PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(); + lqw.select(TzHotSearch::getTitle); + lqw.eq(TzHotSearch::getStatus,1).orderByDesc(TzHotSearch::getNum); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + public void setSearchNum(String title) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzHotSearch::getTitle,title); + if(ObjectUtil.isEmpty(lqw)){ + TzHotSearch bo = new TzHotSearch(); + bo.setTitle(title); + bo.setStatus(1); + bo.setRecDate(new Date()); + baseMapper.insert(bo); + }else { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper().eq(TzHotSearch::getTitle,title); + updateWrapper.setIncrBy(TzHotSearch::getNum, 1); + } + } + +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexImgServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexImgServiceImpl.java new file mode 100644 index 0000000..2b7e58f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexImgServiceImpl.java @@ -0,0 +1,127 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzIndexImg; +import org.dromara.mall.domain.bo.TzIndexImgBo; +import org.dromara.mall.domain.vo.TzIndexImgVo; +import org.dromara.mall.mapper.TzIndexImgMapper; +import org.dromara.mall.service.ITzIndexImgService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 主页轮播图Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzIndexImgServiceImpl implements ITzIndexImgService { + + private final TzIndexImgMapper baseMapper; + + /** + * 查询主页轮播图 + * + * @param imgId 主键 + * @return 主页轮播图 + */ + @Override + public TzIndexImgVo queryById(Long imgId){ + return baseMapper.selectVoById(imgId); + } + + /** + * 分页查询主页轮播图列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 主页轮播图分页列表 + */ + @Override + public TableDataInfo queryPageList(TzIndexImgBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的主页轮播图列表 + * + * @param bo 查询条件 + * @return 主页轮播图列表 + */ + @Override + public List queryList(TzIndexImgBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzIndexImgBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), TzIndexImg::getImgUrl, bo.getImgUrl()); + lqw.eq(StringUtils.isNotBlank(bo.getDes()), TzIndexImg::getDes, bo.getDes()); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TzIndexImg::getTitle, bo.getTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getLink()), TzIndexImg::getLink, bo.getLink()); + lqw.eq(bo.getStatus() != null, TzIndexImg::getStatus, bo.getStatus()); + lqw.eq(bo.getSeq() != null, TzIndexImg::getSeq, bo.getSeq()); + lqw.eq(bo.getUploadTime() != null, TzIndexImg::getUploadTime, bo.getUploadTime()); + lqw.eq(bo.getRelation() != null, TzIndexImg::getRelation, bo.getRelation()); + lqw.eq(bo.getType() != null, TzIndexImg::getType, bo.getType()); + return lqw; + } + + /** + * 新增主页轮播图 + * + * @param bo 主页轮播图 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzIndexImgBo bo) { + TzIndexImg add = MapstructUtils.convert(bo, TzIndexImg.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setImgId(add.getImgId()); + } + return flag; + } + + /** + * 修改主页轮播图 + * + * @param bo 主页轮播图 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzIndexImgBo bo) { + TzIndexImg update = MapstructUtils.convert(bo, TzIndexImg.class); + return baseMapper.updateById(update) > 0; + } + + + + /** + * 校验并批量删除主页轮播图信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexServiceImpl.java new file mode 100644 index 0000000..c3fca9e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzIndexServiceImpl.java @@ -0,0 +1,652 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.vo.IndexCountVo; +import org.dromara.mall.domain.vo.IndexSumVo; +import org.dromara.mall.domain.vo.PerSumVo; +import org.dromara.mall.domain.vo.RankSumVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.ITzIndexService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.mapper.SysTenantMapper; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; + +@RequiredArgsConstructor +@Service +public class TzIndexServiceImpl implements ITzIndexService { + + private final TzProdMapper tzProdMapper; + + private final HyOrderPaymentMapper orderPaymentMapper; + + private final HyOrderMapper hyOrderMapper; + + private final HyOrderItemMapper hyOrderItemMapper; + + private final TzUserMapper tzUserMapper; + + private final TzWithdrawRequestMapper tzWithdrawRequestMapper; + + private final HyPromoterMapper hyPromoterMapper; + + private final HyMemberCodeMapper hyMemberCodeMapper; + + private final HyCodeOrderMapper hyCodeOrderMapper; + + private final SysTenantMapper tenantMapper; + + private static final Logger log = LogManager.getLogger(TzIndexServiceImpl.class); + + + /** + * 系统角色首页 + * + * @return + */ + @Override + public IndexSumVo sysUser() { + LocalDate now = LocalDate.now(); + String todayStart = now.atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String todayEnd = now.atTime(23, 59, 59).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthStart = now.withDayOfMonth(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthEnd = todayEnd; + String yearStart = now.getYear() + "-01-01 00:00:00"; + + IndexSumVo indexSumVo = new IndexSumVo(); + + List list = hyOrderMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrder::getDelFlag, 1) + .ne(HyOrder::getStatus, 7) + .between(HyOrder::getCreateTime, todayStart, todayEnd) + ); + + //当天销售金额 + BigDecimal dtxseSum = list.stream().map(HyOrder::getPayPrice) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //当天已到款金额 + BigDecimal dtydkSum = list.stream().filter(tzOrder -> tzOrder.getPayState() == 2 || tzOrder.getPayState() == 3).map(HyOrder::getPayPrice) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + List list1 = hyOrderMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrder::getDelFlag, 1) + .ne(HyOrder::getStatus, 7) + .between(HyOrder::getCreateTime, monthStart, monthEnd) + ); + //本月销售额 + BigDecimal byxseSUm = list1.stream() + .map(HyOrder::getTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //本月已到款金额 + BigDecimal byydkSum = list1.stream() + .filter(tzOrder -> tzOrder.getPayState() == 2 || tzOrder.getPayState() == 3) + .map(HyOrder::getPayPrice) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + List list2 = hyOrderMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrder::getDelFlag, 1) + .ne(HyOrder::getStatus, 7) + .between(HyOrder::getCreateTime, yearStart, todayEnd) + ); + //本年销售额 + BigDecimal bnxseSum = list2.stream() + .map(HyOrder::getTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //本年已到款金额 + BigDecimal bnydkSum = list2.stream() + .filter(tzOrder -> tzOrder.getPayState() == 2 || tzOrder.getPayState() == 3) + .map(HyOrder::getPayPrice) + .reduce(BigDecimal.ZERO, BigDecimal::add); + //产品总数 + Long cpCount = tzProdMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + ); + + //本月新增产品数 + Long byxzCpCount = tzProdMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + .between(TzProd::getCreateTime, monthStart, monthEnd) + ); + + //会员总数 + Long khCount = tzUserMapper.selectCount( + new LambdaQueryWrapper() + ); + //本月新增会员数 + Long byxzKhCount = tzUserMapper.selectCount( + new LambdaQueryWrapper() + .between(TzUser::getCreateTime, monthStart, monthEnd) + ); + + //商家提现待审核数量 + Long dfkddCount = orderPaymentMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderPayment::getStatus, 1) + .eq(HyOrderPayment::getDelFlag, 1) + ); + + //会员提现待审核数量 + Long hhdshCount = tzWithdrawRequestMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzWithdrawRequest::getWithdrawStatus, 1) + .eq(TzWithdrawRequest::getDelFlag, 1) + ); + + //已完成订单数量 + Long ywcddCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .in(HyOrderItem::getStatus, 5,6) + ); + + indexSumVo.setDtxseSum(dtxseSum); + indexSumVo.setDtydkSum(dtydkSum); + indexSumVo.setByxseSum(byxseSUm); + indexSumVo.setByydkSum(byydkSum); + indexSumVo.setBnxseSum(bnxseSum); + indexSumVo.setBnydkSum(bnydkSum); + indexSumVo.setCpCount(cpCount); + indexSumVo.setByxzCpCount(byxzCpCount); + indexSumVo.setKhCount(khCount); + indexSumVo.setByxzKhCount(byxzKhCount); + indexSumVo.setDfkddCount(dfkddCount); + indexSumVo.setHhdshCount(hhdshCount); + indexSumVo.setYwcddCount(ywcddCount); + return indexSumVo; + } + + /** + * 系统用户统计 + * + * @return + */ + @Override + public IndexCountVo sysUserCount() { + LocalDate now = LocalDate.now(); + String todayStart = now.atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String todayEnd = now.atTime(23, 59, 59).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthStart = now.withDayOfMonth(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthEnd = todayEnd; + String yearStart = now.getYear() + "-01-01 00:00:00"; + + //总销售额 + BigDecimal totalSales = hyOrderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .ne(HyOrderItem::getPayState, 1)).stream() + .map(HyOrderItem::getTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //本月销售额 + BigDecimal monthSales = hyOrderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .ne(HyOrderItem::getPayState, 1) + .between(HyOrderItem::getCreateTime, monthStart, monthEnd)).stream() + .map(HyOrderItem::getTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //总订单数 + Long orderCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .ne(HyOrderItem::getPayState, 1)); + + //本月订单数 + Long orderMonthCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .ne(HyOrderItem::getPayState, 1) + .between(HyOrderItem::getCreateTime, monthStart, monthEnd) + ); + + //产品总数 + Long productCount = tzProdMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + ); + + //本月新增产品数 + Long productMonthCount = tzProdMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + .between(TzProd::getCreateTime, monthStart, monthEnd) + ); + + //会员总数 + Long wxUserCount = tzUserMapper.selectCount( + new LambdaQueryWrapper() + ); + //本月新增会员数 + Long wxUserMonthCount = tzUserMapper.selectCount( + new LambdaQueryWrapper() + .between(TzUser::getCreateTime, monthStart, monthEnd) + ); + + //渠道商总数 + Long channelCount = hyPromoterMapper.selectCount( + new LambdaQueryWrapper().eq(HyPromoter::getDelFlag, 1) + ); + + //本月新增渠道商数 + Long channelMonthCount = hyPromoterMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyPromoter::getDelFlag, 1) + .between(HyPromoter::getCreateTime, monthStart, monthEnd) + ); + + // 会员码总数 + Long memberCodeCount = hyMemberCodeMapper.selectCount( + new LambdaQueryWrapper().eq(HyMemberCode::getDelFlag, 1) + ); + + //会员码当月销量 + Long memberCodeMonthCount = hyMemberCodeMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyMemberCode::getDelFlag, 1) + .between(HyMemberCode::getCreateTime, monthStart, monthEnd) + ); + + // 会员码兑换总数 + Long memberCodeExchangeCount = hyMemberCodeMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyMemberCode::getDelFlag, 1) + .eq(HyMemberCode::getStatus, 2) + ); + + //会员码销售额总额 + BigDecimal memberCodeTotal = hyCodeOrderMapper.selectList( + new LambdaQueryWrapper() + .eq(HyCodeOrder::getDelFlag, 1) + .ne(HyCodeOrder::getOrderStatus, 3) + ).stream() + .map(HyCodeOrder::getOrderAmount) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //厂家总数 + Long factoryCount = tenantMapper.selectCount(new LambdaQueryWrapper().eq(SysTenant::getDelFlag, 0)); + + //本月新增厂家数 + Long factoryMonthCount = tenantMapper.selectCount(new LambdaQueryWrapper().eq(SysTenant::getDelFlag, 0).between(SysTenant::getCreateTime, monthStart, monthEnd)); + + IndexCountVo indexCountVo = new IndexCountVo(); + indexCountVo.setTotalSales(totalSales); + indexCountVo.setMonthSales(monthSales); + indexCountVo.setOrderCount(orderCount); + indexCountVo.setOrderMonthCount(orderMonthCount); + indexCountVo.setProductCount(productCount); + indexCountVo.setProductMonthCount(productMonthCount); + indexCountVo.setWxUserCount(wxUserCount); + indexCountVo.setWxUserMonthCount(wxUserMonthCount); + indexCountVo.setChannelCount(channelCount); + indexCountVo.setChannelMonthCount(channelMonthCount); + indexCountVo.setMemberCodeCount(memberCodeCount); + indexCountVo.setMemberCodeMonthCount(memberCodeMonthCount); + indexCountVo.setMemberCodeExchangeCount(memberCodeExchangeCount); + indexCountVo.setMemberCodeSales(memberCodeTotal); + indexCountVo.setFactoryCount(factoryCount); + indexCountVo.setFactoryMonthCount(factoryMonthCount); + return indexCountVo; + } + + /** + * 租户角色首页 + * + * @return + */ + @Override + public IndexCountVo zhUser() { + LocalDate now = LocalDate.now(); + String todayStart = now.atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String todayEnd = now.atTime(23, 59, 59).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthStart = now.withDayOfMonth(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + String monthEnd = todayEnd; + String yearStart = now.getYear() + "-01-01 00:00:00"; + + LoginUser loginUser = LoginHelper.getLoginUser(); + + //总销售额 + BigDecimal totalSales = hyOrderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + .ne(HyOrderItem::getPayState, 1)).stream() + .map(HyOrderItem::getActualTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //本月销售额 + BigDecimal monthSales = hyOrderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + .ne(HyOrderItem::getPayState, 1) + .between(HyOrderItem::getCreateTime, monthStart, monthEnd)).stream() + .map(HyOrderItem::getActualTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //总订单数 + Long orderCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + .ne(HyOrderItem::getPayState, 1)); + + //本月订单数 + Long orderMonthCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + .ne(HyOrderItem::getPayState, 1) + .between(HyOrderItem::getCreateTime, monthStart, monthEnd) + ); + + //产品总数 + Long productCount = tzProdMapper.selectCount( + new LambdaQueryWrapper() + .eq(TzProd::getStatus, 1) + .eq(TzProd::getTenantId, loginUser.getTenantId()) + ); + + //待付款金额 + BigDecimal payPrice = hyOrderItemMapper.selectList( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getPayState, 1) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + ).stream() + .map(HyOrderItem::getActualTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + //待发货订单数 + Long dvyCount = hyOrderItemMapper.selectCount( + new LambdaQueryWrapper() + .eq(HyOrderItem::getDelFlag, 1) + .eq(HyOrderItem::getStatus, 2) + .eq(HyOrderItem::getTenantId, loginUser.getTenantId()) + ); + + //可提现金额 + BigDecimal withdrawPrice = tenantMapper.selectList( + new LambdaQueryWrapper() + .eq(SysTenant::getDelFlag, 0) + .eq(SysTenant::getTenantId, loginUser.getTenantId()) + ).stream() + .map(SysTenant::getBalance) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + IndexCountVo indexCountVo = new IndexCountVo(); + indexCountVo.setTotalSales(totalSales); + indexCountVo.setMonthSales(monthSales); + indexCountVo.setOrderCount(orderCount); + indexCountVo.setOrderMonthCount(orderMonthCount); + indexCountVo.setProductCount(productCount); + indexCountVo.setPayPrice(payPrice); + indexCountVo.setDvyCount(dvyCount); + indexCountVo.setWithdrawPrice(withdrawPrice); + return indexCountVo; + } + + + + /** + * 业绩按月统计 + * + * @param month + * @return + */ + @Override + public List monthPer(String month) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List perSumVos = null; + if("zh_user".equals(loginUser.getUserType())){ + perSumVos = hyOrderItemMapper.monthPerByZh(month, loginUser.getTenantId()); + }else{ + perSumVos = hyOrderItemMapper.monthPer(month, null); + } + return perSumVos; + } + + /** + * 业绩按年统计 + * + * @param year + * @return + */ + @Override + public List yearPer(String year) { + LoginUser loginUser = LoginHelper.getLoginUser(); + List perSumVos = null; + if("zh_user".equals(loginUser.getUserType())){ + perSumVos = hyOrderItemMapper.yearPerByZh(year, loginUser.getTenantId()); + }else{ + perSumVos = hyOrderItemMapper.yearPer(year, null); + } + return perSumVos; + } + + /** + * 产品数量按月统计 + * + * @param month + * @return + */ + @Override + public List monthPerProd(String month) { + List perSumVos = tzProdMapper.monthPerProd(month); + return perSumVos; + } + + /** + * 产品数量按年统计 + * + * @param year + * @return + */ + @Override + public List yearPerProd(String year) { + List perSumVos = tzProdMapper.yearPerProd(year); + return perSumVos; + } + + /** + * 会员码数量按月统计 + * + * @param month + * @return + */ + @Override + public List monthPerCode(String month) { + List perSumVos = hyMemberCodeMapper.monthPerCode(month); + return perSumVos; + } + + /** + * 会员码数量按年统计 + * + * @param year + * @return + */ + @Override + public List yearPerCode(String year) { + List perSumVos = hyMemberCodeMapper.yearPerCode(year); + return perSumVos; + } + + /** + * 会员码销售额按月统计 + * + * @param month + * @return + */ + @Override + public List monthPerCodePer(String month) { + List perSumVos = hyCodeOrderMapper.monthPerCodePer(month); + return perSumVos; + } + + /** + * 会员码销售额按年统计 + * + * @param year + * @return + */ + @Override + public List yearPerCodePer(String year) { + List perSumVos = hyCodeOrderMapper.yearPerCodePer(year); + return perSumVos; + } + + /** + * 推广员下单数量排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage promoterCountMonth(PageQuery pageQuery, String startDay, String endDay) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyCodeOrderMapper.promoterCountMonth(page,startDay,endDay); + } + + /** + * 推广员下单金额排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage promoterSumMonth(PageQuery pageQuery, String startDay, String endDay) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyCodeOrderMapper.promoterSumMonth(page,startDay,endDay); + } + + /** + * 小程序用户数量排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage xcxUserCountMonth(PageQuery pageQuery, String startDay, String endDay) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyOrderItemMapper.xcxUserCountMonth(page,startDay,endDay); + } + + /** + * 小程序用户下单金额排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage xcxUserSumMonth(PageQuery pageQuery, String startDay, String endDay) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyOrderItemMapper.xcxUserSumMonth(page,startDay,endDay); + } + + /** + * 工厂销售数量排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage factorySalesVolumeCount(PageQuery pageQuery, String startDay, String endDay) { + LoginUser loginUser = LoginHelper.getLoginUser(); + String tenantId = loginUser.getTenantId(); + if(!"zh_user".equals(loginUser.getUserType())){ + tenantId = null; + } + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyOrderItemMapper.factorySalesVolumeCount(page,startDay,endDay,tenantId); + } + + /** + * 工厂销售金额排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage factorySalesVolumeSum(PageQuery pageQuery, String startDay, String endDay) { + LoginUser loginUser = LoginHelper.getLoginUser(); + String tenantId = loginUser.getTenantId(); + if(!"zh_user".equals(loginUser.getUserType())){ + tenantId = null; + } + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return hyOrderItemMapper.factorySalesVolumeSum(page,startDay,endDay,tenantId); + } + + /** + * 产品销售数量排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage prodSalesVolumeCount(PageQuery pageQuery, String startDay, String endDay) { + LoginUser loginUser = LoginHelper.getLoginUser(); + String tenantId = loginUser.getTenantId(); + if(!"zh_user".equals(loginUser.getUserType())){ + tenantId = null; + } + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return tzProdMapper.prodSalesVolumeCount(page,startDay,endDay,tenantId); + } + + /** + * 产品销售金额排行榜 + * + * @param pageQuery + * @param startDay + * @param endDay + * @return + */ + @Override + public IPage prodSalesVolumeSum(PageQuery pageQuery, String startDay, String endDay) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if("zh_user".equals(loginUser.getUserType())){ + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return tzProdMapper.prodSalesVolumeSumByZh(page,startDay,endDay,loginUser.getTenantId()); + }else{ + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return tzProdMapper.prodSalesVolumeSum(page,startDay,endDay,null); + } + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceApplyServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceApplyServiceImpl.java new file mode 100644 index 0000000..568c91a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceApplyServiceImpl.java @@ -0,0 +1,236 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyOrderItem; +import org.dromara.mall.domain.TzInvoiceApply; +import org.dromara.mall.domain.bo.TzInvoiceApplyBo; +import org.dromara.mall.domain.vo.TzInvoicApplySumVo; +import org.dromara.mall.domain.vo.TzInvoiceApplyVo; +import org.dromara.mall.mapper.HyOrderItemMapper; +import org.dromara.mall.mapper.TzInvoiceApplyMapper; +import org.dromara.mall.service.ITzInvoiceApplyService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 发票申请记录Service业务层处理 + * + * @author Maosw + * @date 2024-12-25 + */ +@RequiredArgsConstructor +@Service +public class TzInvoiceApplyServiceImpl implements ITzInvoiceApplyService { + + private final TzInvoiceApplyMapper baseMapper; + + private final HyOrderItemMapper orderItemMapper; + + /** + * 查询发票申请记录 + * + * @param id 主键 + * @return 发票申请记录 + */ + @Override + public TzInvoiceApplyVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询发票申请记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 发票申请记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzInvoiceApplyBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzInvoiceApply::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询发票申请记录统计信息 + * + * @param bo + */ + @Override + public TzInvoicApplySumVo querySum(TzInvoiceApplyBo bo) { + TzInvoicApplySumVo sumVo = new TzInvoicApplySumVo(); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + + // 总数量 + Long totalNum = baseMapper.selectCount(lqw); + + // 总金额 + BigDecimal totalAmount = baseMapper.selectList(lqw).stream() + .map(TzInvoiceApply::getInvoiceAmount) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + sumVo.setTotalNum(totalNum); + sumVo.setTotalAmount(totalAmount); + + //待开票数量 + LambdaQueryWrapper lwq1 = new LambdaQueryWrapper<>(); + lwq1.eq(TzInvoiceApply::getStatus, 1); + sumVo.setDshNum(baseMapper.selectCount(lwq1)); + + //已开票数量 + LambdaQueryWrapper lwq2 = new LambdaQueryWrapper<>(); + lwq2.eq(TzInvoiceApply::getStatus, 3); + sumVo.setYdkNum(baseMapper.selectCount(lwq2)); + return sumVo; + } + + /** + * 查询符合条件的发票申请记录列表 + * + * @param bo 查询条件 + * @return 发票申请记录列表 + */ + @Override + public List queryList(TzInvoiceApplyBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + @Override + public IPage queryPageListAPP(TzInvoiceApplyBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(TzInvoiceApply::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzInvoiceApplyBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzInvoiceApply::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getInvoiceNo()), TzInvoiceApply::getInvoiceNo, bo.getInvoiceNo()); + lqw.like(StringUtils.isNotBlank(bo.getInvoiceTitleJson()), TzInvoiceApply::getInvoiceTitleJson, bo.getInvoiceTitleJson()); + lqw.like(StringUtils.isNotBlank(bo.getInvoiceContent()), TzInvoiceApply::getInvoiceContent, bo.getInvoiceContent()); + lqw.like(StringUtils.isNotBlank(bo.getOrderIds()), TzInvoiceApply::getOrderIds, bo.getOrderIds()); + lqw.eq(bo.getInvoiceTitleId() != null, TzInvoiceApply::getInvoiceTitleId, bo.getInvoiceTitleId()); + lqw.eq(bo.getInvoiceType() != null, TzInvoiceApply::getInvoiceType, bo.getInvoiceType()); + lqw.eq(StringUtils.isNotBlank(bo.getEmail()), TzInvoiceApply::getEmail, bo.getEmail()); + lqw.eq(bo.getStatus() != null, TzInvoiceApply::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, TzInvoiceApply::getDelFlag, bo.getDelFlag()); + lqw.like(StringUtils.isNotBlank(bo.getRemark()), TzInvoiceApply::getRemark, bo.getRemark()); + lqw.between(params.get("beginInvoiceTime") != null && params.get("endInvoiceTime") != null, + TzInvoiceApply::getInvoiceTime,params.get("beginInvoiceTime"), params.get("endInvoiceTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzInvoiceApply::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增发票申请记录 + * + * @param bo 发票申请记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzInvoiceApplyBo bo) { + //更新订单状态为已开票 + List orderIds = Arrays.stream(bo.getOrderIds().split(",")).map(Long::parseLong).toList(); + List orderItemsList = orderItemMapper.selectList(Wrappers.lambdaQuery(HyOrderItem.class) + .in(HyOrderItem::getId, orderIds)); + //判断订单是否已开票 + if (orderItemsList.stream().anyMatch(item -> item.getIsSfkp() == 2)) { + throw new ServiceException("订单已开票"); + } + orderItemMapper.update(null, + Wrappers.lambdaUpdate(HyOrderItem.class) + .set(HyOrderItem::getIsSfkp, 2) + .in(HyOrderItem::getId, orderIds) + ); + bo.setCreateTime(new Date()); + TzInvoiceApply add = MapstructUtils.convert(bo, TzInvoiceApply.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改发票申请记录 + * + * @param bo 发票申请记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzInvoiceApplyBo bo) { + TzInvoiceApply update = MapstructUtils.convert(bo, TzInvoiceApply.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除发票申请记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public Boolean cancelApply(Long id) { + // 查询发票申请 + TzInvoiceApply apply = baseMapper.selectById(id); + if (apply == null) { + throw new ServiceException("发票申请不存在"); + } + + // 更新发票申请状态为已取消(5) + TzInvoiceApply update = new TzInvoiceApply(); + update.setId(id); + update.setStatus(5); + boolean success = baseMapper.updateById(update) > 0; + + if (success) { + // 更新订单开票状态为未开票(1) + List orderIds = Arrays.stream(apply.getOrderIds().split(",")) + .map(Long::parseLong) + .toList(); + orderItemMapper.update(null, + Wrappers.lambdaUpdate(HyOrderItem.class) + .set(HyOrderItem::getIsSfkp, 1) + .in(HyOrderItem::getId, orderIds) + ); + } + return success; + } + + /** + * 根据订单ID查询发票申请记录 + * + * @param orderId + * @param userId + */ + @Override + public TzInvoiceApplyVo queryByOrderId(Long orderId, Long userId) { + return baseMapper.selectVoOne(Wrappers.lambdaQuery(TzInvoiceApply.class) + .eq(TzInvoiceApply::getOrderIds, orderId) + .eq(TzInvoiceApply::getUserId, userId) + .eq(TzInvoiceApply::getDelFlag, 1) + .orderByDesc(TzInvoiceApply::getCreateTime) + .last("limit 1")); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceTitleServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceTitleServiceImpl.java new file mode 100644 index 0000000..2876a1d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzInvoiceTitleServiceImpl.java @@ -0,0 +1,160 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzInvoiceTitle; +import org.dromara.mall.domain.bo.TzInvoiceTitleBo; +import org.dromara.mall.domain.vo.TzInvoiceTitleVo; +import org.dromara.mall.mapper.TzInvoiceTitleMapper; +import org.dromara.mall.service.ITzInvoiceTitleService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 发票抬头信息Service业务层处理 + * + * @author Maosw + * @date 2024-12-25 + */ +@RequiredArgsConstructor +@Service +public class TzInvoiceTitleServiceImpl extends ServiceImpl implements ITzInvoiceTitleService { + + private final TzInvoiceTitleMapper baseMapper; + + /** + * 查询发票抬头信息 + * + * @param id 主键 + * @return 发票抬头信息 + */ + @Override + public TzInvoiceTitleVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询发票抬头信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 发票抬头信息分页列表 + */ + @Override + public TableDataInfo queryPageList(TzInvoiceTitleBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzInvoiceTitle::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的发票抬头信息列表 + * + * @param bo 查询条件 + * @return 发票抬头信息列表 + */ + @Override + public List queryList(TzInvoiceTitleBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzInvoiceTitleBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzInvoiceTitle::getUserId, bo.getUserId()); + lqw.eq(bo.getType() != null, TzInvoiceTitle::getType, bo.getType()); + lqw.like(StringUtils.isNotBlank(bo.getTitleName()), TzInvoiceTitle::getTitleName, bo.getTitleName()); + lqw.eq(StringUtils.isNotBlank(bo.getTaxNumber()), TzInvoiceTitle::getTaxNumber, bo.getTaxNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getCompanyAddress()), TzInvoiceTitle::getCompanyAddress, bo.getCompanyAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getCompanyPhone()), TzInvoiceTitle::getCompanyPhone, bo.getCompanyPhone()); + lqw.like(StringUtils.isNotBlank(bo.getBankName()), TzInvoiceTitle::getBankName, bo.getBankName()); + lqw.eq(StringUtils.isNotBlank(bo.getBankAccount()), TzInvoiceTitle::getBankAccount, bo.getBankAccount()); + lqw.eq(bo.getIsDefault() != null, TzInvoiceTitle::getIsDefault, bo.getIsDefault()); + lqw.eq(StringUtils.isNotBlank(bo.getEmail()), TzInvoiceTitle::getEmail, bo.getEmail()); + lqw.eq(bo.getDelFlag() != null, TzInvoiceTitle::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzInvoiceTitle::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增发票抬头信息 + * + * @param bo 发票抬头信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzInvoiceTitleBo bo) { + bo.setCreateTime(new Date()); + // 如果设置为默认抬头,则将该用户的其他抬头设为非默认 + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzInvoiceTitle::getIsDefault, 2) + .eq(TzInvoiceTitle::getUserId, bo.getUserId()) + .eq(TzInvoiceTitle::getDelFlag, 1)); + } + TzInvoiceTitle add = MapstructUtils.convert(bo, TzInvoiceTitle.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改发票抬头信息 + * + * @param bo 发票抬头信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzInvoiceTitleBo bo) { + // 如果设置为默认抬头,则将该用户的其他抬头设为非默认 + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + baseMapper.update(null, + Wrappers.lambdaUpdate() + .set(TzInvoiceTitle::getIsDefault, 2) + .eq(TzInvoiceTitle::getUserId, bo.getUserId()) + .eq(TzInvoiceTitle::getDelFlag, 1)); + } + TzInvoiceTitle update = MapstructUtils.convert(bo, TzInvoiceTitle.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除发票抬头信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + TzInvoiceTitle update = new TzInvoiceTitle(); + update.setDelFlag(2); + return baseMapper.update(update, new LambdaQueryWrapper() + .in(TzInvoiceTitle::getId, ids)) > 0; + } + + @Override + public IPage queryPageListAPP(TzInvoiceTitleBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(TzInvoiceTitle::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzMessageServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzMessageServiceImpl.java new file mode 100644 index 0000000..f73e028 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzMessageServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzMessageBo; +import org.dromara.mall.domain.vo.TzMessageVo; +import org.dromara.mall.domain.TzMessage; +import org.dromara.mall.mapper.TzMessageMapper; +import org.dromara.mall.service.ITzMessageService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzMessageServiceImpl implements ITzMessageService { + + private final TzMessageMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzMessageVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzMessageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzMessageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzMessageBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzMessage::getUserName, bo.getUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getEmail()), TzMessage::getEmail, bo.getEmail()); + lqw.eq(StringUtils.isNotBlank(bo.getContact()), TzMessage::getContact, bo.getContact()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzMessage::getContent, bo.getContent()); + lqw.eq(StringUtils.isNotBlank(bo.getReply()), TzMessage::getReply, bo.getReply()); + lqw.eq(bo.getStatus() != null, TzMessage::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzMessageBo bo) { + TzMessage add = MapstructUtils.convert(bo, TzMessage.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzMessageBo bo) { + TzMessage update = MapstructUtils.convert(bo, TzMessage.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzMessage entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzNoticeServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzNoticeServiceImpl.java new file mode 100644 index 0000000..4cc6856 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzNoticeServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzNotice; +import org.dromara.mall.domain.bo.TzNoticeBo; +import org.dromara.mall.domain.vo.TzNoticeVo; +import org.dromara.mall.mapper.TzNoticeMapper; +import org.dromara.mall.service.ITzNoticeService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 公告Service业务层处理 + * + * @author Maosw + * @date 2025-01-13 + */ +@RequiredArgsConstructor +@Service +public class TzNoticeServiceImpl implements ITzNoticeService { + + private final TzNoticeMapper baseMapper; + + /** + * 查询公告 + * + * @param id 主键 + * @return 公告 + */ + @Override + public TzNoticeVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询公告列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 公告分页列表 + */ + @Override + public TableDataInfo queryPageList(TzNoticeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzNotice::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的公告列表 + * + * @param bo 查询条件 + * @return 公告列表 + */ + @Override + public List queryList(TzNoticeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzNoticeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TzNotice::getTitle, bo.getTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzNotice::getContent, bo.getContent()); + lqw.eq(bo.getStatus() != null, TzNotice::getStatus, bo.getStatus()); + lqw.eq(bo.getIsTop() != null, TzNotice::getIsTop, bo.getIsTop()); + lqw.eq(bo.getDelFlag() != null, TzNotice::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzNotice::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增公告 + * + * @param bo 公告 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzNoticeBo bo) { + TzNotice add = MapstructUtils.convert(bo, TzNotice.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改公告 + * + * @param bo 公告 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzNoticeBo bo) { + TzNotice update = MapstructUtils.convert(bo, TzNotice.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除公告信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 公告分页列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 公告分页列表 + */ + @Override + public IPage queryPageListAPP(TzNoticeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.select(TzNotice::getId, TzNotice::getTitle, TzNotice::getIsTop, TzNotice::getStatus, TzNotice::getCreateTime); + lqw.orderByDesc(TzNotice::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderAllServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderAllServiceImpl.java new file mode 100644 index 0000000..fbbde44 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderAllServiceImpl.java @@ -0,0 +1,347 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.TzOrder; +import org.dromara.mall.domain.TzOrderAll; +import org.dromara.mall.domain.TzOrderRecord; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.bo.TzOrderAllBo; +import org.dromara.mall.domain.bo.TzOrderBo; +import org.dromara.mall.domain.vo.TzOrderAllVo; +import org.dromara.mall.mapper.TzOrderAllMapper; +import org.dromara.mall.mapper.TzOrderMapper; +import org.dromara.mall.mapper.TzOrderRecordMapper; +import org.dromara.mall.mapper.TzProdMapper; +import org.dromara.mall.service.ITzOrderAllService; +import org.dromara.system.domain.SysUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 订单汇总Service业务层处理 + * + * @author Maosw + * @date 2024-09-04 + */ +@RequiredArgsConstructor +@Service +public class TzOrderAllServiceImpl extends MPJBaseServiceImpl implements ITzOrderAllService { + + private final TzOrderAllMapper baseMapper; + + private final TzProdMapper tzProdMapper; + + private final TzOrderMapper tzOrderMapper; + + private final TzOrderRecordMapper tzOrderRecordMapper; + + /** + * 查询订单汇总 + * + * @param id 主键 + * @return 订单汇总 + */ + @Override + public TzOrderAllVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单汇总列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单汇总分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderAllBo bo, PageQuery pageQuery) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderAll.class) + .selectAs(SysUser::getNickName, TzOrderAllVo::getSName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderAll::getUserId) + .eq(TzOrderAll::getDeleteStatus,0) + .orderByDesc(TzOrderAll::getId); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzOrderAllVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 查询符合条件的订单汇总列表 + * + * @param bo 查询条件 + * @return 订单汇总列表 + */ + @Override + public List queryList(TzOrderAllBo bo) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderAll.class) + .selectAs(SysUser::getNickName, TzOrderAllVo::getSName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderAll::getUserId) + .eq(TzOrderAll::getDeleteStatus,0) + .orderByDesc(TzOrderAll::getId); + return baseMapper.selectVoList(wrapper); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(TzOrderAllBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getSaleId() != null, TzOrderAll::getSaleId, bo.getSaleId()); + lqw.eq(bo.getTotal() != null, TzOrderAll::getTotal, bo.getTotal()); + lqw.eq(bo.getActualTotal() != null, TzOrderAll::getActualTotal, bo.getActualTotal()); + lqw.like(StringUtils.isNotBlank(bo.getOrderNum()), TzOrder::getOrderNum, bo.getOrderNum()); + lqw.eq(bo.getPayState() != null, TzOrderAll::getPayState, bo.getPayState()); + lqw.like(StringUtils.isNotBlank(bo.getCName()), TzOrderAll::getCName, bo.getCName()); + lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), TzOrderAll::getRemarks, bo.getRemarks()); + lqw.eq(bo.getStatus() != null, TzOrderAll::getStatus, bo.getStatus()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzOrderAll::getUserName, bo.getUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getUserPhone()), TzOrderAll::getUserPhone, bo.getUserPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getUserAddress()), TzOrderAll::getUserAddress, bo.getUserAddress()); + lqw.eq(bo.getProductNums() != null, TzOrderAll::getProductNums, bo.getProductNums()); + lqw.eq(bo.getFinallyTime() != null, TzOrderAll::getFinallyTime, bo.getFinallyTime()); + lqw.eq(bo.getCancelTime() != null, TzOrderAll::getCancelTime, bo.getCancelTime()); + lqw.eq(bo.getRefundSts() != null, TzOrderAll::getRefundSts, bo.getRefundSts()); + lqw.eq(bo.getCloseType() != null, TzOrderAll::getCloseType, bo.getCloseType()); + lqw.eq(bo.getDeleteStatus() != null, TzOrderAll::getDeleteStatus, bo.getDeleteStatus()); + return lqw; + } + + /** + * 新增订单汇总 + * + * @param bo 订单汇总 + * @return 是否新增成功 + */ + @Override + @Transactional + public Boolean insertByBo(TzOrderAllBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + bo.setSaleId(loginUser.getUserId()); + BigDecimal price = bo.getList().stream().map(f -> new BigDecimal(String.valueOf(f.getTotal()))).reduce(BigDecimal.ZERO, BigDecimal::add); + bo.setTotal(price); + bo.setProductNums(bo.getList().size()); + bo.setCreateTime(new Date()); + bo.setOrderNum("Z"+genItemId()); + TzOrderAll add = MapstructUtils.convert(bo, TzOrderAll.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + List list = new ArrayList<>(); + for(TzOrderBo orderBo : bo.getList()) { + TzProd tzProd = tzProdMapper.selectOne(new LambdaQueryWrapper().eq(TzProd::getProdId, orderBo.getProdId())); + orderBo.setAllId(add.getId()); + orderBo.setUserId(add.getUserId()); + orderBo.setSaleId(loginUser.getUserId()); + orderBo.setOrderNum(genItemId()); + orderBo.setCreateTime(new Date()); + orderBo.setStatus(1); + orderBo.setTenantId(tzProd.getTenantId()); + orderBo.setUserName(bo.getUserName()); + orderBo.setUserPhone(bo.getUserPhone()); + orderBo.setUserAddress(bo.getUserAddress()); + + //批量添加 + TzOrder order = MapstructUtils.convert(orderBo, TzOrder.class); + list.add(order); + insertOrderRecord(add.getId(),String.valueOf(order.getOrderId()),"新增订单","新增子订单:"+order.getOrderId()+" 成功",null,null); + } +// insertOrderRecord(add.getId(), null,"新增总订单","新增总订单成功",null,null); + return tzOrderMapper.insertBatch(list); + } + return false; + } + + /** + * 修改订单汇总 + * + * @param bo 订单汇总 + * @return 是否修改成功 + */ + @Override + @Transactional + public Boolean updateByBo(TzOrderAllBo bo) { + //去除关闭的订单 + List tzOrderList = new ArrayList<>(); + if(bo.getList().isEmpty()){ + List delListOrder = tzOrderMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getAllId,bo.getId()).eq(TzOrder::getDeleteStatus,0)); + List delIds = delListOrder.stream().map(TzOrder::getOrderId).collect(Collectors.toList()); + StringJoiner joiner = new StringJoiner(","); + for (Long id : delIds){ + joiner.add(String.valueOf(id)); + } + insertOrderRecord(bo.getId(), joiner.toString(),"删除子订单","删除子订单:"+joiner.toString()+"成功",null,null); + return tzOrderMapper.deleteByIds(delIds) > 0; + } + + List newList = new ArrayList<>(); + for(TzOrderBo orderBo : bo.getList()) { + TzOrder tzOrder = MapstructUtils.convert(orderBo, TzOrder.class); + if(orderBo.getStatus() == null || orderBo.getStatus() != 7){ + tzOrderList.add(tzOrder); + } + newList.add(tzOrder); + } + + BigDecimal price = tzOrderList.stream().map(f -> new BigDecimal(String.valueOf(f.getTotal()))).reduce(BigDecimal.ZERO, BigDecimal::add); + bo.setRefundSts(1); + bo.setTotal(price); + bo.setProductNums(bo.getList().size()); + bo.setUpdateTime(new Date()); + TzOrderAll update = MapstructUtils.convert(bo, TzOrderAll.class); + + List listOrder = tzOrderMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getAllId,bo.getId()).eq(TzOrder::getDeleteStatus,0)); + if (!listOrder.isEmpty() && !newList.isEmpty()) { + //删除子订单 + List oldIds = listOrder.stream().map(TzOrder::getOrderId).collect(Collectors.toList()); + List newIds = newList.stream().map(TzOrder::getOrderId).collect(Collectors.toList()); + List rIds = subList(oldIds,newIds); + if(!rIds.isEmpty()){ + StringJoiner joiner = new StringJoiner(","); + for (Long id : rIds){ + joiner.add(String.valueOf(id)); + } + tzOrderMapper.deleteByIds(rIds); + insertOrderRecord(bo.getId(),joiner.toString(),"删除子订单","删除子订单:"+joiner.toString()+"成功",null,null); + } + + List list = new ArrayList<>(); + for (TzOrder tzOrder : newList) { + for(TzOrder tzOrder1 : listOrder){ + if(tzOrder.getOrderId() == null){ + tzOrder.setAllId(tzOrder1.getAllId()); + tzOrder.setSaleId(tzOrder1.getUserId()); + tzOrder.setOrderNum(genItemId()); + tzOrder.setCreateTime(new Date()); + tzOrder.setTenantId(tzOrder1.getTenantId()); + tzOrder.setStatus(1); + tzOrder.setUserName(bo.getUserName()); + tzOrder.setUserPhone(bo.getUserPhone()); + tzOrder.setUserAddress(bo.getUserAddress()); + tzOrderMapper.insert(tzOrder); + insertOrderRecord(bo.getId(),String.valueOf(tzOrder.getOrderId()),"新增子订单","新增子订单:"+tzOrder.getOrderId()+"成功",null,null); + }else if(tzOrder.getOrderId().equals(tzOrder1.getOrderId())){ + JSONObject oldJson = new JSONObject(tzOrder1); + JSONObject newJson = new JSONObject(tzOrder); + + boolean isEqual = tzOrder.getTotal().equals(tzOrder1.getTotal()); + if(!isEqual){ + insertOrderRecord(bo.getId(),String.valueOf(tzOrder1.getOrderId()),"修改子订单","修改子订单:"+tzOrder1.getOrderId()+"成功,修改前价格:"+tzOrder1.getTotal()+",修改后价格:"+tzOrder.getTotal(),oldJson,newJson); + }else { + insertOrderRecord(bo.getId(),String.valueOf(tzOrder1.getOrderId()),"修改子订单","修改子订单:"+tzOrder1.getOrderId()+"成功",oldJson,newJson); + } + list.add(tzOrder); + } + } + } + tzOrderMapper.updateBatchById(list); + } + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除订单汇总信息 + * + * @param id 待删除的主键集合 + * @return 是否删除成功 + */ + @Override + @Transactional + public Boolean deleteWithValidByIds(Long id) { + TzOrderAll tzOrderAll = baseMapper.selectById(id); + if(tzOrderAll.getStatus() != 1){ + throw new ServiceException("该订单状态不可关闭"); + } + List list = tzOrderMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getAllId, id).eq(TzOrder::getDeleteStatus, 0)); + for (TzOrder tzOrder : list) { + if(tzOrder.getStatus() != 1){ + throw new ServiceException("该订单下有子订单状态不可关闭"); + } + tzOrder.setStatus(7); + } + tzOrderAll.setStatus(4); + insertOrderRecord(id, null,"关闭总订单","关闭总订单成功",null,null); + return baseMapper.updateById(tzOrderAll) > 0; + } + + /** + * 总订单确认 + * + * @param id + * @return + */ + @Override + public Boolean confirm(Long id) { + TzOrderAll tzOrderAll = baseMapper.selectById(id); + tzOrderAll.setRefundSts(2); + return baseMapper.updateById(tzOrderAll) > 0; + } + + /** + * 差集(基于API解法) 适用于小数据量 + * 求List1中有的但是List2中没有的元素 + * 时间复杂度 O(list1.size() * list2.size()) + */ + public static List subList(List list1, List list2) { + list1.removeAll(list2); + return list1; + } + + /** + * 订单操作历史记录 + * @param orderId + * @param type + * @param content + * @param oldJson + * @param newJson + * @return + */ + public Boolean insertOrderRecord(Long allId, String orderId, String type, String content, JSONObject oldJson, JSONObject newJson) { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzOrderRecord orderRecord = new TzOrderRecord(); + + orderRecord.setAllId(allId); + if (orderId != null){ + orderRecord.setOrderId(orderId); + } + orderRecord.setType(type); + orderRecord.setContent(content); + orderRecord.setUserId(loginUser.getUserId()); + orderRecord.setCreateTime(new Date()); + if(oldJson != null){ + orderRecord.setOldJson(oldJson.toString()); + } + if(newJson != null){ + orderRecord.setNewJson(newJson.toString()); + } + return tzOrderRecordMapper.insert(orderRecord) > 0; + } + + public static String genItemId() { + //取当前时间的长整形值包含毫秒 + long millis = System.currentTimeMillis(); + //加上两位随机数 + Random random = new Random(); + int end2 = random.nextInt(99); + //如果不足两位前面补0 + return "DD" + millis + String.format("%02d", end2); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderItemServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderItemServiceImpl.java new file mode 100644 index 0000000..4852b9e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderItemServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderItem; +import org.dromara.mall.domain.bo.TzOrderItemBo; +import org.dromara.mall.domain.vo.TzOrderItemVo; +import org.dromara.mall.mapper.TzOrderItemMapper; +import org.dromara.mall.service.ITzOrderItemService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 订单项Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzOrderItemServiceImpl implements ITzOrderItemService { + + private final TzOrderItemMapper baseMapper; + + /** + * 查询订单项 + * + * @param orderItemId 主键 + * @return 订单项 + */ + @Override + public TzOrderItemVo queryById(Long orderItemId){ + return baseMapper.selectVoById(orderItemId); + } + + /** + * 分页查询订单项列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单项分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderItemBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的订单项列表 + * + * @param bo 查询条件 + * @return 订单项列表 + */ + @Override + public List queryList(TzOrderItemBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzOrderItemBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShopId() != null, TzOrderItem::getShopId, bo.getShopId()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNumber()), TzOrderItem::getOrderNumber, bo.getOrderNumber()); + lqw.eq(bo.getProdId() != null, TzOrderItem::getProdId, bo.getProdId()); + lqw.eq(bo.getSkuId() != null, TzOrderItem::getSkuId, bo.getSkuId()); + lqw.eq(bo.getProdCount() != null, TzOrderItem::getProdCount, bo.getProdCount()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzOrderItem::getProdName, bo.getProdName()); + lqw.like(StringUtils.isNotBlank(bo.getSkuName()), TzOrderItem::getSkuName, bo.getSkuName()); + lqw.eq(StringUtils.isNotBlank(bo.getPic()), TzOrderItem::getPic, bo.getPic()); + lqw.eq(bo.getPrice() != null, TzOrderItem::getPrice, bo.getPrice()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzOrderItem::getUserId, bo.getUserId()); + lqw.eq(bo.getProductTotalAmount() != null, TzOrderItem::getProductTotalAmount, bo.getProductTotalAmount()); + lqw.eq(bo.getRecTime() != null, TzOrderItem::getRecTime, bo.getRecTime()); + lqw.eq(bo.getCommSts() != null, TzOrderItem::getCommSts, bo.getCommSts()); + lqw.eq(StringUtils.isNotBlank(bo.getDistributionCardNo()), TzOrderItem::getDistributionCardNo, bo.getDistributionCardNo()); + lqw.eq(bo.getBasketDate() != null, TzOrderItem::getBasketDate, bo.getBasketDate()); + return lqw; + } + + /** + * 新增订单项 + * + * @param bo 订单项 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzOrderItemBo bo) { + TzOrderItem add = MapstructUtils.convert(bo, TzOrderItem.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOrderItemId(add.getOrderItemId()); + } + return flag; + } + + /** + * 修改订单项 + * + * @param bo 订单项 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderItemBo bo) { + TzOrderItem update = MapstructUtils.convert(bo, TzOrderItem.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除订单项信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderReceiveServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderReceiveServiceImpl.java new file mode 100644 index 0000000..bf28cbd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderReceiveServiceImpl.java @@ -0,0 +1,359 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.TzCustomer; +import org.dromara.mall.domain.TzCustomerRecord; +import org.dromara.mall.domain.TzOrderReceive; +import org.dromara.mall.domain.bo.TzOrderReceiveBo; +import org.dromara.mall.domain.vo.HyOrderPaymentVo; +import org.dromara.mall.domain.vo.TzOrderReceiveSumVo; +import org.dromara.mall.domain.vo.TzOrderReceiveVo; +import org.dromara.mall.mapper.TzCustomerMapper; +import org.dromara.mall.mapper.TzCustomerRecordMapper; +import org.dromara.mall.mapper.TzOrderMapper; +import org.dromara.mall.mapper.TzOrderReceiveMapper; +import org.dromara.mall.service.ITzOrderReceiveService; +import org.dromara.system.domain.SysUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 订单汇款Service业务层处理 + * + * @author Maosw + * @date 2024-09-03 + */ +@RequiredArgsConstructor +@Service +public class TzOrderReceiveServiceImpl extends MPJBaseServiceImpl implements ITzOrderReceiveService { + + private final TzOrderReceiveMapper baseMapper; + + private final TzOrderReceiveMapper orderReceiveMapper; + + private final TzOrderMapper tzOrderMapper; + + private final TzCustomerMapper tzCustomerMapper; + + private final TzCustomerRecordMapper tzCustomerRecordMapper; + + /** + * 查询订单汇款 + * + * @param id 主键 + * @return 订单汇款 + */ + @Override + public TzOrderReceiveVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单汇款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单汇款分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderReceiveBo bo, PageQuery pageQuery) { + if(!LoginHelper.isSuperAdmin()){ + LoginUser loginUser = LoginHelper.getLoginUser(); + if("kf_user".equals(loginUser.getUserType())){ +// bo.setUserId(loginUser.getUserId()); + bo.setStatus(1); + }else if("cw_user".equals(loginUser.getUserType())){ + bo.setCwId(loginUser.getUserId()); + } + } + + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderReceive.class) + .selectAs("s.nick_name", TzOrderReceiveVo::getUserName) + .selectAs("c.nick_name", HyOrderPaymentVo::getCwName) + .selectAs(TzCustomer::getName, TzOrderReceiveVo::getCName) + .leftJoin(SysUser.class,"s",SysUser::getUserId,TzOrderReceive::getUserId) + .leftJoin(SysUser.class,"c",SysUser::getUserId,TzOrderReceive::getCwId) + .leftJoin(TzCustomer.class,TzCustomer::getId,TzOrderReceive::getCId) + .eq(TzOrderReceive::getDelFlag,0) + .orderByDesc(TzOrderReceive::getId); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzOrderReceiveVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 查询符合条件的订单汇款列表 + * + * @param bo 查询条件 + * @return 订单汇款列表 + */ + @Override + public List queryList(TzOrderReceiveBo bo) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderReceive.class) + .selectAs("s.nick_name", TzOrderReceiveVo::getUserName) + .selectAs("c.nick_name", HyOrderPaymentVo::getCwName) + .selectAs(TzCustomer::getName, TzOrderReceiveVo::getCName) + .leftJoin(SysUser.class,"s",SysUser::getUserId,TzOrderReceive::getUserId) + .leftJoin(SysUser.class,"c",SysUser::getUserId,TzOrderReceive::getCwId) + .leftJoin(TzCustomer.class,TzCustomer::getId,TzOrderReceive::getCId) + .eq(TzOrderReceive::getDelFlag,0) + .orderByDesc(TzOrderReceive::getId); + return baseMapper.selectVoList(wrapper); + } + + + /** + * 查询订单汇款列表统计 + * + * @param bo + * @return + */ + @Override + public TzOrderReceiveSumVo queryListCount(TzOrderReceiveBo bo) { + // 验证输入参数 + if (bo == null) { + throw new IllegalArgumentException("Input parameter 'bo' cannot be null"); + } + + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderReceive.class) + .selectAs("s.nick_name", TzOrderReceiveVo::getUserName) + .selectAs("c.nick_name", HyOrderPaymentVo::getCwName) + .selectAs(TzCustomer::getName, TzOrderReceiveVo::getCName) + .leftJoin(SysUser.class, "s", SysUser::getUserId, TzOrderReceive::getUserId) + .leftJoin(SysUser.class, "c", SysUser::getUserId, TzOrderReceive::getCwId) + .leftJoin(TzCustomer.class, TzCustomer::getId, TzOrderReceive::getCId) + .orderByDesc(TzOrderReceive::getId); + + List list = baseMapper.selectList(wrapper.eq(TzOrderReceive::getDelFlag, 0)); + + // 处理空列表情况 + if (list == null || list.isEmpty()) { + return new TzOrderReceiveSumVo(); + } + + Long count = (long) list.size(); + Long drlsh = list.stream().filter(f -> f.getStatus() == 1).count(); + + BigDecimal zje = list.stream().map(f -> new BigDecimal(f.getTotal().toString())).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal drlje = list.stream().filter(f -> f.getStatus() == 1).map(f -> new BigDecimal(f.getTotal().toString())).reduce(BigDecimal.ZERO, BigDecimal::add); + + List list1 = baseMapper.selectList(wrapper.eq(TzOrderReceive::getDelFlag, 1)); + Long zfsh = (long) list1.size(); + BigDecimal zfje = list1.stream().map(f -> new BigDecimal(f.getTotal().toString())).reduce(BigDecimal.ZERO, BigDecimal::add); + + TzOrderReceiveSumVo vo = new TzOrderReceiveSumVo(); + vo.setZsl(count); + vo.setDrlsh(drlsh); + vo.setZje(zje); + vo.setDrlje(drlje); + vo.setZfsl(zfsh); + vo.setZfje(zfje); + return vo; + } + + + private MPJLambdaWrapper buildQueryMPJWrapper(TzOrderReceiveBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getCId() != null, TzOrderReceive::getCId, bo.getCId()); + lqw.eq(bo.getUserId() != null, TzOrderReceive::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getReceiveInfo()), TzOrderReceive::getReceiveInfo, bo.getReceiveInfo()); + lqw.like(StringUtils.isNotBlank(bo.getUserCode()), "s.user_code", bo.getUserCode()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), "s.nick_name", bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getCwName()), "c.nick_name", bo.getCwName()); + lqw.like(StringUtils.isNotBlank(bo.getCName()), TzCustomer::getName, bo.getCName()); + lqw.eq(bo.getTotal() != null, TzOrderReceive::getTotal, bo.getTotal()); + lqw.eq(bo.getStatus() != null, TzOrderReceive::getStatus, bo.getStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getDepict()), TzOrderReceive::getDepict, bo.getDepict()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentImg()), TzOrderReceive::getPaymentImg, bo.getPaymentImg()); + lqw.eq(bo.getType() != null, TzOrderReceive::getType, bo.getType()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + TzOrderReceive::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.between(params.get("adoptBeginTime") != null && params.get("adoptEndTime") != null, + TzOrderReceive::getAdoptTime, params.get("adoptBeginTime"), params.get("adoptEndTime")); + return lqw; + } + + /** + * 新增订单汇款 + * + * @param bo 订单汇款 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzOrderReceiveBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + if(ObjectUtil.isEmpty(bo.getCreateTime())){ + bo.setCreateTime(new Date()); + } + bo.setCwId(loginUser.getUserId()); + TzOrderReceive add = MapstructUtils.convert(bo, TzOrderReceive.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改订单汇款 + * + * @param bo 订单汇款 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderReceiveBo bo) { + TzOrderReceive orderReceive = baseMapper.selectById(bo.getId()); + if(orderReceive.getStatus() == 2){ + throw new ServiceException("该订单不允许修改"); + } + TzOrderReceive update = MapstructUtils.convert(bo, TzOrderReceive.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 领取汇款(客服) + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean receive(TzOrderReceiveBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + + TzOrderReceive orderReceive = baseMapper.selectById(bo.getId()); + if(orderReceive.getStatus() == 2){ + throw new ServiceException("该汇款已经被领取过啦"); + } + TzCustomer customer = tzCustomerMapper.selectById(bo.getUserId()); + customer.setBalance(customer.getBalance().add(orderReceive.getTotal())); + tzCustomerMapper.updateById(customer); + + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(1); + customerRecord.setPrice(orderReceive.getTotal()); + customerRecord.setBalance(customer.getBalance().add(orderReceive.getTotal())); + customerRecord.setDepict("客户汇款充值"); + customerRecord.setCreateTime(new Date()); + tzCustomerRecordMapper.insert(customerRecord); + + orderReceive.setCId(customer.getId()); + orderReceive.setUserId(loginUser.getUserId()); + orderReceive.setStatus(2); + orderReceive.setAdoptTime(new Date()); + return baseMapper.updateById(orderReceive) > 0; + } + + /** + * 回退汇款(财务) + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean fallback(TzOrderReceiveBo bo) { + TzOrderReceive orderReceive = baseMapper.selectById(bo.getId()); + if(orderReceive.getStatus() == 1){ + throw new ServiceException("该汇款未被领取,不可回退"); + } + TzCustomer customer = tzCustomerMapper.selectById(orderReceive.getCId()); + + BigDecimal price = customer.getBalance().subtract(orderReceive.getTotal()); + if(price.compareTo(BigDecimal.ZERO) < 0){ + throw new ServiceException("回退失败,客户余额不足"); + } + customer.setBalance(price); + tzCustomerMapper.updateById(customer); + + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(3); + customerRecord.setPrice(orderReceive.getTotal()); + customerRecord.setBalance(price); + customerRecord.setDepict("汇款回退"); + customerRecord.setCreateTime(new Date()); + tzCustomerRecordMapper.insert(customerRecord); + + orderReceive.setUserId(null); + orderReceive.setCId(null); + orderReceive.setStatus(1); + orderReceive.setAdoptTime(null); + return baseMapper.updateById(orderReceive) > 0; + } + + /** + * 审核汇款(财务) + * @param bo + * @return + */ + @Override + @Transactional + public Boolean examine(TzOrderReceiveBo bo) { + TzOrderReceive orderReceive = baseMapper.selectById(bo.getId()); + if(bo.getStatus() == 2){ + TzCustomer customer = tzCustomerMapper.selectById(orderReceive.getCId()); + customer.setBalance(customer.getBalance().add(orderReceive.getTotal())); + tzCustomerMapper.updateById(customer); + + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(1); + customerRecord.setPrice(orderReceive.getTotal()); + customerRecord.setBalance(customer.getBalance().add(orderReceive.getTotal())); + customerRecord.setDepict("客户汇款充值"); + customerRecord.setCreateTime(new Date()); + tzCustomerRecordMapper.insert(customerRecord); + + orderReceive.setStatus(2); + }else if(bo.getStatus() == 3){ + orderReceive.setStatus(3); + orderReceive.setDepict(bo.getDepict()); + } + return baseMapper.updateById(orderReceive) > 0; + } + + + /** + * 作废汇款(财务) + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + List list = baseMapper.selectByIds(ids); + list.stream().forEach(f ->f.setDelFlag(1)); + return baseMapper.updateBatchById(list); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRecordServiceImpl.java new file mode 100644 index 0000000..22d912f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRecordServiceImpl.java @@ -0,0 +1,160 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.TzOrderRecord; +import org.dromara.mall.domain.bo.TzOrderRecordBo; +import org.dromara.mall.domain.vo.TzOrderRecordVo; +import org.dromara.mall.mapper.TzOrderRecordMapper; +import org.dromara.mall.service.ITzOrderRecordService; +import org.dromara.system.domain.SysUser; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 订单修改记录Service业务层处理 + * + * @author Lion Li + * @date 2024-08-03 + */ +@RequiredArgsConstructor +@Service +public class TzOrderRecordServiceImpl extends MPJBaseServiceImpl implements ITzOrderRecordService { + + private final TzOrderRecordMapper baseMapper; + + /** + * 查询订单修改记录 + * + * @param id 主键 + * @return 订单修改记录 + */ + @Override + public TzOrderRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单修改记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单修改记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderRecordBo bo, PageQuery pageQuery) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderRecord.class) + .selectAs(SysUser::getNickName,TzOrderRecordVo::getUserName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderRecord::getUserId) + .orderByAsc(TzOrderRecord::getId); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzOrderRecordVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 查询符合条件的订单修改记录列表 + * + * @param bo 查询条件 + * @return 订单修改记录列表 + */ + @Override + public List queryList(TzOrderRecordBo bo) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderRecord.class) + .selectAs(SysUser::getNickName,TzOrderRecordVo::getUserName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderRecord::getUserId) + .orderByAsc(TzOrderRecord::getId); + return baseMapper.selectVoList(wrapper); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(TzOrderRecordBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getAllId() != null, TzOrderRecord::getAllId, bo.getAllId()); + lqw.like(StringUtils.isNotBlank(bo.getOrderId()), TzOrderRecord::getOrderId, bo.getOrderId()); + lqw.eq(bo.getUserId() != null, TzOrderRecord::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getOldJson()), TzOrderRecord::getOldJson, bo.getOldJson()); + lqw.eq(StringUtils.isNotBlank(bo.getNewJson()), TzOrderRecord::getNewJson, bo.getNewJson()); + lqw.eq(bo.getCreateTime() != null, TzOrderRecord::getCreateTime, bo.getCreateTime()); + return lqw; + } + + /** + * 新增订单修改记录 + * + * @param bo 订单修改记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzOrderRecordBo bo) { + TzOrderRecord add = MapstructUtils.convert(bo, TzOrderRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改订单修改记录 + * + * @param bo 订单修改记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderRecordBo bo) { + TzOrderRecord update = MapstructUtils.convert(bo, TzOrderRecord.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 订单操作历史记录 + * @param orderId + * @param type + * @param content + * @return + */ + @Override + public Boolean insertOrderRecord(Long allId, String orderId, String type, String content) { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzOrderRecord orderRecord = new TzOrderRecord(); + + orderRecord.setAllId(allId); + orderRecord.setOrderId(orderId); + orderRecord.setType(type); + orderRecord.setContent(content); + orderRecord.setUserId(loginUser.getUserId()); + orderRecord.setCreateTime(new Date()); + return baseMapper.insert(orderRecord) > 0; + } + + /** + * 校验并批量删除订单修改记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRefundServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRefundServiceImpl.java new file mode 100644 index 0000000..af5fff9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderRefundServiceImpl.java @@ -0,0 +1,144 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderRefund; +import org.dromara.mall.domain.bo.TzOrderRefundBo; +import org.dromara.mall.domain.vo.TzOrderRefundVo; +import org.dromara.mall.mapper.TzOrderRefundMapper; +import org.dromara.mall.service.ITzOrderRefundService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzOrderRefundServiceImpl implements ITzOrderRefundService { + + private final TzOrderRefundMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param refundId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzOrderRefundVo queryById(Long refundId){ + return baseMapper.selectVoById(refundId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderRefundBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzOrderRefundBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzOrderRefundBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShopId() != null, TzOrderRefund::getShopId, bo.getShopId()); + lqw.eq(bo.getOrderId() != null, TzOrderRefund::getOrderId, bo.getOrderId()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNumber()), TzOrderRefund::getOrderNumber, bo.getOrderNumber()); + lqw.eq(bo.getOrderAmount() != null, TzOrderRefund::getOrderAmount, bo.getOrderAmount()); + lqw.eq(bo.getOrderItemId() != null, TzOrderRefund::getOrderItemId, bo.getOrderItemId()); + lqw.eq(StringUtils.isNotBlank(bo.getRefundSn()), TzOrderRefund::getRefundSn, bo.getRefundSn()); + lqw.eq(StringUtils.isNotBlank(bo.getFlowTradeNo()), TzOrderRefund::getFlowTradeNo, bo.getFlowTradeNo()); + lqw.eq(StringUtils.isNotBlank(bo.getOutRefundNo()), TzOrderRefund::getOutRefundNo, bo.getOutRefundNo()); + lqw.eq(bo.getPayType() != null, TzOrderRefund::getPayType, bo.getPayType()); + lqw.like(StringUtils.isNotBlank(bo.getPayTypeName()), TzOrderRefund::getPayTypeName, bo.getPayTypeName()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzOrderRefund::getUserId, bo.getUserId()); + lqw.eq(bo.getGoodsNum() != null, TzOrderRefund::getGoodsNum, bo.getGoodsNum()); + lqw.eq(bo.getRefundAmount() != null, TzOrderRefund::getRefundAmount, bo.getRefundAmount()); + lqw.eq(bo.getApplyType() != null, TzOrderRefund::getApplyType, bo.getApplyType()); + lqw.eq(bo.getRefundSts() != null, TzOrderRefund::getRefundSts, bo.getRefundSts()); + lqw.eq(bo.getReturnMoneySts() != null, TzOrderRefund::getReturnMoneySts, bo.getReturnMoneySts()); + lqw.eq(bo.getApplyTime() != null, TzOrderRefund::getApplyTime, bo.getApplyTime()); + lqw.eq(bo.getHandelTime() != null, TzOrderRefund::getHandelTime, bo.getHandelTime()); + lqw.eq(bo.getRefundTime() != null, TzOrderRefund::getRefundTime, bo.getRefundTime()); + lqw.eq(StringUtils.isNotBlank(bo.getPhotoFiles()), TzOrderRefund::getPhotoFiles, bo.getPhotoFiles()); + lqw.eq(StringUtils.isNotBlank(bo.getBuyerMsg()), TzOrderRefund::getBuyerMsg, bo.getBuyerMsg()); + lqw.eq(StringUtils.isNotBlank(bo.getSellerMsg()), TzOrderRefund::getSellerMsg, bo.getSellerMsg()); + lqw.like(StringUtils.isNotBlank(bo.getExpressName()), TzOrderRefund::getExpressName, bo.getExpressName()); + lqw.eq(StringUtils.isNotBlank(bo.getExpressNo()), TzOrderRefund::getExpressNo, bo.getExpressNo()); + lqw.eq(bo.getShipTime() != null, TzOrderRefund::getShipTime, bo.getShipTime()); + lqw.eq(bo.getReceiveTime() != null, TzOrderRefund::getReceiveTime, bo.getReceiveTime()); + lqw.eq(StringUtils.isNotBlank(bo.getReceiveMessage()), TzOrderRefund::getReceiveMessage, bo.getReceiveMessage()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzOrderRefundBo bo) { + TzOrderRefund add = MapstructUtils.convert(bo, TzOrderRefund.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRefundId(add.getRefundId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderRefundBo bo) { + TzOrderRefund update = MapstructUtils.convert(bo, TzOrderRefund.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderServiceImpl.java new file mode 100644 index 0000000..8b6fdc0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderServiceImpl.java @@ -0,0 +1,1050 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.OrderPayBo; +import org.dromara.mall.domain.bo.TzOrderBo; +import org.dromara.mall.domain.vo.TzCustomerVo; +import org.dromara.mall.domain.vo.TzOrderSumVo; +import org.dromara.mall.domain.vo.TzOrderVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.ITzOrderService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.SysUser; +import org.dromara.system.mapper.SysTenantMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 订单Service业务层处理 + * + * @author Maosw + * @date 2024-08-03 + */ +@RequiredArgsConstructor +@Service +public class TzOrderServiceImpl extends MPJBaseServiceImpl implements ITzOrderService { + + private final TzOrderMapper baseMapper; + + private final HyOrderPaymentMapper orderPaymentMapper; + + private final SysTenantMapper tenantMapper; + + private final TzProdMapper tzProdMapper; + + private final TzOrderRecordMapper tzOrderRecordMapper; + + private final TzOrderAllMapper tzOrderAllMapper; + + private final TzCustomerMapper tzCustomerMapper; + + private final TzCustomerRecordMapper tzCustomerRecordMapper; + + private static final Logger log = LogManager.getLogger(TzOrderServiceImpl.class); + + /** + * 查询订单 + * + * @param orderId 主键 + * @return 订单 + */ + @Override + public TzOrderVo queryById(Long orderId) { + return baseMapper.selectVoById(orderId); + } + + /** + * 分页查询订单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderBo bo, PageQuery pageQuery) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrder.class) + .selectAs("concat(round(t.pay_price/t.total * 100),'%')",TzOrderVo::getBili) + .selectAs("s.nick_name", TzOrderVo::getSname) + .selectAs("b.nick_name", TzOrderVo::getBname) + .selectAs(TzCustomer::getName, TzOrderVo::getCname) + .selectAs(SysTenant::getCompanyName, TzOrderVo::getTenantName) + .selectAs(TzProd::getOriPrice, TzOrderVo::getOriPrice) + .selectAs(TzProd::getUnit, TzOrderVo::getUnit) + .leftJoin(SysUser.class, "s", SysUser::getUserId, TzOrder::getSaleId) + .leftJoin(SysUser.class, "b", SysUser::getUserId, TzOrder::getBuyerId) + .leftJoin(TzCustomer.class, TzCustomer::getId, TzOrder::getUserId) + .leftJoin(SysTenant.class, SysTenant::getTenantId, TzOrder::getTenantId) + .leftJoin(TzProd.class, TzProd::getProdId, TzOrder::getProdId) + .eq(TzOrder::getDeleteStatus, 0) + .orderByDesc(TzOrder::getOrderId); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzOrderVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 查询符合条件的订单列表 + * + * @param bo 查询条件 + * @return 订单列表 + */ + @Override + public List queryList(TzOrderBo bo) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrder.class) + .selectAs("s.nick_name", TzOrderVo::getSname) + .selectAs("b.nick_name", TzOrderVo::getBname) + .selectAs(TzCustomer::getName, TzOrderVo::getCname) + .selectAs(SysTenant::getCompanyName, TzOrderVo::getTenantName) + .selectAs(TzProd::getOriPrice, TzOrderVo::getOriPrice) + .selectAs(TzProd::getUnit, TzOrderVo::getUnit) + .leftJoin(SysUser.class, "s", SysUser::getUserId, TzOrder::getSaleId) + .leftJoin(SysUser.class, "b", SysUser::getUserId, TzOrder::getBuyerId) + .leftJoin(TzCustomer.class, TzCustomer::getId, TzOrder::getUserId) + .leftJoin(SysTenant.class, SysTenant::getTenantId, TzOrder::getTenantId) + .leftJoin(TzProd.class, TzProd::getProdId, TzOrder::getProdId) + .eq(TzOrder::getDeleteStatus, 0) + .orderByDesc(TzOrder::getOrderId); + return baseMapper.selectVoList(wrapper); + } + + + + /** + * 查询订单列表统计(客服) + * + * @param bo + * @return + */ + @Override + public TzOrderSumVo queryListCount(TzOrderBo bo) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrder.class) + .selectAs("s.nick_name", TzOrderVo::getSname) + .selectAs("b.nick_name", TzOrderVo::getBname) + .selectAs(TzCustomer::getName, TzOrderVo::getCname) + .selectAs(SysTenant::getCompanyName, TzOrderVo::getTenantName) + .selectAs(TzProd::getOriPrice, TzOrderVo::getOriPrice) + .selectAs(TzProd::getUnit, TzOrderVo::getUnit) + .leftJoin(SysUser.class, "s", SysUser::getUserId, TzOrder::getSaleId) + .leftJoin(SysUser.class, "b", SysUser::getUserId, TzOrder::getBuyerId) + .leftJoin(TzCustomer.class, TzCustomer::getId, TzOrder::getUserId) + .leftJoin(SysTenant.class, SysTenant::getTenantId, TzOrder::getTenantId) + .leftJoin(TzProd.class, TzProd::getProdId, TzOrder::getProdId) + .eq(TzOrder::getDeleteStatus, 0) + .orderByDesc(TzOrder::getOrderId); + + List list = baseMapper.selectList(wrapper); + + TzOrderSumVo tzOrderSumVo = new TzOrderSumVo(); + + // 处理空指针异常 + long ddzsl = (list != null ? list.size() : 0); + BigDecimal ddzje = BigDecimal.ZERO; + BigDecimal yfkje = BigDecimal.ZERO; + long ywcddsl = 0; + long dfhsl = 0; + long dshsl = 0; + long dfksl = 0; + + for (TzOrder order : list) { + if (order == null){ + continue; + } + + // 计算总金额 + try { + ddzje = ddzje.add(new BigDecimal(String.valueOf(order.getTotal()))); + } catch (NumberFormatException e) { + // 可以记录日志或采取其他措施 + } + + // 计算已付款金额 + try { + yfkje = yfkje.add(new BigDecimal(String.valueOf(order.getPayPrice()))); + } catch (NumberFormatException e) { + // 可以记录日志或采取其他措施 + } + + // 统计订单状态 + int status = order.getStatus(); + if (status == 5 || status == 6) { + ywcddsl++; + } else if (status == 2 || status == 3) { + dfhsl++; + } else if (status == 4) { + dshsl++; + } + + // 统计未付款订单数量 + if (order.getPayState() != 3) { + dfksl++; + } + } + + BigDecimal dfkje = ddzje.subtract(yfkje); + + tzOrderSumVo.setDdzsl(ddzsl); + tzOrderSumVo.setDfksl(dfksl); + tzOrderSumVo.setDdzje(ddzje); + tzOrderSumVo.setDfkje(dfkje); + tzOrderSumVo.setYfkje(yfkje); + tzOrderSumVo.setYwcddsl(ywcddsl); + tzOrderSumVo.setDfhsl(dfhsl); + tzOrderSumVo.setDshsl(dshsl); + + return tzOrderSumVo; + } + + + + /** + * 查询订单列表统计(采购) + * + * @param bo + * @return + */ + @Override + public TzOrderSumVo queryListCountCG(TzOrderBo bo) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrder.class) + .selectAs("s.nick_name", TzOrderVo::getSname) + .selectAs("b.nick_name", TzOrderVo::getBname) + .selectAs(TzCustomer::getName, TzOrderVo::getCname) + .selectAs(SysTenant::getCompanyName, TzOrderVo::getTenantName) + .selectAs(TzProd::getOriPrice, TzOrderVo::getOriPrice) + .selectAs(TzProd::getUnit, TzOrderVo::getUnit) + .leftJoin(SysUser.class, "s", SysUser::getUserId, TzOrder::getSaleId) + .leftJoin(SysUser.class, "b", SysUser::getUserId, TzOrder::getBuyerId) + .leftJoin(TzCustomer.class, TzCustomer::getId, TzOrder::getUserId) + .leftJoin(SysTenant.class, SysTenant::getTenantId, TzOrder::getTenantId) + .leftJoin(TzProd.class, TzProd::getProdId, TzOrder::getProdId) + .eq(TzOrder::getDeleteStatus, 0) + .orderByDesc(TzOrder::getOrderId); + + List list = baseMapper.selectList(wrapper); + + TzOrderSumVo tzOrderSumVo = new TzOrderSumVo(); + long ddzsl = list.size(); + BigDecimal ddzje = list.stream() + .filter(Objects::nonNull) + .map(f -> new BigDecimal(String.valueOf(f.getActualTotal()))) + .reduce(BigDecimal.ZERO, BigDecimal::add); + long dcgsl = list.stream() + .filter(Objects::nonNull) + .filter(f -> f.getStatus() == 2) + .count(); + long dfhsl = list.stream() + .filter(Objects::nonNull) + .filter(f -> f.getStatus() == 3) + .count(); + long dqrsl = list.stream() + .filter(Objects::nonNull) + .filter(f -> f.getRefundSts() == 1) + .count(); + long dshsl = list.stream() + .filter(Objects::nonNull) + .filter(f -> f.getStatus() == 4) + .count(); + long ywcddsl = list.stream() + .filter(Objects::nonNull) + .filter(f -> f.getStatus() == 5 || f.getStatus() == 6) + .count(); + + tzOrderSumVo.setDdzsl(ddzsl); + tzOrderSumVo.setDdzje(ddzje); + tzOrderSumVo.setDcgsl(dcgsl); + tzOrderSumVo.setDfhsl(dfhsl); + tzOrderSumVo.setDqrsl(dqrsl); + tzOrderSumVo.setDshsl(dshsl); + tzOrderSumVo.setYwcddsl(ywcddsl); + return tzOrderSumVo; + } + + + private MPJLambdaWrapper buildQueryMPJWrapper(TzOrderBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getOrderId() != null, TzOrder::getOrderId, bo.getOrderId()); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), TzOrder::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getProdCode()), TzOrder::getProdCode, bo.getProdCode()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzOrder::getProdName, bo.getProdName()); + lqw.like(StringUtils.isNotBlank(bo.getSkuCode()), TzOrder::getSkuCode, bo.getSkuCode()); + lqw.like(StringUtils.isNotBlank(bo.getSkuName()), TzOrder::getSkuName, bo.getSkuName()); + lqw.like(StringUtils.isNotBlank(bo.getCname()), TzCustomer::getName, bo.getCname()); + lqw.like(StringUtils.isNotBlank(bo.getSname()), "s.nick_name", bo.getSname()); + lqw.like(StringUtils.isNotBlank(bo.getBname()), "b.nick_name", bo.getBname()); + lqw.eq(bo.getSaleId() != null, TzOrder::getSaleId, bo.getSaleId()); + lqw.eq(bo.getAllId() != null, TzOrder::getAllId, bo.getAllId()); + lqw.eq(bo.getBuyerId() != null, TzOrder::getBuyerId, bo.getBuyerId()); + lqw.eq(bo.getUserId() != null, TzOrder::getUserId, bo.getUserId()); + + lqw.like(StringUtils.isNotBlank(bo.getOrderNum()), TzOrder::getOrderNum, bo.getOrderNum()); + lqw.like(StringUtils.isNotBlank(bo.getRemarks()), TzOrder::getRemarks, bo.getRemarks()); + if (bo.getCloseFlag() == 2) { + lqw.ne(bo.getStatus() != null, TzOrder::getStatus, 7); + } else { + if (bo.getStatus() != null) { + lqw.eq(TzOrder::getStatus, bo.getStatus()); + } else { + lqw.ne(TzOrder::getStatus, 7); + } + } + lqw.eq(StringUtils.isNotBlank(bo.getDvyFlowId()), TzOrder::getDvyFlowId, bo.getDvyFlowId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzOrder::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getUserPhone()), TzOrder::getUserPhone, bo.getUserPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getUserAddress()), TzOrder::getUserAddress, bo.getUserAddress()); + lqw.eq(bo.getPayState() != null, TzOrder::getPayState, bo.getPayState()); + lqw.eq(bo.getIsPayed() != null, TzOrder::getIsPayed, bo.getIsPayed()); + lqw.eq(bo.getOrderType() != null, TzOrder::getOrderType, bo.getOrderType()); + lqw.eq(bo.getCloseType() != null, TzOrder::getCloseType, bo.getCloseType()); + lqw.eq(bo.getDeleteStatus() != null, TzOrder::getDeleteStatus, bo.getDeleteStatus()); + lqw.eq(bo.getCreateDept() != null, TzOrder::getCreateDept, bo.getCreateDept()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + TzOrder::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.between(params.get("payBeginTime") != null && params.get("payEndTime") != null, + TzOrder::getPayTime, params.get("payBeginTime"), params.get("payEndTime")); + lqw.between(params.get("dvyBeginTime") != null && params.get("dvyEndTime") != null, + TzOrder::getDvyTime, params.get("dvyBeginTime"), params.get("dvyEndTime")); + return lqw; + } + + /** + * 新增订单 + * + * @param bo 订单 + * @return 是否新增成功 + */ + @Override + @Transactional + public Boolean insertByBo(TzOrderBo bo) { + TzOrderAll tzOrderAll = tzOrderAllMapper.selectById(bo.getAllId()); + LoginUser loginUser = LoginHelper.getLoginUser(); + bo.setSaleId(loginUser.getUserId()); + TzProd tzProd = tzProdMapper.selectOne(new LambdaQueryWrapper().eq(TzProd::getProdId, bo.getProdId())); + bo.setUserId(tzOrderAll.getUserId()); + bo.setRefundSts(1); + bo.setOrderNum(genItemId()); + bo.setCreateTime(new Date()); + bo.setTenantId(tzProd.getTenantId()); + bo.setUserName(tzOrderAll.getUserName()); + bo.setUserPhone(tzOrderAll.getUserPhone()); + bo.setUserAddress(tzOrderAll.getUserAddress()); + TzOrder add = MapstructUtils.convert(bo, TzOrder.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + List list = baseMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getAllId, bo.getAllId()).eq(TzOrder::getDeleteStatus, 0)); + BigDecimal price = list.stream().map(f -> new BigDecimal(String.valueOf(f.getTotal()))).reduce(BigDecimal.ZERO, BigDecimal::add); + + tzOrderAll.setRefundSts(1); + tzOrderAll.setTotal(price.add(bo.getTotal())); + tzOrderAll.setProductNums(tzOrderAll.getProductNums() + 1); + tzOrderAll.setUpdateTime(new Date()); + tzOrderAllMapper.updateById(tzOrderAll); + insertOrderRecord(tzOrderAll.getId(), String.valueOf(add.getOrderId()), "新增订单", "新增订单:" + add.getOrderId() + " 成功", null, null); + } + return flag; + } + + /** + * 修改订单 + * + * @param bo 订单 + * @return 是否修改成功 + */ + @Override + @Transactional + public Boolean updateByBo(TzOrderBo bo) { + bo.setRefundSts(1); + TzOrder update = MapstructUtils.convert(bo, TzOrder.class); + + TzOrder order = baseMapper.selectById(bo.getOrderId()); + if (order.getStatus() != 1 && order.getStatus() != 2) { + throw new ServiceException("该状态不可修改"); + } + + JSONObject oldJson = new JSONObject(update); + JSONObject newJson = new JSONObject(bo); + boolean isEqual = order.getTotal().equals(bo.getTotal()); + if (!isEqual) { + updateGJ(bo); + } + if (baseMapper.updateById(update) > 0) { + TzOrderAll tzOrderAll = tzOrderAllMapper.selectById(bo.getAllId()); + List list = baseMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getAllId, bo.getAllId()).eq(TzOrder::getDeleteStatus, 0).ne(TzOrder::getStatus, 7)); + BigDecimal price = list.stream().map(f -> new BigDecimal(String.valueOf(f.getTotal()))).reduce(BigDecimal.ZERO, BigDecimal::add); + tzOrderAll.setRefundSts(1); + tzOrderAll.setTotal(price); + tzOrderAll.setUpdateTime(new Date()); + insertOrderRecord(tzOrderAll.getId(), String.valueOf(update.getOrderId()), "修改订单", "修改订单:" + update.getOrderId() + " 成功", oldJson, newJson); + return tzOrderAllMapper.updateById(tzOrderAll) > 0; + } + return false; + } + + /** + * 修改订单 + * + * @param bo + * @return + */ + @Override + public Boolean updateByTzOrderBo(TzOrderBo bo) { + TzOrder update = MapstructUtils.convert(bo, TzOrder.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 提交打款信息(采购) + * + * @param bo 订单 + * @return + */ + @Override + @Transactional + public Boolean remitInfo(TzOrderBo bo) { + List orderIdList = new ArrayList<>(); + + for (OrderPayBo payBo : bo.getPayList()) { + orderIdList.add(payBo.getOrderId()); + } + + // 确保 LoginUser 不为空 + LoginUser loginUser = LoginHelper.getLoginUser(); + if (loginUser == null) { + throw new ServiceException("登录用户信息无效"); + } + + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, orderIdList)); + + if (bo.getTenantId().isBlank()) { + throw new ServiceException("租户ID不能为空"); + } + SysTenant sysTenant = tenantMapper.selectOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, bo.getTenantId())); + + // 使用 StringBuilder 替换 StringJoiner,避免 SQL 注入 + StringBuilder orderIdBuilder = new StringBuilder(); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (!tzOrder.getTenantId().equals(bo.getTenantId())) { + throw new ServiceException("选择的订单不是同一厂家的"); + } + if (tzOrder.getIsPayed() == 1) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "有在途打款订单信息,请勿重复提交"); + } + if (tzOrder.getPayState() != 3) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "未付清,不可以提交打款"); + } + orderIdBuilder.append(tzOrder.getOrderId()).append(","); + allId = tzOrder.getAllId(); + } + + // 去掉最后一个逗号 + String orderIdStr = orderIdBuilder.toString(); + if (orderIdStr.length() > 0) { + orderIdStr = orderIdStr.substring(0, orderIdStr.length() - 1); + } + + List orderList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + TzOrder tzOrder = new TzOrder(); + tzOrder.setOrderId(payBo.getOrderId()); + tzOrder.setActualTotal(payBo.getPayPrice()); + tzOrder.setIsPayed(1); + orderList.add(tzOrder); + } + + /*HyOrderPayment tzOrderPayment = new HyOrderPayment(); + tzOrderPayment.setOrderId(orderIdStr); + tzOrderPayment.setTenantId(sysTenant.getTenantId()); + tzOrderPayment.setAddUserId(loginUser.getUserId()); + tzOrderPayment.setStatus(1); + tzOrderPayment.setTotal(bo.getTotal()); + tzOrderPayment.setDepict(bo.getDescribe()); + tzOrderPayment.setCreateTime(new Date()); + tzOrderPayment.setPayeeName(sysTenant.getPayeeName()); + tzOrderPayment.setPayeeBank(sysTenant.getPayeeBank()); + tzOrderPayment.setPayeeBankNum(sysTenant.getPayeeBankNum()); + tzOrderPayment.setType(1); + orderPaymentMapper.insert(tzOrderPayment);*/ + + try { + insertOrderRecord(allId, orderIdStr, "提交打款", "订单:" + orderIdStr + " 提交打款成功!金额:" + bo.getTotal(), null, null); + } catch (Exception e) { + log.error("插入订单记录失败", e); + throw new ServiceException("插入订单记录失败"); + } + + return baseMapper.updateBatchById(orderList); + } + + + /** + * 客服改价 + * @param bo + * @return + */ + @Override + @Transactional + public Boolean updateGJ(TzOrderBo bo) { + TzOrder update = baseMapper.selectById(bo.getOrderId()); + if (update.getStatus() == 4 || update.getStatus() == 5 || update.getStatus() == 6) { + throw new ServiceException("该状态不可改价"); + } + BigDecimal price = update.getTotal().subtract(bo.getTotal()); + + if (price.compareTo(BigDecimal.ZERO) == 0) { + throw new ServiceException("修改金额不能与原金额一样"); + } + + update.setTotal(bo.getTotal()); + + if (price.compareTo(BigDecimal.ZERO) < 0) { + if (update.getPayState() == 3) { + update.setPayState(2); + } + } else if (price.compareTo(BigDecimal.ZERO) > 0) { + if (update.getPayState() == 3) { + update.setPayState(3); + TzCustomer customer = tzCustomerMapper.selectById(update.getUserId()); + customer.setBalance(customer.getBalance().add(price)); + if (tzCustomerMapper.updateById(customer) > 0) { + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(3); + customerRecord.setPrice(price); + customerRecord.setBalance(customer.getBalance()); + customerRecord.setDepict("订单改价退回,订单:" + update.getOrderId()); + customerRecord.setCreateTime(new Date()); + tzCustomerRecordMapper.insert(customerRecord); + } else { + throw new ServiceException("更新客户余额失败"); + } + } + } + + if (update.getStatus() == 2 || update.getStatus() == 3) { + update.setEndPrice(bo.getTotal().subtract(update.getPayPrice())); + } + + update.setRefundSts(1); + + if (baseMapper.updateById(update) > 0) { + TzOrderAll tzOrderAll = tzOrderAllMapper.selectById(update.getAllId()); + List list = baseMapper.selectList(new LambdaQueryWrapper() + .eq(TzOrder::getAllId, update.getAllId()) + .eq(TzOrder::getDeleteStatus, 0) + .ne(TzOrder::getStatus, 7)); + + BigDecimal priceAll = list.stream() + .map(TzOrder::getTotal) + .reduce(BigDecimal.ZERO, BigDecimal::add); + + tzOrderAll.setPayState(list.stream() + .anyMatch(tzOrder -> tzOrder.getPayState() == 1 || tzOrder.getPayState() == 2) ? 2 : 3); + tzOrderAll.setRefundSts(1); + tzOrderAll.setTotal(priceAll); + tzOrderAll.setEndPrice(priceAll.subtract(update.getPayPrice())); + tzOrderAll.setUpdateTime(new Date()); + + JSONObject oldJson = new JSONObject(update); + JSONObject newJson = new JSONObject(bo); + insertOrderRecord(tzOrderAll.getId(), String.valueOf(bo.getOrderId()), "客服改价", + "订单:" + bo.getOrderId() + " 改价成功!修改前价格:" + update.getTotal() + ";修改后价格:" + bo.getTotal(), + oldJson, newJson); + + return tzOrderAllMapper.updateById(tzOrderAll) > 0; + } + return false; + } + + /** + * 订单支付 + */ + @Override + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) + public Boolean payOrder(TzOrderBo bo) { + // 参数校验 + if (bo == null || bo.getUserId() == null || bo.getOrderId() == null || bo.getPayAmount() == null) { + throw new IllegalArgumentException("参数不能为空"); + } + + TzCustomer customer = tzCustomerMapper.selectById(bo.getUserId()); + if (bo.getPayOrderType() == 1) { + throw new ServiceException("不支持总订单支付,请联系管理员"); + } + + if (bo.getPayOrderType() == 2) { + TzOrder order = baseMapper.selectById(bo.getOrderId()); + BigDecimal price = customer.getBalance().subtract(bo.getPayAmount()); + + if (price.compareTo(BigDecimal.ZERO) < 0) { + throw new ServiceException("客户余额不足"); + } + + customer.setBalance(price); + tzCustomerMapper.updateById(customer); + + BigDecimal payPrice = order.getPayPrice().add(bo.getPayAmount()); + BigDecimal endPrice = order.getTotal().subtract(payPrice); + + if (endPrice.compareTo(BigDecimal.ZERO) < 0) { + throw new ServiceException("输入金额大于尾款金额"); + } else if (endPrice.compareTo(BigDecimal.ZERO) == 0) { + order.setStatus(2); + order.setPayState(3); + } else if (endPrice.compareTo(BigDecimal.ZERO) > 0) { + order.setPayState(2); + } + + order.setPayPrice(payPrice); + order.setEndPrice(endPrice); + order.setPayTime(new Date()); + baseMapper.updateById(order); + + TzOrderAll orderAll = tzOrderAllMapper.selectById(order.getAllId()); + BigDecimal payPriceAll = orderAll.getPayPrice().add(bo.getPayAmount()); + BigDecimal endPriceAll = orderAll.getTotal().subtract(payPriceAll); + + orderAll.setStatus(2); + if (endPriceAll.compareTo(BigDecimal.ZERO) == 0) { + orderAll.setPayState(3); + } else if (endPriceAll.compareTo(BigDecimal.ZERO) > 0) { + orderAll.setPayState(2); + } + + orderAll.setPayPrice(payPriceAll); + orderAll.setEndPrice(endPriceAll); + + insertOrderRecord(orderAll.getId(), String.valueOf(bo.getOrderId()), "订单支付", "订单:" + order.getOrderId() + " 支付成功!支付金额:" + bo.getPayAmount(), null, null); + + if (tzOrderAllMapper.updateById(orderAll) > 0) { + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(2); + customerRecord.setPrice(bo.getPayAmount()); + customerRecord.setBalance(price); + customerRecord.setDepict("订单支付,订单:" + order.getOrderId()); + customerRecord.setCreateTime(new Date()); + return tzCustomerRecordMapper.insert(customerRecord) > 0; + } + } + return false; + } + + + + /** + * 修改收货地址 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean editAddress(TzOrderBo bo) { + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (tzOrder.getStatus() == 5 || tzOrder.getStatus() == 6 || tzOrder.getStatus() == 7) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "状态不可修改地址"); + } + + tzOrder.setUserName(bo.getUserName()); + tzOrder.setUserPhone(bo.getUserPhone()); + tzOrder.setUserAddress(bo.getUserAddress()); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + insertOrderRecord(allId, String.valueOf(joiner), "修改收货地址", "订单:" + joiner + " 修改收货地址成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 订单发货 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean deliverGoods(TzOrderBo bo) { + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if(tzOrder.getPayState() != 3){ + throw new ServiceException("订单" + tzOrder.getOrderId() + "未付清,不可发货"); + } + + if (tzOrder.getStatus() != 3) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "状态不可发货"); + } + + tzOrder.setDvyPrice(bo.getDvyPrice()); + tzOrder.setDvyFlowId(bo.getDvyFlowId()); + tzOrder.setDvyType(bo.getDvyType()); + tzOrder.setDeliveryLocat(bo.getDeliveryLocat()); + tzOrder.setStatus(4); + tzOrder.setDvyTime(new Date()); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + insertOrderRecord(allId, String.valueOf(joiner), "订单发货", "订单:" + joiner + " 发货成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 修改快递单号 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean editExpress(TzOrderBo bo) { + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (tzOrder.getStatus() != 4) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "状态不可修改快递单号"); + } + tzOrder.setDvyFlowId(bo.getDvyFlowId()); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + insertOrderRecord(allId, String.valueOf(joiner), "修改快递单号", "订单:" + joiner + " 修改快递单号成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 标记已签收 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean signFeceipt(TzOrderBo bo) { + //查询签收时间超过七天的订单状态自动设置为已完成 + List list = baseMapper.selectList(new LambdaQueryWrapper().eq(TzOrder::getStatus, 5).eq(TzOrder::getDeleteStatus, 0).leSql(TzOrder::getFinallyTime,"DATE_SUB(NOW(), INTERVAL 7 DAY)")); + list.forEach(f -> f.setStatus(6)); + baseMapper.deleteByIds(list); + + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (tzOrder.getStatus() != 4) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "状态不可标记已签收"); + } + tzOrder.setStatus(5); + tzOrder.setFinallyTime(new Date()); + //增加销量 + updateSoldNum(tzOrder.getProdId()); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + insertOrderRecord(allId, String.valueOf(joiner), "标记签收", "订单:" + joiner + " 标记签收成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 标记已处理 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean processed(TzOrderBo bo) { + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (tzOrder.getRefundSts() == 2) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "已经处理过啦"); + } + tzOrder.setRefundSts(2); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + boolean exists = baseMapper.exists(new LambdaQueryWrapper().eq(TzOrder::getAllId, allId).eq(TzOrder::getRefundSts, 1).eq(TzOrder::getDeleteStatus, 0)); + if (!exists) { + TzOrderAll orderAll = tzOrderAllMapper.selectById(allId); + orderAll.setRefundSts(2); + tzOrderAllMapper.updateById(orderAll); + } + insertOrderRecord(allId, String.valueOf(joiner), "标记已处理", "订单:" + joiner + " 标记已处理成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 标记已采购 + * + * @param bo + * @return + */ + @Override + @Transactional + public Boolean purchased(TzOrderBo bo) { + List longList = new ArrayList<>(); + for (OrderPayBo payBo : bo.getPayList()) { + longList.add(payBo.getOrderId()); + } + List tzOrderList = baseMapper.selectList(new LambdaQueryWrapper().in(TzOrder::getOrderId, longList).eq(TzOrder::getDeleteStatus, 0)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder tzOrder : tzOrderList) { + if (tzOrder.getStatus() != 2) { + throw new ServiceException("订单" + tzOrder.getOrderId() + "状态不是待采购"); + } + tzOrder.setStatus(3); + + joiner.add(String.valueOf(tzOrder.getOrderId())); + allId = tzOrder.getAllId(); + } + insertOrderRecord(allId, String.valueOf(joiner), "标记已采购", "订单:" + joiner + " 标记已采购成功!", null, null); + return baseMapper.updateBatchById(tzOrderList); + } + + /** + * 获取客户信息和余额 + * + * @param type + * @param orderId + * @return + */ + @Override + public TzCustomerVo getUserInfo(Integer type, Integer orderId) { + TzCustomerVo tzCustomerVo = new TzCustomerVo(); + if (type == 1) { + TzOrderAll orderAll = tzOrderAllMapper.selectById(orderId); + tzCustomerVo = tzCustomerMapper.selectVoById(orderAll.getUserId()); + tzCustomerVo.setPrice(orderAll.getTotal().subtract(orderAll.getPayPrice())); + } else if (type == 2) { + TzOrder order = baseMapper.selectById(orderId); + tzCustomerVo = tzCustomerMapper.selectVoById(order.getUserId()); + tzCustomerVo.setPrice(order.getTotal().subtract(order.getPayPrice())); + } + return tzCustomerVo; + } + + /** + * 增加产品销量 + * + * @param prodId + * @return + */ + public Boolean updateSoldNum(Long prodId) { + LambdaUpdateWrapper lwq = new LambdaUpdateWrapper<>(); + lwq.eq(TzProd::getProdId, prodId); + lwq.setIncrBy(TzProd::getSoldNum, 1); + return tzProdMapper.update(lwq) > 0; + } + + /** + * 订单指派 + * + * @param bo + * @return + */ + @Override + public Boolean assign(TzOrderBo bo) { + TzOrder order = baseMapper.selectById(bo.getOrderId()); + order.setBuyerId(bo.getBuyerId()); + insertOrderRecord(order.getAllId(), String.valueOf(order.getOrderId()), "订单指派", "订单:" + order.getOrderId() + " 指派成功!", null, null); + return baseMapper.updateById(order) > 0; + } + + /** + * 定金采购 + * + * @param bo + * @return + */ + @Override + public Boolean depositPurchase(TzOrderBo bo) { + TzOrder order = baseMapper.selectById(bo.getOrderId()); + order.setStatus(2); + insertOrderRecord(order.getAllId(), String.valueOf(order.getOrderId()), "定金采购", "订单:" + order.getOrderId() + " 提交定金采购成功!", null, null); + return baseMapper.updateById(order) > 0; + } + + /** + * 关闭订单 + * + * @param orderId + * @return + */ + @Override + @Transactional + public Boolean closeOrder(Long[] orderId) { + LoginUser loginUser = LoginHelper.getLoginUser(); + + List list = baseMapper.selectByIds(Arrays.asList(orderId)); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder order : list) { + if (order.getStatus() == 1 || order.getStatus() == 2 || ("cw_user".equals(loginUser.getUserType()) && order.getStatus() == 3)) { + order.setStatus(7); + order.setCancelTime(new Date()); + joiner.add(String.valueOf(order.getOrderId())); + allId = order.getAllId(); + + if (order.getStatus() == 2 || order.getStatus() == 3) { + refundToCustomer(order); + } + }else { + throw new ServiceException("订单" + order.getOrderId() + "状态不可删除"); + } + } + updateOrderAllStatus(allId); + insertOrderRecord(allId, String.valueOf(joiner), "关闭订单", "订单:" + joiner + " 关闭成功!", null, null); + return baseMapper.updateBatchById(list); + } + + + private void refundToCustomer(TzOrder order) { + TzCustomer customer = tzCustomerMapper.selectById(order.getUserId()); + customer.setBalance(customer.getBalance().add(order.getPayPrice())); + if (tzCustomerMapper.updateById(customer) > 0) { + TzCustomerRecord customerRecord = new TzCustomerRecord(); + customerRecord.setUserId(customer.getId()); + customerRecord.setUserName(customer.getName()); + customerRecord.setType(3); + customerRecord.setPrice(order.getPayPrice()); + customerRecord.setBalance(customerRecord.getBalance().add(order.getPayPrice())); + customerRecord.setDepict("关闭订单退回,订单:" + order.getOrderId()); + customerRecord.setCreateTime(new Date()); + tzCustomerRecordMapper.insert(customerRecord); + } + } + + private void updateOrderAllStatus(Long allId) { + boolean exists = baseMapper.exists(new LambdaQueryWrapper().eq(TzOrder::getAllId, allId).ne(TzOrder::getStatus, 7).eq(TzOrder::getDeleteStatus, 0)); + if (!exists) { + TzOrderAll orderAll = tzOrderAllMapper.selectById(allId); + orderAll.setStatus(7); + orderAll.setCancelTime(new Date()); + tzOrderAllMapper.updateById(orderAll); + } + } + + /** + * 校验并批量删除订单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + @Transactional + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + List list = baseMapper.selectByIds(ids); + StringJoiner joiner = new StringJoiner(","); + Long allId = null; + for (TzOrder order : list) { + if (order.getStatus() == 1 || order.getStatus() == 2 || order.getStatus() == 7) { + joiner.add(String.valueOf(order.getOrderId())); + allId = order.getAllId(); + } else { + throw new ServiceException("订单" + order.getOrderId() + "状态不可删除"); + } + } + insertOrderRecord(allId, String.valueOf(joiner), "删除订单", "订单:" + joiner + " 删除成功!", null, null); + return baseMapper.deleteByIds(ids) > 0; + } + + + /** + * 订单操作历史记录 + * + * @param orderId + * @param type + * @param content + * @param oldJson + * @param newJson + * @return + */ + public Boolean insertOrderRecord(Long allId, String orderId, String type, String content, JSONObject oldJson, JSONObject newJson) { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzOrderRecord orderRecord = new TzOrderRecord(); + + orderRecord.setAllId(allId); + orderRecord.setOrderId(orderId); + orderRecord.setType(type); + orderRecord.setContent(content); + orderRecord.setUserId(loginUser.getUserId()); + orderRecord.setCreateTime(new Date()); + if (oldJson != null) { + orderRecord.setOldJson(oldJson.toString()); + } + if (newJson != null) { + orderRecord.setNewJson(newJson.toString()); + } + return tzOrderRecordMapper.insert(orderRecord) > 0; + } + + public static String genItemId() { + //取当前时间的长整形值包含毫秒 + long millis = System.currentTimeMillis(); + //加上两位随机数 + Random random = new Random(); + int end2 = random.nextInt(99); + //如果不足两位前面补0 + return "DD" + millis + String.format("%02d", end2); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderSettlementServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderSettlementServiceImpl.java new file mode 100644 index 0000000..a25511e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderSettlementServiceImpl.java @@ -0,0 +1,127 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzOrderSettlement; +import org.dromara.mall.domain.bo.TzOrderSettlementBo; +import org.dromara.mall.domain.vo.TzOrderSettlementVo; +import org.dromara.mall.mapper.TzOrderSettlementMapper; +import org.dromara.mall.service.ITzOrderSettlementService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzOrderSettlementServiceImpl implements ITzOrderSettlementService { + + private final TzOrderSettlementMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param settlementId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzOrderSettlementVo queryById(Long settlementId){ + return baseMapper.selectVoById(settlementId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderSettlementBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzOrderSettlementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzOrderSettlementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getPayNo()), TzOrderSettlement::getPayNo, bo.getPayNo()); + lqw.eq(StringUtils.isNotBlank(bo.getBizPayNo()), TzOrderSettlement::getBizPayNo, bo.getBizPayNo()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNumber()), TzOrderSettlement::getOrderNumber, bo.getOrderNumber()); + lqw.eq(bo.getPayType() != null, TzOrderSettlement::getPayType, bo.getPayType()); + lqw.like(StringUtils.isNotBlank(bo.getPayTypeName()), TzOrderSettlement::getPayTypeName, bo.getPayTypeName()); + lqw.eq(bo.getPayAmount() != null, TzOrderSettlement::getPayAmount, bo.getPayAmount()); + lqw.eq(bo.getIsClearing() != null, TzOrderSettlement::getIsClearing, bo.getIsClearing()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzOrderSettlement::getUserId, bo.getUserId()); + lqw.eq(bo.getClearingTime() != null, TzOrderSettlement::getClearingTime, bo.getClearingTime()); + lqw.eq(bo.getPayStatus() != null, TzOrderSettlement::getPayStatus, bo.getPayStatus()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzOrderSettlementBo bo) { + TzOrderSettlement add = MapstructUtils.convert(bo, TzOrderSettlement.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSettlementId(add.getSettlementId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderSettlementBo bo) { + TzOrderSettlement update = MapstructUtils.convert(bo, TzOrderSettlement.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderShareServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderShareServiceImpl.java new file mode 100644 index 0000000..3c754e5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzOrderShareServiceImpl.java @@ -0,0 +1,149 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.TzOrderShare; +import org.dromara.mall.domain.bo.TzOrderShareBo; +import org.dromara.mall.domain.vo.TzOrderShareVo; +import org.dromara.mall.mapper.TzOrderShareMapper; +import org.dromara.mall.service.ITzOrderShareService; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.SysUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 订单分享Service业务层处理 + * + * @author Maosw + * @date 2024-09-14 + */ +@RequiredArgsConstructor +@Service +public class TzOrderShareServiceImpl extends MPJBaseServiceImpl implements ITzOrderShareService { + + private final TzOrderShareMapper baseMapper; + + /** + * 查询订单分享 + * + * @param id 主键 + * @return 订单分享 + */ + @Override + public TzOrderShareVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询订单分享列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 订单分享分页列表 + */ + @Override + public TableDataInfo queryPageList(TzOrderShareBo bo, PageQuery pageQuery) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderShare.class) + .selectAs(SysUser::getNickName, TzOrderShareVo::getUserName) + .selectAs(SysTenant::getCompanyName, TzOrderShareVo::getTenantName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderShare::getUserId) + .leftJoin(SysTenant.class,SysTenant::getTenantId,TzOrderShare::getTenantId) + .orderByDesc(TzOrderShare::getCreateTime); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzOrderShareVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 查询符合条件的订单分享列表 + * + * @param bo 查询条件 + * @return 订单分享列表 + */ + @Override + public List queryList(TzOrderShareBo bo) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzOrderShare.class) + .selectAs(SysUser::getNickName, TzOrderShareVo::getUserName) + .selectAs(SysTenant::getCompanyName, TzOrderShareVo::getTenantName) + .leftJoin(SysUser.class,SysUser::getUserId,TzOrderShare::getUserId) + .leftJoin(SysTenant.class,SysTenant::getTenantId,TzOrderShare::getTenantId) + .orderByDesc(TzOrderShare::getCreateTime); + return baseMapper.selectVoList(wrapper); + } + + private MPJLambdaWrapper buildQueryMPJWrapper(TzOrderShareBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + return lqw; + } + + /** + * 新增订单分享 + * + * @param bo 订单分享 + * @return 是否新增成功 + */ + @Override + @Transactional + public Long insertByBo(TzOrderShareBo bo) { + LoginUser loginUser = LoginHelper.getLoginUser(); + + bo.setUserId(loginUser.getUserId()); + bo.setCreateTime(new Date()); + if(bo.getExpireTime() == null){ + Date newDate = DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, 2); + bo.setExpireTime(newDate); + } + TzOrderShare add = MapstructUtils.convert(bo, TzOrderShare.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return add.getId(); + } + + /** + * 修改订单分享 + * + * @param bo 订单分享 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzOrderShareBo bo) { + TzOrderShare update = MapstructUtils.convert(bo, TzOrderShare.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除订单分享信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPickAddrServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPickAddrServiceImpl.java new file mode 100644 index 0000000..8d0962e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPickAddrServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzPickAddrBo; +import org.dromara.mall.domain.vo.TzPickAddrVo; +import org.dromara.mall.domain.TzPickAddr; +import org.dromara.mall.mapper.TzPickAddrMapper; +import org.dromara.mall.service.ITzPickAddrService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户配送地址Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzPickAddrServiceImpl implements ITzPickAddrService { + + private final TzPickAddrMapper baseMapper; + + /** + * 查询用户配送地址 + * + * @param addrId 主键 + * @return 用户配送地址 + */ + @Override + public TzPickAddrVo queryById(Long addrId){ + return baseMapper.selectVoById(addrId); + } + + /** + * 分页查询用户配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配送地址分页列表 + */ + @Override + public TableDataInfo queryPageList(TzPickAddrBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户配送地址列表 + * + * @param bo 查询条件 + * @return 用户配送地址列表 + */ + @Override + public List queryList(TzPickAddrBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzPickAddrBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getAddrName()), TzPickAddr::getAddrName, bo.getAddrName()); + lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TzPickAddr::getAddr, bo.getAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getMobile()), TzPickAddr::getMobile, bo.getMobile()); + lqw.eq(bo.getProvinceId() != null, TzPickAddr::getProvinceId, bo.getProvinceId()); + lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TzPickAddr::getProvince, bo.getProvince()); + lqw.eq(bo.getCityId() != null, TzPickAddr::getCityId, bo.getCityId()); + lqw.eq(StringUtils.isNotBlank(bo.getCity()), TzPickAddr::getCity, bo.getCity()); + lqw.eq(bo.getAreaId() != null, TzPickAddr::getAreaId, bo.getAreaId()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), TzPickAddr::getArea, bo.getArea()); + lqw.eq(bo.getShopId() != null, TzPickAddr::getShopId, bo.getShopId()); + return lqw; + } + + /** + * 新增用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzPickAddrBo bo) { + TzPickAddr add = MapstructUtils.convert(bo, TzPickAddr.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAddrId(add.getAddrId()); + } + return flag; + } + + /** + * 修改用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzPickAddrBo bo) { + TzPickAddr update = MapstructUtils.convert(bo, TzPickAddr.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzPickAddr entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除用户配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPictureAlbumServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPictureAlbumServiceImpl.java new file mode 100644 index 0000000..caa23c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzPictureAlbumServiceImpl.java @@ -0,0 +1,147 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzPictureAlbum; +import org.dromara.mall.domain.bo.TzPictureAlbumBo; +import org.dromara.mall.domain.vo.TzPictureAlbumVo; +import org.dromara.mall.mapper.TzPictureAlbumMapper; +import org.dromara.mall.service.ITzPictureAlbumService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 画册Service业务层处理 + * + * @author Maosw + * @date 2024-10-04 + */ +@RequiredArgsConstructor +@Service +public class TzPictureAlbumServiceImpl implements ITzPictureAlbumService { + + private final TzPictureAlbumMapper baseMapper; + + /** + * 查询画册 + * + * @param id 主键 + * @return 画册 + */ + @Override + public TzPictureAlbumVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询画册列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 画册分页列表 + */ + @Override + public TableDataInfo queryPageList(TzPictureAlbumBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 画册列表 + * + * @param bo + * @param pageQuery + * @return + */ + @Override + public IPage pictureAlbumList(TzPictureAlbumBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + /** + * 查询符合条件的画册列表 + * + * @param bo 查询条件 + * @return 画册列表 + */ + @Override + public List queryList(TzPictureAlbumBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzPictureAlbumBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getType()), TzPictureAlbum::getType, bo.getType()); + lqw.like(StringUtils.isNotBlank(bo.getTitle()), TzPictureAlbum::getTitle, bo.getTitle()); + lqw.eq(bo.getStatus() != null, TzPictureAlbum::getStatus, bo.getStatus()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzPictureAlbum::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增画册 + * + * @param bo 画册 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzPictureAlbumBo bo) { + TzPictureAlbum add = MapstructUtils.convert(bo, TzPictureAlbum.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改画册 + * + * @param bo 画册 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzPictureAlbumBo bo) { + TzPictureAlbum update = MapstructUtils.convert(bo, TzPictureAlbum.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzPictureAlbum entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除画册信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdBrowseServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdBrowseServiceImpl.java new file mode 100644 index 0000000..cafc757 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdBrowseServiceImpl.java @@ -0,0 +1,161 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.TzProdBrowse; +import org.dromara.mall.domain.bo.TzProdBrowseBo; +import org.dromara.mall.domain.vo.TzProdBrowseVo; +import org.dromara.mall.domain.vo.TzProdVo; +import org.dromara.mall.mapper.TzProdBrowseMapper; +import org.dromara.mall.mapper.TzProdMapper; +import org.dromara.mall.service.ITzProdBrowseService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 商品浏览Service业务层处理 + * + * @author Maosw + * @date 2024-08-05 + */ +@RequiredArgsConstructor +@Service +public class TzProdBrowseServiceImpl implements ITzProdBrowseService { + + private final TzProdBrowseMapper baseMapper; + + private final TzProdMapper prodMapper; + + /** + * 查询商品浏览 + * + * @param id 主键 + * @return 商品浏览 + */ + @Override + public TzProdBrowseVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询商品浏览列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品浏览分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdBrowseBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的商品浏览列表 + * + * @param bo 查询条件 + * @return 商品浏览列表 + */ + @Override + public List queryList(TzProdBrowseBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdBrowseBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzProdBrowse::getProdId, bo.getProdId()); + lqw.eq(bo.getUserId() != null, TzProdBrowse::getUserId, bo.getUserId()); + lqw.eq(bo.getCreateTime() != null, TzProdBrowse::getCreateTime, bo.getCreateTime()); + return lqw; + } + + /** + * 新增商品浏览 + * + * @param bo 商品浏览 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdBrowseBo bo) { + TzProdBrowse add = MapstructUtils.convert(bo, TzProdBrowse.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改商品浏览 + * + * @param bo 商品浏览 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdBrowseBo bo) { + TzProdBrowse update = MapstructUtils.convert(bo, TzProdBrowse.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除商品浏览信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage queryPageListByUserId(Long userId, PageQuery pageQuery) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(TzProd.class) + .leftJoin(TzProdBrowse.class,TzProdBrowse::getProdId,TzProd::getProdId) + .eq(TzProd::getStatus,1) + .eq(TzProdBrowse::getUserId,userId) + .orderByDesc(TzProdBrowse::getProdId); + + //分页查询 (需要启用 mybatis plus 分页插件) + return prodMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzProdVo.class, wrapper); + } + + @Override + public TzProdBrowse queryListOne(Long userId,Long prodId) { + LambdaQueryWrapper lwq = new LambdaQueryWrapper().eq(TzProdBrowse::getProdId,prodId).eq(TzProdBrowse::getUserId,userId); + return baseMapper.selectOne(lwq); + } + + @Override + public void update(TzProdBrowse prodBrowse) { + baseMapper.updateById(prodBrowse); + } + + /** + * 根据用户id查询浏览记录总数 + * @param userId + * @return + */ + @Override + public Long countByUserId(Long userId) { + return baseMapper.selectCount(new LambdaQueryWrapper().eq(TzProdBrowse::getUserId, userId)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java new file mode 100644 index 0000000..c39cd79 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdCommServiceImpl.java @@ -0,0 +1,202 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.TzProdCommBo; +import org.dromara.mall.domain.vo.TzProdCommVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.ITzProdCommService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 商品评论Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class TzProdCommServiceImpl implements ITzProdCommService { + + private final TzProdCommMapper baseMapper; + + private final TzUserMapper userMapper; + + private final TzProdMapper prodMapper; + + private final HyOrderItemMapper orderItemMapper; + + private final HyOrderMapper orderMapper; + + + + /** + * 查询商品评论 + * + * @param id 主键 + * @return 商品评论 + */ + @Override + public TzProdCommVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询商品评论列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品评论分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdCommBo bo, PageQuery pageQuery) { + bo.setDelFlag(1); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的商品评论列表 + * + * @param bo 查询条件 + * @return 商品评论列表 + */ + @Override + public List queryList(TzProdCommBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + /** + * 根据商品ID查询商品评论列表 + * + * @param prodId 商品ID + * @param pageQuery + * @return 商品评论列表 + */ + @Override + public IPage queryPageListByProdId(Long prodId, PageQuery pageQuery) { + TzProdCommBo bo = new TzProdCommBo(); + bo.setProdId(prodId); + bo.setStatus(1); + bo.setDelFlag(1); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + IPage page = baseMapper.selectVoPage(pageQuery.build(), lqw); + + // 获取评论用户头像 + for(TzProdCommVo vo : page.getRecords()) { + TzUser user = userMapper.selectById(vo.getUserId()); + if(user != null) { + vo.setUserAvatar(user.getPic()); + vo.setUserName(user.getRealName()); + } + } + return page; + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdCommBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzProdComm::getProdId, bo.getProdId()); + lqw.eq(bo.getOrderId() != null, TzProdComm::getOrderId, bo.getOrderId()); + lqw.eq(bo.getOrderItemId() != null, TzProdComm::getOrderItemId, bo.getOrderItemId()); + lqw.eq(bo.getUserId() != null, TzProdComm::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzProdComm::getUserName, bo.getUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzProdComm::getContent, bo.getContent()); + lqw.eq(bo.getScore() != null, TzProdComm::getScore, bo.getScore()); + lqw.eq(StringUtils.isNotBlank(bo.getPics()), TzProdComm::getPics, bo.getPics()); + lqw.eq(bo.getIsAnonymous() != null, TzProdComm::getIsAnonymous, bo.getIsAnonymous()); + lqw.eq(bo.getStatus() != null, TzProdComm::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, TzProdComm::getDelFlag, bo.getDelFlag()); + lqw.orderByDesc(TzProdComm::getId); + return lqw; + } + + /** + * 新增商品评论 + * + * @param bo 商品评论 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdCommBo bo) { + //更新订单状态为已完成 + HyOrderItem orderItem = orderItemMapper.selectById(bo.getOrderItemId()); + orderItem.setStatus(5); + orderItemMapper.updateById(orderItem); + //更新总订单状态为已完成 + HyOrder order = orderMapper.selectById(bo.getOrderId()); + List orderItems = orderItemMapper.selectList(Wrappers.lambdaQuery(HyOrderItem.class).eq(HyOrderItem::getOrderId, bo.getOrderId())); + //判断订单是否已全部完成 + if (orderItems.stream().allMatch(item -> item.getStatus() == 5)) { + order.setStatus(5); + orderMapper.updateById(order); + } + TzProdComm add = MapstructUtils.convert(bo, TzProdComm.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改商品评论 + * + * @param bo 商品评论 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdCommBo bo) { + TzProdComm update = MapstructUtils.convert(bo, TzProdComm.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除商品评论信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public Long countByProdId(Long prodId) { + return baseMapper.selectCount(new LambdaQueryWrapper().eq(TzProdComm::getProdId, prodId).eq(TzProdComm::getDelFlag, 1).ne(TzProdComm::getStatus, 1)); + } + + @Override + public IPage queryPageListByUser(TzProdCommBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(TzProdComm::getCreateTime); + IPage page = baseMapper.selectVoPage(pageQuery.build(), lqw); + + // 获取评论列表中的商品信息 + page.getRecords().forEach(comment -> { + // 根据商品ID查询商品信息 + TzProd prod = prodMapper.selectById(comment.getProdId()); + if (prod != null) { + comment.setProdName(prod.getProdName()); + } + }); + + return page; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdFavoriteServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdFavoriteServiceImpl.java new file mode 100644 index 0000000..b452bf8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdFavoriteServiceImpl.java @@ -0,0 +1,171 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProd; +import org.dromara.mall.domain.TzProdFavorite; +import org.dromara.mall.domain.bo.TzProdFavoriteBo; +import org.dromara.mall.domain.vo.TzProdFavoriteVo; +import org.dromara.mall.domain.vo.TzProdVo; +import org.dromara.mall.mapper.TzProdFavoriteMapper; +import org.dromara.mall.mapper.TzProdMapper; +import org.dromara.mall.service.ITzProdFavoriteService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 商品收藏Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdFavoriteServiceImpl implements ITzProdFavoriteService { + + private final TzProdFavoriteMapper baseMapper; + + private final TzProdMapper prodMapper; + + /** + * 查询商品收藏 + * + * @param favoriteId 主键 + * @return 商品收藏 + */ + @Override + public TzProdFavoriteVo queryById(Long favoriteId){ + return baseMapper.selectVoById(favoriteId); + } + + /** + * 分页查询商品收藏列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品收藏分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdFavoriteBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public IPage queryPageListByUserId(Long userId, PageQuery pageQuery) { + //和Mybatis plus一致,MPJLambdaWrapper的泛型必须是主表的泛型,并且要用主表的Mapper来调用 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(TzProd.class) + .leftJoin(TzProdFavorite.class,TzProdFavorite::getProdId,TzProd::getProdId) + .eq(TzProdFavorite::getUserId,userId) + .eq(TzProd::getStatus,1) + .orderByDesc(TzProdFavorite::getProdId); + + //分页查询 (需要启用 mybatis plus 分页插件) + return prodMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzProdVo.class, wrapper); + } + + /** + * 查询符合条件的商品收藏列表 + * + * @param bo 查询条件 + * @return 商品收藏列表 + */ + @Override + public List queryList(TzProdFavoriteBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdFavoriteBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzProdFavorite::getProdId, bo.getProdId()); + lqw.eq(bo.getRecTime() != null, TzProdFavorite::getRecTime, bo.getRecTime()); + lqw.eq(bo.getUserId() != null, TzProdFavorite::getUserId, bo.getUserId()); + return lqw; + } + + /** + * 新增商品收藏 + * + * @param bo 商品收藏 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdFavoriteBo bo) { + TzProdFavorite add = MapstructUtils.convert(bo, TzProdFavorite.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setFavoriteId(add.getFavoriteId()); + } + return flag; + } + + /** + * 修改商品收藏 + * + * @param bo 商品收藏 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdFavoriteBo bo) { + TzProdFavorite update = MapstructUtils.convert(bo, TzProdFavorite.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除商品收藏信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 取消收藏 + * @param userId + * @param prodId + * @return + */ + @Override + public Boolean clearProdFavor(Long userId, Long prodId) { + List tzProdFavorite = baseMapper.selectList(new LambdaQueryWrapper().eq(TzProdFavorite::getUserId, userId).eq(TzProdFavorite::getProdId, prodId)); + if (ObjectUtil.isEmpty(tzProdFavorite)) { + throw new ServiceException("没有查询到此条收藏"); + } + return baseMapper.deleteByIds(tzProdFavorite) > 0; + } + + @Override + public Boolean exists(Long userId, Long prodId) { + return baseMapper.exists(new LambdaQueryWrapper().eq(TzProdFavorite::getProdId, prodId).eq(TzProdFavorite::getUserId, userId)); + } + + /** + * 根据用户ID查询收藏数量 + * @param userId + * @return + */ + @Override + public Long countByUserId(Long userId) { + return baseMapper.selectCount(new LambdaQueryWrapper().eq(TzProdFavorite::getUserId, userId)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropServiceImpl.java new file mode 100644 index 0000000..6db4922 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropServiceImpl.java @@ -0,0 +1,189 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdProp; +import org.dromara.mall.domain.TzProdPropValue; +import org.dromara.mall.domain.bo.TzProdPropBo; +import org.dromara.mall.domain.bo.TzProdPropValueBo; +import org.dromara.mall.domain.vo.TzProdPropVo; +import org.dromara.mall.mapper.TzProdPropMapper; +import org.dromara.mall.mapper.TzProdPropValueMapper; +import org.dromara.mall.service.ITzProdPropService; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + + +/** + * 商品规格Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdPropServiceImpl implements ITzProdPropService { + + private final TzProdPropMapper baseMapper; + + private final TzProdPropValueMapper tzProdPropValueMapper; + + /** + * 查询商品规格 + * + * @param propId 主键 + * @return 商品规格 + */ + @Override + public TzProdPropVo queryById(Long propId){ + TzProdPropVo tzProdPropVo = baseMapper.selectVoById(propId); + List list = tzProdPropValueMapper.selectList(new LambdaQueryWrapper().eq(TzProdPropValue::getPropId,propId)); + tzProdPropVo.setProdPropValues(list); + return tzProdPropVo; + } + + /** + * 分页查询商品规格列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品规格分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdPropBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的商品规格列表 + * + * @param bo 查询条件 + * @return 商品规格列表 + */ + @Override + public List queryList(TzProdPropBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdPropBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); +// lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), TzProdProp::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getPropName()), TzProdProp::getPropName, bo.getPropName()); + lqw.eq(bo.getRule() != null, TzProdProp::getRule, bo.getRule()); + return lqw; + } + + /** + * 新增商品规格 + * + * @param bo 商品规格 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdPropBo bo) { + TzProdProp tzProdProp = baseMapper.selectOne(new LambdaQueryWrapper().eq(TzProdProp::getPropName,bo.getPropName())); + + if (ObjectUtil.isNotEmpty(tzProdProp)) { + if (CollUtil.isNotEmpty(bo.getProdPropValues())) { + List list = tzProdPropValueMapper.selectList(new LambdaQueryWrapper().eq(TzProdPropValue::getPropId,tzProdProp.getPropId())); + + List oldList = list.stream().map(TzProdPropValue::getPropValue).collect(Collectors.toList()); + List newList = bo.getProdPropValues().stream().map(TzProdPropValueBo::getPropValue).collect(Collectors.toList()); + + if(!oldList.equals(newList) && oldList.size() != newList.size()){ + if (!oldList.isEmpty() && !newList.isEmpty()) { + List addList = subList(newList,oldList); + if (!addList.isEmpty()) { + List list1 = new ArrayList<>(); + for(String value : addList){ + TzProdPropValueBo valueBo = new TzProdPropValueBo(); + valueBo.setPropValue(value); + list1.add(valueBo); + } + return tzProdPropValueMapper.insertPropValues(tzProdProp.getPropId(), list1); + } + } + }else { + return true; + } + } + }else{ + bo.setRule(1); + TzProdProp add = MapstructUtils.convert(bo, TzProdProp.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + if (CollUtil.isNotEmpty(bo.getProdPropValues())) { + tzProdPropValueMapper.insertPropValues(add.getPropId(), bo.getProdPropValues()); + } + } + return flag; + } + return true; + } + + /** + * 差集(基于API解法) 适用于小数据量 + * 求List1中有的但是List2中没有的元素 + * 时间复杂度 O(list1.size() * list2.size()) + */ + public static List subList(List list1, List list2) { + list1.removeAll(list2); + return list1; + } + + /** + * 修改商品规格 + * + * @param bo 商品规格 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdPropBo bo) { + TzProdProp tzProdPropVo = baseMapper.selectOne(new LambdaQueryWrapper().eq(TzProdProp::getPropName,bo.getPropName())); + if (ObjectUtil.isNotEmpty(tzProdPropVo) && !Objects.equals(bo.getPropId(), tzProdPropVo.getPropId())) { + throw new ServiceException("已有相同名称规格"); + } + + // 先删除原有的属性值,再添加新的属性值 + tzProdPropValueMapper.deleteByPropId(bo.getPropId()); + if (CollUtil.isNotEmpty(bo.getProdPropValues())) { + tzProdPropValueMapper.insertPropValues(bo.getPropId(), bo.getProdPropValues()); + } + + bo.setRule(1); + TzProdProp update = MapstructUtils.convert(bo, TzProdProp.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除商品规格信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + for (Long prodId : ids) { + if(ObjectUtil.isNotNull(prodId)){ + tzProdPropValueMapper.deleteByPropId(prodId); + } + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropValueServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropValueServiceImpl.java new file mode 100644 index 0000000..8c28334 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdPropValueServiceImpl.java @@ -0,0 +1,116 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdPropValue; +import org.dromara.mall.domain.bo.TzProdPropValueBo; +import org.dromara.mall.domain.vo.TzProdPropValueVo; +import org.dromara.mall.mapper.TzProdPropValueMapper; +import org.dromara.mall.service.ITzProdPropValueService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdPropValueServiceImpl implements ITzProdPropValueService { + + private final TzProdPropValueMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param valueId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzProdPropValueVo queryById(Long valueId){ + return baseMapper.selectVoById(valueId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdPropValueBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzProdPropValueBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdPropValueBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getPropValue()), TzProdPropValue::getPropValue, bo.getPropValue()); + lqw.eq(bo.getPropId() != null, TzProdPropValue::getPropId, bo.getPropId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdPropValueBo bo) { + TzProdPropValue add = MapstructUtils.convert(bo, TzProdPropValue.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setValueId(add.getValueId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdPropValueBo bo) { + TzProdPropValue update = MapstructUtils.convert(bo, TzProdPropValue.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRecordServiceImpl.java new file mode 100644 index 0000000..5b036b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRecordServiceImpl.java @@ -0,0 +1,127 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdRecord; +import org.dromara.mall.domain.bo.TzProdRecordBo; +import org.dromara.mall.domain.vo.TzProdRecordVo; +import org.dromara.mall.mapper.TzProdRecordMapper; +import org.dromara.mall.service.ITzProdRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 产品价格记录Service业务层处理 + * + * @author Maosw + * @date 2024-09-12 + */ +@RequiredArgsConstructor +@Service +public class TzProdRecordServiceImpl implements ITzProdRecordService { + + private final TzProdRecordMapper baseMapper; + + /** + * 查询产品价格记录 + * + * @param id 主键 + * @return 产品价格记录 + */ + @Override + public TzProdRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询产品价格记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 产品价格记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的产品价格记录列表 + * + * @param bo 查询条件 + * @return 产品价格记录列表 + */ + @Override + public List queryList(TzProdRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzProdRecord::getProdId, bo.getProdId()); + lqw.eq(bo.getSkuId() != null, TzProdRecord::getSkuId, bo.getSkuId()); + lqw.eq(bo.getUserId() != null, TzProdRecord::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzProdRecord::getUserName, bo.getUserName()); + lqw.eq(bo.getType() != null, TzProdRecord::getType, bo.getType()); +// lqw.eq(bo.getOldPrice() != null, TzProdRecord::getOldPrice, bo.getOldPrice()); + lqw.eq(bo.getNewPrice() != null, TzProdRecord::getNewPrice, bo.getNewPrice()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzProdRecord::getContent, bo.getContent()); + lqw.eq(bo.getState() != null, TzProdRecord::getState, bo.getState()); + lqw.eq(bo.getCreateTime() != null, TzProdRecord::getCreateTime, bo.getCreateTime()); + return lqw; + } + + /** + * 新增产品价格记录 + * + * @param bo 产品价格记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdRecordBo bo) { + TzProdRecord add = MapstructUtils.convert(bo, TzProdRecord.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改产品价格记录 + * + * @param bo 产品价格记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdRecordBo bo) { + TzProdRecord update = MapstructUtils.convert(bo, TzProdRecord.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除产品价格记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRelationServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRelationServiceImpl.java new file mode 100644 index 0000000..b9cf4ef --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdRelationServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdRelation; +import org.dromara.mall.domain.bo.TzProdRelationBo; +import org.dromara.mall.domain.vo.TzProdRelationVo; +import org.dromara.mall.mapper.TzProdRelationMapper; +import org.dromara.mall.service.ITzProdRelationService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 商品推荐关联Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class TzProdRelationServiceImpl implements ITzProdRelationService { + + private final TzProdRelationMapper baseMapper; + + /** + * 查询商品推荐关联 + * + * @param id 主键 + * @return 商品推荐关联 + */ + @Override + public TzProdRelationVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询商品推荐关联列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品推荐关联分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdRelationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的商品推荐关联列表 + * + * @param bo 查询条件 + * @return 商品推荐关联列表 + */ + @Override + public List queryList(TzProdRelationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdRelationBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TzProdRelation::getId); + lqw.eq(bo.getProdId() != null, TzProdRelation::getProdId, bo.getProdId()); + lqw.eq(bo.getGlProdId() != null, TzProdRelation::getGlProdId, bo.getGlProdId()); + return lqw; + } + + /** + * 新增商品推荐关联 + * + * @param bo 商品推荐关联 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdRelationBo bo) { + TzProdRelation add = MapstructUtils.convert(bo, TzProdRelation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改商品推荐关联 + * + * @param bo 商品推荐关联 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdRelationBo bo) { + TzProdRelation update = MapstructUtils.convert(bo, TzProdRelation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 查询商品推荐关联列表 + * + * @param prodId 商品ID + * @return 商品推荐关联列表 + */ + @Override + public List getRelatedProdIds(Long prodId) { + return baseMapper.selectObjs(Wrappers.lambdaQuery(TzProdRelation.class).select(TzProdRelation::getGlProdId).eq(TzProdRelation::getProdId, prodId)); + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzProdRelation entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除商品推荐关联信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java new file mode 100644 index 0000000..aa99d4c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdServiceImpl.java @@ -0,0 +1,521 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.TzProdBo; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.domain.vo.TzProdSumVo; +import org.dromara.mall.domain.vo.TzProdVo; +import org.dromara.mall.domain.vo.TzSkuVo; +import org.dromara.mall.mapper.TzProdFavoriteMapper; +import org.dromara.mall.mapper.TzProdMapper; +import org.dromara.mall.mapper.TzProdRecordMapper; +import org.dromara.mall.mapper.TzSkuMapper; +import org.dromara.mall.service.ITzProdRelationService; +import org.dromara.mall.service.ITzProdService; +import org.dromara.system.domain.SysTenant; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 商品Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdServiceImpl extends MPJBaseServiceImpl implements ITzProdService { + + private final TzProdMapper baseMapper; + + private final TzSkuMapper tzSkuMapper; + + private final TzProdFavoriteMapper prodFavoriteMapper; + + private final TzProdRecordMapper prodRecordMapper; + + private final ITzProdRelationService prodRelationService; + + private static final Logger log = LogManager.getLogger(TzProdServiceImpl.class); + + /** + * 查询商品 + * + * @param prodId 主键 + * @return 商品 + */ + @Override + public TzProdVo queryById(Long prodId) { + TzProdVo tzProdVo = baseMapper.selectVoById(prodId); + List dbSkus = tzSkuMapper.selectVoList(new LambdaQueryWrapper().eq(TzSku::getProdId, prodId)); + tzProdVo.setSkuList(dbSkus); + return tzProdVo; + } + + /** + * 分页查询商品列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdBo bo, PageQuery pageQuery) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzProd.class) + .selectAs(TzCategory::getCategoryName, TzProdVo::getCategoryName) + .selectAs(SysTenant::getCompanyName, TzProdVo::getTenantName) + .selectAs(TzBrand::getName, TzProdVo::getBrandName) + .leftJoin(TzCategory.class,TzCategory::getCategoryId,TzProd::getCategoryId) + .leftJoin(SysTenant.class,SysTenant::getTenantId,TzProd::getTenantId) + .leftJoin(TzBrand.class,TzBrand::getId,TzProd::getBrandId) + .orderByDesc(TzProd::getProdId); + + //分页查询 (需要启用 mybatis plus 分页插件) + IPage listPage = baseMapper.selectJoinPage(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), TzProdVo.class, wrapper); + return TableDataInfo.build(listPage); + } + + /** + * 通过分类id商品列表信息 + * + * @param pageQuery + * @param categoryId + * @return + */ + @Override + public IPage pageByCategoryId(PageQuery pageQuery, List categoryId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzProd::getStatus,1).in(categoryId != null,TzProd::getCategoryId,categoryId); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + /** + * 查询符合条件的商品列表 + * + * @param bo 查询条件 + * @return 商品列表 + */ + @Override + public List queryList(TzProdBo bo) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .selectAll(TzProd.class) + .selectAs(TzCategory::getCategoryName, TzProdVo::getCategoryName) + .selectAs(SysTenant::getCompanyName, TzProdVo::getTenantName) + .selectAs(TzBrand::getName, TzProdVo::getBrandName) + .leftJoin(TzCategory.class,TzCategory::getCategoryId,TzProd::getCategoryId) + .leftJoin(SysTenant.class,SysTenant::getTenantId,TzProd::getTenantId) + .leftJoin(TzBrand.class,TzBrand::getId,TzProd::getBrandId) + .orderByDesc(TzProd::getProdId); + return baseMapper.selectVoList(wrapper); + } + + /** + * 查询商品列表统计 + * + * @param bo + * @return + */ + @Override + public TzProdSumVo queryListCount(TzProdBo bo) { + MPJLambdaWrapper wrapper = buildQueryMPJWrapper(bo) + .select(TzProd::getSoldNum,TzProd::getExamineFlag) + .leftJoin(SysTenant.class,SysTenant::getTenantId,TzProd::getTenantId) + .orderByDesc(TzProd::getProdId); + + List list = baseMapper.selectList(wrapper); + Long cpsl = (long) list.size(); + Long xlzj = list.stream().mapToLong(TzProd::getSoldNum).sum(); + + //待审核数量 + Long dshNum = list.stream() + .filter(f -> f.getExamineFlag() != null && f.getExamineFlag().equals(1L)) + .count(); + + TzProdSumVo sumVo = new TzProdSumVo(); + sumVo.setCpsl(cpsl); + sumVo.setXlzj(xlzj); + sumVo.setDshNum(dshNum); + return sumVo; + } + + private MPJLambdaWrapper buildQueryMPJWrapper(TzProdBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), TzProd::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzProd::getProdName, bo.getProdName()); + lqw.like(StringUtils.isNotBlank(bo.getTenantName()), SysTenant::getCompanyName, bo.getTenantName()); + lqw.like(StringUtils.isNotBlank(bo.getBrief()), TzProd::getBrief, bo.getBrief()); + lqw.like(StringUtils.isNotBlank(bo.getContent()), TzProd::getContent, bo.getContent()); + lqw.like(StringUtils.isNotBlank(bo.getProdCode()), TzProd::getProdCode, bo.getProdCode()); + lqw.like(StringUtils.isNotBlank(bo.getProdFactoryCode()), TzProd::getProdFactoryCode, bo.getProdFactoryCode()); + lqw.like(StringUtils.isNotBlank(bo.getFactoryAddress()), TzProd::getFactoryAddress, bo.getFactoryAddress()); + lqw.eq(bo.getStatus() != null, TzProd::getStatus, bo.getStatus()); + lqw.eq(bo.getExamineFlag() != null, TzProd::getExamineFlag, bo.getExamineFlag()); + lqw.eq(bo.getCategoryId() != null, TzProd::getCategoryId, bo.getCategoryId()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + TzProd::getPutawayTime, params.get("beginTime"), params.get("endTime")); + return lqw; + } + + /** + * 特价专区 + * + * @param pageQuery + * @return + */ + @Override + public IPage saleProdPage(PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzProd::getStatus, 1).eq(TzProd::getIsFloor, 1).orderByDesc(TzProd::getPutawayTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + /** + * 获取商品列表 + * + * @param relatedProdIds + * @param pageQuery + * @return + */ + @Override + public IPage getProdListByProdIds(List relatedProdIds, PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzProd::getStatus, 1).in(TzProd::getProdId, relatedProdIds).orderByDesc(TzProd::getPutawayTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + public IPage pageByPutAwayTime(PageQuery pageQuery) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzProd::getStatus, 1).orderByDesc(TzProd::getPutawayTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + @Override + public IPage randomProdPage(PageQuery pageQuery) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return baseMapper.randomProdPage(page); + } + + @Override + public IPage hotProdPage(PageQuery pageQuery) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return baseMapper.hotProdPage(page); + } + + /** + * 新增商品 + * + * @param bo 商品 + * @return 是否新增成功 + */ + @Override + @Transactional + public Boolean insertByBo(TzProdBo bo) { + if (bo.getStatus() == 1) { + bo.setPutawayTime(new Date()); + } + bo.setCreateTime(new Date()); + bo.setUpdateTime(new Date()); + + TzProd add = MapstructUtils.convert(bo, TzProd.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + List skuList = new ArrayList<>(); + List prodRecordList = new ArrayList<>(); + + if (bo.getSkuList() != null && !bo.getSkuList().isEmpty()) { + processSkuList(add, bo.getSkuList(), skuList, prodRecordList); + tzSkuMapper.insertBatch(skuList); + prodRecordMapper.insertBatch(prodRecordList); + } + } + return flag; + } + + private void processSkuList(TzProd add, List skuList, List tzSkuList, List prodRecordList) { + for (TzSkuBo skuBo : skuList) { + skuBo.setProdId(add.getProdId()); + skuBo.setRecTime(new Date()); + TzSku tzSku = MapstructUtils.convert(skuBo, TzSku.class); + tzSkuList.add(tzSku); + TzProdRecord prodRecord = insertProdRecord(add.getProdId(), tzSku.getSkuId(), null, skuBo.getOriPrice(), "新增商品SKU,初始价格:" + skuBo.getOriPrice() + " 元"); + prodRecordList.add(prodRecord); + } + } + + /** + * 修改商品 + * + * @param bo 商品 + * @return 是否修改成功 + */ + @Override + @Transactional + public Boolean updateByBo(TzProdBo bo) { + // 空值检查 + if (bo == null || bo.getProdId() == null) { + throw new IllegalArgumentException("商品信息不能为空"); + } + + TzProdVo vo = baseMapper.selectVoById(bo.getProdId()); + if (vo == null) { + throw new ServiceException("商品不存在"); + } + + if (vo.getStatus() == 0 && bo.getStatus() == 1) { + bo.setPutawayTime(new Date()); + } + bo.setUpdateTime(new Date()); + + // 接口传入sku列表 + List skuList = bo.getSkuList(); + if (CollectionUtil.isEmpty(skuList)) { + // 全部删除 + tzSkuMapper.deleteByProdId(vo.getProdId()); + log.info("全部删除了商品ID为 {} 的所有SKU数据", vo.getProdId()); + } else { + List insertSkuList = new ArrayList<>(); + List updateSkuList = new ArrayList<>(); + List dbSkuIds = new ArrayList<>(); + List prodRecordList = new ArrayList<>(); + + for (TzSkuBo sku : skuList) { + if (sku == null || sku.getFlag() == null) { + continue; // 跳过空对象或无效的flag + } + + switch (sku.getFlag()) { + case 1: + if (tzSkuMapper.exists(new LambdaQueryWrapper() + .eq(TzSku::getSkuCode, sku.getSkuCode()))) { + throw new ServiceException("厂家SKU产品编码已存在"); + } + sku.setRecTime(new Date()); + sku.setProdId(vo.getProdId()); + insertSkuList.add(setUpdateTime(sku)); + break; + case 2: + case 3: + updateSkuList.add(setUpdateTime(sku)); + if (sku.getFlag() == 3) { + TzProdRecord prodRecord = insertProdRecord(vo.getProdId(), sku.getSkuId(), null, sku.getOriPrice(), "商品SKU改价,改价后价格:" + sku.getOriPrice() + " 元"); + prodRecordList.add(prodRecord); + } + break; + case 4: + dbSkuIds.add(sku.getSkuId()); + break; + default: + throw new ServiceException("未知的SKU操作类型"); + } + } + + // 批量插入sku + if (!insertSkuList.isEmpty()) { + try { + tzSkuMapper.insertBatch(insertSkuList); + log.info("批量插入了 {} 条SKU数据,商品ID为 {}", insertSkuList.size(), vo.getProdId()); + } catch (Exception e) { + log.error("批量插入SKU数据失败,商品ID为 {}", vo.getProdId(), e); + throw new ServiceException("批量插入SKU数据失败"); + } + } + + // 批量修改sku + if (!updateSkuList.isEmpty()) { + try { + tzSkuMapper.updateBatchById(updateSkuList); + prodRecordMapper.insertBatch(prodRecordList); + log.info("批量更新了 {} 条SKU数据,商品ID为 {}", updateSkuList.size(), vo.getProdId()); + } catch (Exception e) { + log.error("批量更新SKU数据失败,商品ID为 {}", vo.getProdId(), e); + throw new ServiceException("批量更新SKU数据失败"); + } + } + + // 批量删除sku + if (!dbSkuIds.isEmpty()) { + try { + tzSkuMapper.deleteByIds(dbSkuIds); + log.info("批量删除了 {} 条SKU数据,商品ID为 {}", dbSkuIds.size(), vo.getProdId()); + } catch (Exception e) { + log.error("批量删除SKU数据失败,商品ID为 {}", vo.getProdId(), e); + throw new ServiceException("批量删除SKU数据失败"); + } + } + } + TzProd update = MapstructUtils.convert(bo, TzProd.class); + return baseMapper.updateById(update) > 0; + } + + private TzSku setUpdateTime(TzSkuBo sku) { + sku.setUpdateTime(new Date()); + return MapstructUtils.convert(sku, TzSku.class); + } + + + /** + * 添加商品改价记录 + * @param prodId + * @param skuId + * @param oldPrice + * @param newPrice + * @param Content + * @return + */ + @Transactional + public TzProdRecord insertProdRecord(Long prodId, Long skuId, BigDecimal oldPrice,BigDecimal newPrice,String Content){ + LoginUser loginUser = LoginHelper.getLoginUser(); + TzProdRecord prodRecord = new TzProdRecord(); + if (!"000000".equals(loginUser.getTenantId())) { + prodRecord.setType(1); + prodRecord.setUserId(loginUser.getUserId()); + prodRecord.setUserName(loginUser.getTenantId()); + }else { + prodRecord.setType(2); + prodRecord.setUserId(loginUser.getUserId()); + prodRecord.setUserName(loginUser.getNickname()); + } + prodRecord.setProdId(prodId); + prodRecord.setSkuId(skuId); + if(oldPrice != null){ + prodRecord.setOldPrice(oldPrice); + } + prodRecord.setNewPrice(newPrice); + prodRecord.setContent(Content); + prodRecord.setState(1); + prodRecord.setCreateTime(new Date()); + return prodRecord; + } + + /** + * 校验并批量删除商品信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + for (Long prodId : ids) { + List dbSkus = tzSkuMapper.selectList(new LambdaQueryWrapper().eq(TzSku::getProdId, prodId)); + if (CollectionUtil.isNotEmpty(dbSkus)) { + tzSkuMapper.deleteByProdId(prodId); + } + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public IPage getSearchProdPageByProdName(PageQuery pageQuery, Long categoryId, String prodName, Integer floor, Integer sort, Integer orderBy) { + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + return baseMapper.getSearchProdPageByProdName(page, categoryId, prodName, floor, sort, orderBy); + } + + /** + * 商品收藏 + * @param userId + * @param prodId + * @return + */ + @Override + @Transactional + public Boolean updateCollectNum(Long userId,Long prodId) { + boolean exist = prodFavoriteMapper.exists(new LambdaQueryWrapper().eq(TzProdFavorite::getProdId, prodId).eq(TzProdFavorite::getUserId, userId)); + if (exist) { + throw new ServiceException("该商品已经收藏过啦"); + } + TzProdFavorite prodFavorite = new TzProdFavorite(); + prodFavorite.setUserId(userId); + prodFavorite.setProdId(prodId); + prodFavorite.setRecTime(new Date()); + prodFavoriteMapper.insert(prodFavorite); + + LambdaUpdateWrapper lwq = new LambdaUpdateWrapper<>(); + lwq.eq(TzProd::getProdId, prodId); + lwq.setIncrBy(TzProd::getCollectNum, 1); + return baseMapper.update(lwq) > 0; + } + + /** + * 增加产品销量 + * @param prodCode + * @return + */ + @Override + @Transactional + public Boolean updateSoldNum(String prodCode) { + LambdaUpdateWrapper lwq = new LambdaUpdateWrapper<>(); + lwq.eq(TzProd::getProdCode, prodCode); + lwq.setIncrBy(TzProd::getSoldNum, 1); + return baseMapper.update(lwq) > 0; + } + + /** + * 查询商品销量排行榜列表 + * + * @param bo + * @param pageQuery + * @return 关联商品列表 + */ + @Override + public TableDataInfo queryPageListChart(TzProdBo bo, PageQuery pageQuery) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAs(TzProd::getProdId, "prodId") + .selectAs(TzProd::getProdName, "prodName") + .selectCount(HyOrderItem::getId, "orderNum") + .selectSum(HyOrderItem::getTotal, "orderTotal") + .leftJoin(HyOrderItem.class, HyOrderItem::getProdId, TzProd::getProdId) + .groupBy(TzProd::getProdId) + .orderByDesc("orderTotal"); + + // 添加查询条件 + if (bo != null) { + Map params = bo.getParams(); + wrapper.eq(HyOrderItem::getDelFlag, 1); + wrapper.ne(HyOrderItem::getPayState, 1); + wrapper.like(StringUtils.isNotBlank(bo.getProdName()), TzProd::getProdName, bo.getProdName()); + wrapper.like(StringUtils.isNotBlank(bo.getProdCode()),TzProd::getProdCode, bo.getProdCode()); + wrapper.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderItem::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + } + // 执行分页查询 + Page page = baseMapper.selectJoinPage(pageQuery.build(), TzProdVo.class, wrapper); + return TableDataInfo.build(page); + } + + @Override + public TableDataInfo getRelatedProducts(Long prodId, PageQuery pageQuery) { + // 1. 查询关联商品ID列表 + List relatedProdIds = prodRelationService.getRelatedProdIds(prodId); + if (relatedProdIds.isEmpty()) { + return TableDataInfo.build(); + } + // 2. 查询关联商品列表 + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .in(TzProd::getProdId, relatedProdIds) + .eq(TzProd::getStatus, 1) + .orderByDesc(TzProd::getPutawayTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagReferenceServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagReferenceServiceImpl.java new file mode 100644 index 0000000..72de4f2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagReferenceServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzProdTagReferenceBo; +import org.dromara.mall.domain.vo.TzProdTagReferenceVo; +import org.dromara.mall.domain.TzProdTagReference; +import org.dromara.mall.mapper.TzProdTagReferenceMapper; +import org.dromara.mall.service.ITzProdTagReferenceService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdTagReferenceServiceImpl implements ITzProdTagReferenceService { + + private final TzProdTagReferenceMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param referenceId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzProdTagReferenceVo queryById(Long referenceId){ + return baseMapper.selectVoById(referenceId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdTagReferenceBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzProdTagReferenceBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdTagReferenceBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getShopId() != null, TzProdTagReference::getShopId, bo.getShopId()); + lqw.eq(bo.getTagId() != null, TzProdTagReference::getTagId, bo.getTagId()); + lqw.eq(bo.getProdId() != null, TzProdTagReference::getProdId, bo.getProdId()); + lqw.eq(bo.getStatus() != null, TzProdTagReference::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdTagReferenceBo bo) { + TzProdTagReference add = MapstructUtils.convert(bo, TzProdTagReference.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setReferenceId(add.getReferenceId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdTagReferenceBo bo) { + TzProdTagReference update = MapstructUtils.convert(bo, TzProdTagReference.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzProdTagReference entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagServiceImpl.java new file mode 100644 index 0000000..199d2b2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdTagServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzProdTagBo; +import org.dromara.mall.domain.vo.TzProdTagVo; +import org.dromara.mall.domain.TzProdTag; +import org.dromara.mall.mapper.TzProdTagMapper; +import org.dromara.mall.service.ITzProdTagService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 商品分组Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzProdTagServiceImpl implements ITzProdTagService { + + private final TzProdTagMapper baseMapper; + + /** + * 查询商品分组 + * + * @param id 主键 + * @return 商品分组 + */ + @Override + public TzProdTagVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询商品分组列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 商品分组分页列表 + */ + @Override + public TableDataInfo queryPageList(TzProdTagBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的商品分组列表 + * + * @param bo 查询条件 + * @return 商品分组列表 + */ + @Override + public List queryList(TzProdTagBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdTagBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TzProdTag::getTitle, bo.getTitle()); + lqw.eq(bo.getShopId() != null, TzProdTag::getShopId, bo.getShopId()); + lqw.eq(bo.getStatus() != null, TzProdTag::getStatus, bo.getStatus()); + lqw.eq(bo.getIsDefault() != null, TzProdTag::getIsDefault, bo.getIsDefault()); + lqw.eq(bo.getProdCount() != null, TzProdTag::getProdCount, bo.getProdCount()); + lqw.eq(bo.getStyle() != null, TzProdTag::getStyle, bo.getStyle()); + lqw.eq(bo.getSeq() != null, TzProdTag::getSeq, bo.getSeq()); + lqw.eq(bo.getDeleteTime() != null, TzProdTag::getDeleteTime, bo.getDeleteTime()); + return lqw; + } + + /** + * 新增商品分组 + * + * @param bo 商品分组 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzProdTagBo bo) { + TzProdTag add = MapstructUtils.convert(bo, TzProdTag.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改商品分组 + * + * @param bo 商品分组 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzProdTagBo bo) { + TzProdTag update = MapstructUtils.convert(bo, TzProdTag.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzProdTag entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除商品分组信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdWishlistServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdWishlistServiceImpl.java new file mode 100644 index 0000000..6b240e2 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzProdWishlistServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzProdWishlist; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.bo.TzProdWishlistBo; +import org.dromara.mall.domain.vo.TzProdWishlistVo; +import org.dromara.mall.mapper.TzProdWishlistMapper; +import org.dromara.mall.mapper.TzUserMapper; +import org.dromara.mall.service.ITzProdWishlistService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 心愿单Service业务层处理 + * + * @author Lion Li + * @date 2024-01-02 + */ +@RequiredArgsConstructor +@Service +public class TzProdWishlistServiceImpl implements ITzProdWishlistService { + + private final TzProdWishlistMapper baseMapper; + + private final TzUserMapper userMapper; + + /** + * 查询心愿单 + */ + @Override + public TzProdWishlistVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询心愿单列表 + */ + @Override + public TableDataInfo queryPageList(TzProdWishlistBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzProdWishlist::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询心愿单列表 + */ + @Override + public List queryList(TzProdWishlistBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzProdWishlistBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzProdWishlist::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzProdWishlist::getUserName, bo.getUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getUserPhone()), TzProdWishlist::getUserPhone, bo.getUserPhone()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzProdWishlist::getProdName, bo.getProdName()); + lqw.eq(StringUtils.isNotBlank(bo.getCategory()), TzProdWishlist::getCategory, bo.getCategory()); + lqw.eq(bo.getStatus() != null, TzProdWishlist::getStatus, bo.getStatus()); + lqw.eq(bo.getDelFlag() != null, TzProdWishlist::getDelFlag, bo.getDelFlag()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzProdWishlist::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增心愿单 + */ + @Override + public Boolean insertByBo(TzProdWishlistBo bo) { + // 查询用户信息 + TzUser user = userMapper.selectById(bo.getUserId()); + if (user != null) { + bo.setUserName(user.getNickName()); +// bo.setUserPhone(user.getUserMobile()); + } + TzProdWishlist add = MapstructUtils.convert(bo, TzProdWishlist.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改心愿单 + */ + @Override + public Boolean updateByBo(TzProdWishlistBo bo) { + TzProdWishlist update = MapstructUtils.convert(bo, TzProdWishlist.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 批量删除心愿单 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + // 创建更新对象 + TzProdWishlist wishlist = new TzProdWishlist(); + wishlist.setDelFlag(2); + // 构建更新条件 + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); + updateWrapper.in(TzProdWishlist::getId, ids); + // 执行逻辑删除 + return baseMapper.update(wishlist, updateWrapper) > 0; + } + + @Override + public IPage queryPageListAPP(TzProdWishlistBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzProdWishlist::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzShopDetailServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzShopDetailServiceImpl.java new file mode 100644 index 0000000..4fe8b39 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzShopDetailServiceImpl.java @@ -0,0 +1,152 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzShopDetailBo; +import org.dromara.mall.domain.vo.TzShopDetailVo; +import org.dromara.mall.domain.TzShopDetail; +import org.dromara.mall.mapper.TzShopDetailMapper; +import org.dromara.mall.service.ITzShopDetailService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzShopDetailServiceImpl implements ITzShopDetailService { + + private final TzShopDetailMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param shopId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzShopDetailVo queryById(Long shopId){ + return baseMapper.selectVoById(shopId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzShopDetailBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzShopDetailBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzShopDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getShopName()), TzShopDetail::getShopName, bo.getShopName()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzShopDetail::getUserId, bo.getUserId()); + lqw.eq(bo.getShopType() != null, TzShopDetail::getShopType, bo.getShopType()); + lqw.eq(StringUtils.isNotBlank(bo.getIntro()), TzShopDetail::getIntro, bo.getIntro()); + lqw.eq(StringUtils.isNotBlank(bo.getShopNotice()), TzShopDetail::getShopNotice, bo.getShopNotice()); + lqw.eq(bo.getShopIndustry() != null, TzShopDetail::getShopIndustry, bo.getShopIndustry()); + lqw.eq(StringUtils.isNotBlank(bo.getShopOwner()), TzShopDetail::getShopOwner, bo.getShopOwner()); + lqw.eq(StringUtils.isNotBlank(bo.getMobile()), TzShopDetail::getMobile, bo.getMobile()); + lqw.eq(StringUtils.isNotBlank(bo.getTel()), TzShopDetail::getTel, bo.getTel()); + lqw.eq(StringUtils.isNotBlank(bo.getShopLat()), TzShopDetail::getShopLat, bo.getShopLat()); + lqw.eq(StringUtils.isNotBlank(bo.getShopLng()), TzShopDetail::getShopLng, bo.getShopLng()); + lqw.eq(StringUtils.isNotBlank(bo.getShopAddress()), TzShopDetail::getShopAddress, bo.getShopAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TzShopDetail::getProvince, bo.getProvince()); + lqw.eq(StringUtils.isNotBlank(bo.getCity()), TzShopDetail::getCity, bo.getCity()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), TzShopDetail::getArea, bo.getArea()); + lqw.eq(StringUtils.isNotBlank(bo.getPcaCode()), TzShopDetail::getPcaCode, bo.getPcaCode()); + lqw.eq(StringUtils.isNotBlank(bo.getShopLogo()), TzShopDetail::getShopLogo, bo.getShopLogo()); + lqw.eq(StringUtils.isNotBlank(bo.getShopPhotos()), TzShopDetail::getShopPhotos, bo.getShopPhotos()); + lqw.eq(StringUtils.isNotBlank(bo.getOpenTime()), TzShopDetail::getOpenTime, bo.getOpenTime()); + lqw.eq(bo.getShopStatus() != null, TzShopDetail::getShopStatus, bo.getShopStatus()); + lqw.eq(bo.getTransportType() != null, TzShopDetail::getTransportType, bo.getTransportType()); + lqw.eq(bo.getFixedFreight() != null, TzShopDetail::getFixedFreight, bo.getFixedFreight()); + lqw.eq(bo.getFullFreeShipping() != null, TzShopDetail::getFullFreeShipping, bo.getFullFreeShipping()); + lqw.eq(bo.getIsDistribution() != null, TzShopDetail::getIsDistribution, bo.getIsDistribution()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzShopDetailBo bo) { + TzShopDetail add = MapstructUtils.convert(bo, TzShopDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setShopId(add.getShopId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzShopDetailBo bo) { + TzShopDetail update = MapstructUtils.convert(bo, TzShopDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzShopDetail entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSkuServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSkuServiceImpl.java new file mode 100644 index 0000000..36a7264 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSkuServiceImpl.java @@ -0,0 +1,158 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzSku; +import org.dromara.mall.domain.bo.TzSkuBo; +import org.dromara.mall.domain.vo.TzSkuVo; +import org.dromara.mall.mapper.TzSkuMapper; +import org.dromara.mall.service.ITzSkuService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 单品SKUService业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzSkuServiceImpl implements ITzSkuService { + + private final TzSkuMapper baseMapper; + + /** + * 查询单品SKU + * + * @param skuId 主键 + * @return 单品SKU + */ + @Override + public TzSkuVo queryById(Long skuId){ + return baseMapper.selectVoById(skuId); + } + + /** + * 分页查询单品SKU列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 单品SKU分页列表 + */ + @Override + public TableDataInfo queryPageList(TzSkuBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的单品SKU列表 + * + * @param bo 查询条件 + * @return 单品SKU列表 + */ + @Override + public List queryList(TzSkuBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzSkuBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzSku::getProdId, bo.getProdId()); + lqw.eq(StringUtils.isNotBlank(bo.getProperties()), TzSku::getProperties, bo.getProperties()); + lqw.eq(bo.getOriPrice() != null, TzSku::getOriPrice, bo.getOriPrice()); + lqw.eq(bo.getPrice() != null, TzSku::getPrice, bo.getPrice()); + lqw.eq(bo.getStocks() != null, TzSku::getStocks, bo.getStocks()); + lqw.eq(bo.getActualStocks() != null, TzSku::getActualStocks, bo.getActualStocks()); + lqw.eq(bo.getRecTime() != null, TzSku::getRecTime, bo.getRecTime()); + lqw.eq(StringUtils.isNotBlank(bo.getPartyCode()), TzSku::getPartyCode, bo.getPartyCode()); + lqw.eq(StringUtils.isNotBlank(bo.getModelId()), TzSku::getModelId, bo.getModelId()); + lqw.eq(StringUtils.isNotBlank(bo.getPic()), TzSku::getPic, bo.getPic()); + lqw.like(StringUtils.isNotBlank(bo.getSkuName()), TzSku::getSkuName, bo.getSkuName()); + lqw.like(StringUtils.isNotBlank(bo.getSkuCode()), TzSku::getSkuCode, bo.getSkuCode()); + lqw.like(StringUtils.isNotBlank(bo.getProdName()), TzSku::getProdName, bo.getProdName()); + lqw.eq(bo.getWeight() != null, TzSku::getWeight, bo.getWeight()); + lqw.eq(bo.getVolume() != null, TzSku::getVolume, bo.getVolume()); + lqw.eq(bo.getStatus() != null, TzSku::getStatus, bo.getStatus()); + lqw.eq(bo.getIsDelete() != null, TzSku::getIsDelete, bo.getIsDelete()); + return lqw; + } + + /** + * 新增单品SKU + * + * @param bo 单品SKU + * @return 是否新增成功 + */ + @Override + @Transactional + public Boolean insertByBo(TzSkuBo bo) { + TzSkuVo tzSkuVo = baseMapper.selectVoOne(new LambdaQueryWrapper().eq(TzSku::getSkuCode,bo.getSkuCode())); + if (ObjectUtil.isNotEmpty(tzSkuVo)) { + throw new ServiceException("已有相同SKU编码"); + } + + /*TzSkuVo tzSkuVo1 = baseMapper.selectVoOne(new LambdaQueryWrapper().eq(TzSku::getSkuFactoryCode,bo.getSkuFactoryCode())); + if (ObjectUtil.isNotEmpty(tzSkuVo1)) { + throw new ServiceException("已有相同厂家SKU编码"); + }*/ + + TzSku add = MapstructUtils.convert(bo, TzSku.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSkuId(add.getSkuId()); + } + return flag; + } + + /** + * 修改单品SKU + * + * @param bo 单品SKU + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzSkuBo bo) { + TzSkuVo tzSkuVo = baseMapper.selectVoOne(new LambdaQueryWrapper().eq(TzSku::getSkuCode,bo.getSkuCode())); + if (ObjectUtil.isNotEmpty(tzSkuVo) && !Objects.equals(bo.getSkuId(), tzSkuVo.getSkuId())) { + throw new ServiceException("已有相同SKU编码"); + } + + TzSku update = MapstructUtils.convert(bo, TzSku.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除单品SKU信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public List listByProdId(Long prodId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzSku::getProdId,prodId).eq(TzSku::getIsDelete,0)); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSmsLogServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSmsLogServiceImpl.java new file mode 100644 index 0000000..50ff35a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzSmsLogServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzSmsLogBo; +import org.dromara.mall.domain.vo.TzSmsLogVo; +import org.dromara.mall.domain.TzSmsLog; +import org.dromara.mall.mapper.TzSmsLogMapper; +import org.dromara.mall.service.ITzSmsLogService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 短信记录Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzSmsLogServiceImpl implements ITzSmsLogService { + + private final TzSmsLogMapper baseMapper; + + /** + * 查询短信记录 + * + * @param id 主键 + * @return 短信记录 + */ + @Override + public TzSmsLogVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询短信记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 短信记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzSmsLogBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的短信记录列表 + * + * @param bo 查询条件 + * @return 短信记录列表 + */ + @Override + public List queryList(TzSmsLogBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzSmsLogBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzSmsLog::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserPhone()), TzSmsLog::getUserPhone, bo.getUserPhone()); + lqw.eq(StringUtils.isNotBlank(bo.getContent()), TzSmsLog::getContent, bo.getContent()); + lqw.eq(StringUtils.isNotBlank(bo.getMobileCode()), TzSmsLog::getMobileCode, bo.getMobileCode()); + lqw.eq(bo.getType() != null, TzSmsLog::getType, bo.getType()); + lqw.eq(bo.getRecDate() != null, TzSmsLog::getRecDate, bo.getRecDate()); + lqw.eq(StringUtils.isNotBlank(bo.getResponseCode()), TzSmsLog::getResponseCode, bo.getResponseCode()); + lqw.eq(bo.getStatus() != null, TzSmsLog::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增短信记录 + * + * @param bo 短信记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzSmsLogBo bo) { + TzSmsLog add = MapstructUtils.convert(bo, TzSmsLog.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改短信记录 + * + * @param bo 短信记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzSmsLogBo bo) { + TzSmsLog update = MapstructUtils.convert(bo, TzSmsLog.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzSmsLog entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除短信记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTenantRecordServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTenantRecordServiceImpl.java new file mode 100644 index 0000000..54f66be --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTenantRecordServiceImpl.java @@ -0,0 +1,137 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzTenantRecord; +import org.dromara.mall.domain.bo.TzTenantRecordBo; +import org.dromara.mall.domain.vo.TzTenantRecordVo; +import org.dromara.mall.mapper.TzTenantRecordMapper; +import org.dromara.mall.service.ITzTenantRecordService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 租户资金记录Service业务层处理 + * + * @author Maosw + * @date 2024-12-09 + */ +@RequiredArgsConstructor +@Service +public class TzTenantRecordServiceImpl implements ITzTenantRecordService { + + private final TzTenantRecordMapper baseMapper; + + /** + * 查询租户资金记录 + * + * @param id 主键 + * @return 租户资金记录 + */ + @Override + public TzTenantRecordVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询租户资金记录列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 租户资金记录分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTenantRecordBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(TzTenantRecord::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的租户资金记录列表 + * + * @param bo 查询条件 + * @return 租户资金记录列表 + */ + @Override + public List queryList(TzTenantRecordBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTenantRecordBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), TzTenantRecord::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getTenantName()), TzTenantRecord::getTenantName, bo.getTenantName()); + lqw.eq(bo.getAmount() != null, TzTenantRecord::getAmount, bo.getAmount()); + lqw.eq(bo.getBalance() != null, TzTenantRecord::getBalance, bo.getBalance()); + lqw.eq(bo.getType() != null, TzTenantRecord::getType, bo.getType()); + lqw.eq(bo.getOrderId() != null, TzTenantRecord::getOrderId, bo.getOrderId()); + lqw.eq(bo.getOrderItemId() != null, TzTenantRecord::getOrderItemId, bo.getOrderItemId()); + lqw.eq(bo.getAmountType() != null, TzTenantRecord::getAmountType, bo.getAmountType()); + return lqw; + } + + /** + * 新增租户资金记录 + * + * @param bo 租户资金记录 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTenantRecordBo bo) { + TzTenantRecord add = MapstructUtils.convert(bo, TzTenantRecord.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改租户资金记录 + * + * @param bo 租户资金记录 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTenantRecordBo bo) { + TzTenantRecord update = MapstructUtils.convert(bo, TzTenantRecord.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzTenantRecord entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除租户资金记录信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityFreeServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityFreeServiceImpl.java new file mode 100644 index 0000000..9f0c6f5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityFreeServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzTranscityFreeBo; +import org.dromara.mall.domain.vo.TzTranscityFreeVo; +import org.dromara.mall.domain.TzTranscityFree; +import org.dromara.mall.mapper.TzTranscityFreeMapper; +import org.dromara.mall.service.ITzTranscityFreeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzTranscityFreeServiceImpl implements ITzTranscityFreeService { + + private final TzTranscityFreeMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param transcityFreeId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzTranscityFreeVo queryById(Long transcityFreeId){ + return baseMapper.selectVoById(transcityFreeId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTranscityFreeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzTranscityFreeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTranscityFreeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTransfeeFreeId() != null, TzTranscityFree::getTransfeeFreeId, bo.getTransfeeFreeId()); + lqw.eq(bo.getFreeCityId() != null, TzTranscityFree::getFreeCityId, bo.getFreeCityId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTranscityFreeBo bo) { + TzTranscityFree add = MapstructUtils.convert(bo, TzTranscityFree.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTranscityFreeId(add.getTranscityFreeId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTranscityFreeBo bo) { + TzTranscityFree update = MapstructUtils.convert(bo, TzTranscityFree.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzTranscityFree entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityServiceImpl.java new file mode 100644 index 0000000..eeac813 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTranscityServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzTranscityBo; +import org.dromara.mall.domain.vo.TzTranscityVo; +import org.dromara.mall.domain.TzTranscity; +import org.dromara.mall.mapper.TzTranscityMapper; +import org.dromara.mall.service.ITzTranscityService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzTranscityServiceImpl implements ITzTranscityService { + + private final TzTranscityMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param transcityId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzTranscityVo queryById(Long transcityId){ + return baseMapper.selectVoById(transcityId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTranscityBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzTranscityBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTranscityBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTransfeeId() != null, TzTranscity::getTransfeeId, bo.getTransfeeId()); + lqw.eq(bo.getCityId() != null, TzTranscity::getCityId, bo.getCityId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTranscityBo bo) { + TzTranscity add = MapstructUtils.convert(bo, TzTranscity.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTranscityId(add.getTranscityId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTranscityBo bo) { + TzTranscity update = MapstructUtils.convert(bo, TzTranscity.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzTranscity entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeFreeServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeFreeServiceImpl.java new file mode 100644 index 0000000..c569539 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeFreeServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzTransfeeFreeBo; +import org.dromara.mall.domain.vo.TzTransfeeFreeVo; +import org.dromara.mall.domain.TzTransfeeFree; +import org.dromara.mall.mapper.TzTransfeeFreeMapper; +import org.dromara.mall.service.ITzTransfeeFreeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzTransfeeFreeServiceImpl implements ITzTransfeeFreeService { + + private final TzTransfeeFreeMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param transfeeFreeId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzTransfeeFreeVo queryById(Long transfeeFreeId){ + return baseMapper.selectVoById(transfeeFreeId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTransfeeFreeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzTransfeeFreeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTransfeeFreeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTransportId() != null, TzTransfeeFree::getTransportId, bo.getTransportId()); + lqw.eq(bo.getFreeType() != null, TzTransfeeFree::getFreeType, bo.getFreeType()); + lqw.eq(bo.getAmount() != null, TzTransfeeFree::getAmount, bo.getAmount()); + lqw.eq(bo.getPiece() != null, TzTransfeeFree::getPiece, bo.getPiece()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTransfeeFreeBo bo) { + TzTransfeeFree add = MapstructUtils.convert(bo, TzTransfeeFree.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTransfeeFreeId(add.getTransfeeFreeId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTransfeeFreeBo bo) { + TzTransfeeFree update = MapstructUtils.convert(bo, TzTransfeeFree.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzTransfeeFree entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeServiceImpl.java new file mode 100644 index 0000000..c091827 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransfeeServiceImpl.java @@ -0,0 +1,133 @@ +package org.dromara.mall.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.mall.domain.bo.TzTransfeeBo; +import org.dromara.mall.domain.vo.TzTransfeeVo; +import org.dromara.mall.domain.TzTransfee; +import org.dromara.mall.mapper.TzTransfeeMapper; +import org.dromara.mall.service.ITzTransfeeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzTransfeeServiceImpl implements ITzTransfeeService { + + private final TzTransfeeMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param transfeeId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzTransfeeVo queryById(Long transfeeId){ + return baseMapper.selectVoById(transfeeId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTransfeeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzTransfeeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTransfeeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTransportId() != null, TzTransfee::getTransportId, bo.getTransportId()); + lqw.eq(bo.getContinuousPiece() != null, TzTransfee::getContinuousPiece, bo.getContinuousPiece()); + lqw.eq(bo.getFirstPiece() != null, TzTransfee::getFirstPiece, bo.getFirstPiece()); + lqw.eq(bo.getContinuousFee() != null, TzTransfee::getContinuousFee, bo.getContinuousFee()); + lqw.eq(bo.getFirstFee() != null, TzTransfee::getFirstFee, bo.getFirstFee()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTransfeeBo bo) { + TzTransfee add = MapstructUtils.convert(bo, TzTransfee.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTransfeeId(add.getTransfeeId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTransfeeBo bo) { + TzTransfee update = MapstructUtils.convert(bo, TzTransfee.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzTransfee entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransportServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransportServiceImpl.java new file mode 100644 index 0000000..3f38e0c --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzTransportServiceImpl.java @@ -0,0 +1,121 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzTransport; +import org.dromara.mall.domain.bo.TzTransportBo; +import org.dromara.mall.domain.vo.TzTransportVo; +import org.dromara.mall.mapper.TzTransportMapper; +import org.dromara.mall.service.ITzTransportService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzTransportServiceImpl implements ITzTransportService { + + private final TzTransportMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param transportId 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzTransportVo queryById(Long transportId){ + return baseMapper.selectVoById(transportId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzTransportBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzTransportBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzTransportBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getTransName()), TzTransport::getTransName, bo.getTransName()); + lqw.eq(bo.getShopId() != null, TzTransport::getShopId, bo.getShopId()); + lqw.eq(bo.getChargeType() != null, TzTransport::getChargeType, bo.getChargeType()); + lqw.eq(bo.getIsFreeFee() != null, TzTransport::getIsFreeFee, bo.getIsFreeFee()); + lqw.eq(bo.getHasFreeCondition() != null, TzTransport::getHasFreeCondition, bo.getHasFreeCondition()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzTransportBo bo) { + TzTransport add = MapstructUtils.convert(bo, TzTransport.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTransportId(add.getTransportId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzTransportBo bo) { + TzTransport update = MapstructUtils.convert(bo, TzTransport.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrOrderServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrOrderServiceImpl.java new file mode 100644 index 0000000..998f34a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrOrderServiceImpl.java @@ -0,0 +1,129 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserAddrOrder; +import org.dromara.mall.domain.bo.TzUserAddrOrderBo; +import org.dromara.mall.domain.vo.TzUserAddrOrderVo; +import org.dromara.mall.mapper.TzUserAddrOrderMapper; +import org.dromara.mall.service.ITzUserAddrOrderService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 用户订单配送地址Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzUserAddrOrderServiceImpl implements ITzUserAddrOrderService { + + private final TzUserAddrOrderMapper baseMapper; + + /** + * 查询用户订单配送地址 + * + * @param addrOrderId 主键 + * @return 用户订单配送地址 + */ + @Override + public TzUserAddrOrderVo queryById(Long addrOrderId){ + return baseMapper.selectVoById(addrOrderId); + } + + /** + * 分页查询用户订单配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户订单配送地址分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserAddrOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户订单配送地址列表 + * + * @param bo 查询条件 + * @return 用户订单配送地址列表 + */ + @Override + public List queryList(TzUserAddrOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserAddrOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getAddrId() != null, TzUserAddrOrder::getAddrId, bo.getAddrId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzUserAddrOrder::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getReceiver()), TzUserAddrOrder::getReceiver, bo.getReceiver()); + lqw.eq(bo.getProvinceId() != null, TzUserAddrOrder::getProvinceId, bo.getProvinceId()); + lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TzUserAddrOrder::getProvince, bo.getProvince()); + lqw.eq(bo.getAreaId() != null, TzUserAddrOrder::getAreaId, bo.getAreaId()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), TzUserAddrOrder::getArea, bo.getArea()); + lqw.eq(bo.getCityId() != null, TzUserAddrOrder::getCityId, bo.getCityId()); + lqw.eq(StringUtils.isNotBlank(bo.getCity()), TzUserAddrOrder::getCity, bo.getCity()); + lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TzUserAddrOrder::getAddr, bo.getAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getPostCode()), TzUserAddrOrder::getPostCode, bo.getPostCode()); + lqw.eq(StringUtils.isNotBlank(bo.getMobile()), TzUserAddrOrder::getMobile, bo.getMobile()); + return lqw; + } + + /** + * 新增用户订单配送地址 + * + * @param bo 用户订单配送地址 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserAddrOrderBo bo) { + TzUserAddrOrder add = MapstructUtils.convert(bo, TzUserAddrOrder.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAddrOrderId(add.getAddrOrderId()); + } + return flag; + } + + /** + * 修改用户订单配送地址 + * + * @param bo 用户订单配送地址 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserAddrOrderBo bo) { + TzUserAddrOrder update = MapstructUtils.convert(bo, TzUserAddrOrder.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除用户订单配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrServiceImpl.java new file mode 100644 index 0000000..99d3ddb --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddrServiceImpl.java @@ -0,0 +1,130 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserAddr; +import org.dromara.mall.domain.bo.TzUserAddrBo; +import org.dromara.mall.domain.vo.TzUserAddrVo; +import org.dromara.mall.mapper.TzUserAddrMapper; +import org.dromara.mall.service.ITzUserAddrService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 用户配送地址Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzUserAddrServiceImpl implements ITzUserAddrService { + + private final TzUserAddrMapper baseMapper; + + /** + * 查询用户配送地址 + * + * @param addrId 主键 + * @return 用户配送地址 + */ + @Override + public TzUserAddrVo queryById(Long addrId){ + return baseMapper.selectVoById(addrId); + } + + /** + * 分页查询用户配送地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户配送地址分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserAddrBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户配送地址列表 + * + * @param bo 查询条件 + * @return 用户配送地址列表 + */ + @Override + public List queryList(TzUserAddrBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserAddrBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzUserAddr::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getReceiver()), TzUserAddr::getReceiver, bo.getReceiver()); + lqw.eq(bo.getProvinceId() != null, TzUserAddr::getProvinceId, bo.getProvinceId()); + lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TzUserAddr::getProvince, bo.getProvince()); + lqw.eq(StringUtils.isNotBlank(bo.getCity()), TzUserAddr::getCity, bo.getCity()); + lqw.eq(bo.getCityId() != null, TzUserAddr::getCityId, bo.getCityId()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), TzUserAddr::getArea, bo.getArea()); + lqw.eq(bo.getAreaId() != null, TzUserAddr::getAreaId, bo.getAreaId()); + lqw.eq(StringUtils.isNotBlank(bo.getPostCode()), TzUserAddr::getPostCode, bo.getPostCode()); + lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TzUserAddr::getAddr, bo.getAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getMobile()), TzUserAddr::getMobile, bo.getMobile()); + lqw.eq(bo.getStatus() != null, TzUserAddr::getStatus, bo.getStatus()); + lqw.eq(bo.getCommonAddr() != null, TzUserAddr::getCommonAddr, bo.getCommonAddr()); + return lqw; + } + + /** + * 新增用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserAddrBo bo) { + TzUserAddr add = MapstructUtils.convert(bo, TzUserAddr.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAddrId(add.getAddrId()); + } + return flag; + } + + /** + * 修改用户配送地址 + * + * @param bo 用户配送地址 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserAddrBo bo) { + TzUserAddr update = MapstructUtils.convert(bo, TzUserAddr.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除用户配送地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddressServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddressServiceImpl.java new file mode 100644 index 0000000..80325e8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserAddressServiceImpl.java @@ -0,0 +1,180 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserAddress; +import org.dromara.mall.domain.bo.TzUserAddressBo; +import org.dromara.mall.domain.vo.TzUserAddressVo; +import org.dromara.mall.mapper.TzUserAddressMapper; +import org.dromara.mall.service.ITzUserAddressService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 客户地址Service业务层处理 + * + * @author Maosw + * @date 2024-09-15 + */ +@RequiredArgsConstructor +@Service +public class TzUserAddressServiceImpl implements ITzUserAddressService { + + private final TzUserAddressMapper baseMapper; + + /** + * 查询客户地址 + * + * @param id 主键 + * @return 客户地址 + */ + @Override + public TzUserAddressVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询客户地址列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 客户地址分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserAddressBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的客户地址列表 + * + * @param bo 查询条件 + * @return 客户地址列表 + */ + @Override + public List queryList(TzUserAddressBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserAddressBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzUserAddress::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzUserAddress::getUserName, bo.getUserName()); + lqw.like(StringUtils.isNotBlank(bo.getUserPhone()), TzUserAddress::getUserPhone, bo.getUserPhone()); + lqw.like(StringUtils.isNotBlank(bo.getUserAddress()), TzUserAddress::getUserAddress, bo.getUserAddress()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzUserAddress::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增客户地址 + * + * @param bo 客户地址 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserAddressBo bo) { + //boolean exists = baseMapper.exists(new LambdaQueryWrapper().eq(TzUserAddress::getUserName, bo.getUserName()).eq(TzUserAddress::getUserPhone, bo.getUserPhone())); + bo.setCreateTime(new Date()); + TzUserAddress add = MapstructUtils.convert(bo, TzUserAddress.class); + bo.setId(add.getId()); + // 如果新增地址为默认地址,则将该用户的其他地址设为非默认 + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + List userAddressList = baseMapper.selectList( + new LambdaQueryWrapper() + .eq(TzUserAddress::getUserId, bo.getUserId()) + .eq(TzUserAddress::getIsDefault, 1) + ); + if (!userAddressList.isEmpty()) { + userAddressList.forEach(address -> address.setIsDefault(2)); + baseMapper.updateBatchById(userAddressList); + } + } + return baseMapper.insert(add) > 0; + } + + /** + * 修改客户地址 + * + * @param bo 客户地址 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserAddressBo bo) { + TzUserAddress update = MapstructUtils.convert(bo, TzUserAddress.class); + if (bo.getIsDefault() != null && bo.getIsDefault() == 1) { + // 如果设置为默认地址,则将该用户的其他地址设为非默认 + List userAddressList = baseMapper.selectList( + new LambdaQueryWrapper() + .eq(TzUserAddress::getUserId, bo.getUserId()) + .eq(TzUserAddress::getIsDefault, 1) + ); + if (!userAddressList.isEmpty()) { + userAddressList.forEach(address -> address.setIsDefault(2)); + baseMapper.updateBatchById(userAddressList); + } + } + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除客户地址信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 查看用户默认地址信息 + * @param userId + * @return + */ + @Override + public TzUserAddressVo userAddress(Long userId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(TzUserAddress::getUserId, userId).eq(TzUserAddress::getIsDefault, 1)); + } + + /** + * 查看用户全部地址信息 + * @param userId + * @return + */ + @Override + public List userAddressList(Long userId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(TzUserAddress::getUserId, userId)); + } + + /** + * 清空用户默认地址信息 + * @param userId + */ + @Override + public void clearAddressList(Long userId) { + List userAddressList = baseMapper.selectList(new LambdaQueryWrapper().eq(TzUserAddress::getUserId, userId)); + for (TzUserAddress address : userAddressList) { + address.setIsDefault(2); + } + baseMapper.updateBatchById(userAddressList); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserCollectionServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserCollectionServiceImpl.java new file mode 100644 index 0000000..501e75e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserCollectionServiceImpl.java @@ -0,0 +1,119 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserCollection; +import org.dromara.mall.domain.bo.TzUserCollectionBo; +import org.dromara.mall.domain.vo.TzUserCollectionVo; +import org.dromara.mall.mapper.TzUserCollectionMapper; +import org.dromara.mall.service.ITzUserCollectionService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzUserCollectionServiceImpl implements ITzUserCollectionService { + + private final TzUserCollectionMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param id 主键 + * @return 【请填写功能名称】 + */ + @Override + public TzUserCollectionVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserCollectionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(TzUserCollectionBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserCollectionBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getProdId() != null, TzUserCollection::getProdId, bo.getProdId()); + lqw.eq(StringUtils.isNotBlank(bo.getUserId()), TzUserCollection::getUserId, bo.getUserId()); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserCollectionBo bo) { + TzUserCollection add = MapstructUtils.convert(bo, TzUserCollection.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserCollectionBo bo) { + TzUserCollection update = MapstructUtils.convert(bo, TzUserCollection.class); + return baseMapper.updateById(update) > 0; + } + + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserSearchServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserSearchServiceImpl.java new file mode 100644 index 0000000..b49ec01 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserSearchServiceImpl.java @@ -0,0 +1,146 @@ +package org.dromara.mall.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.TzUserSearch; +import org.dromara.mall.domain.bo.TzUserSearchBo; +import org.dromara.mall.domain.vo.TzUserSearchVo; +import org.dromara.mall.mapper.TzUserSearchMapper; +import org.dromara.mall.service.ITzUserSearchService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 用户搜索Service业务层处理 + * + * @author Maosw + * @date 2024-08-09 + */ +@RequiredArgsConstructor +@Service +public class TzUserSearchServiceImpl extends ServiceImpl implements ITzUserSearchService { + + private final TzUserSearchMapper baseMapper; + + /** + * 查询用户搜索 + * + * @param id 主键 + * @return 用户搜索 + */ + @Override + public TzUserSearchVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询用户搜索列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户搜索分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserSearchBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的用户搜索列表 + * + * @param bo 查询条件 + * @return 用户搜索列表 + */ + @Override + public List queryList(TzUserSearchBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserSearchBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzUserSearch::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TzUserSearch::getTitle, bo.getTitle()); + lqw.eq(bo.getNum() != null, TzUserSearch::getNum, bo.getNum()); + lqw.eq(bo.getRecDate() != null, TzUserSearch::getRecDate, bo.getRecDate()); + return lqw; + } + + /** + * 新增用户搜索 + * + * @param bo 用户搜索 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserSearchBo bo) { + TzUserSearch add = MapstructUtils.convert(bo, TzUserSearch.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户搜索 + * + * @param bo 用户搜索 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserSearchBo bo) { + TzUserSearch update = MapstructUtils.convert(bo, TzUserSearch.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除用户搜索信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public void setSearchNumByUserID(String prodName, Long userId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzUserSearch::getTitle,prodName).eq(TzUserSearch::getUserId,userId); + if(ObjectUtil.isEmpty(lqw)){ + TzUserSearch bo = new TzUserSearch(); + bo.setTitle(prodName); + bo.setUserId(userId); + bo.setRecDate(new Date()); + baseMapper.insert(bo); + }else { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper().eq(TzUserSearch::getTitle,prodName).eq(TzUserSearch::getUserId,userId); + updateWrapper.setIncrBy(TzUserSearch::getNum, 1); + } + } + + @Override + public IPage querySearchList(PageQuery pageQuery, Long userId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper().eq(TzUserSearch::getUserId,userId).orderByDesc(TzUserSearch::getNum); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserServiceImpl.java new file mode 100644 index 0000000..7c83df1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzUserServiceImpl.java @@ -0,0 +1,288 @@ +package org.dromara.mall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.mall.domain.HyOrderItem; +import org.dromara.mall.domain.TzUser; +import org.dromara.mall.domain.bo.TzUserBo; +import org.dromara.mall.domain.vo.TzUserSumVo; +import org.dromara.mall.domain.vo.TzUserVo; +import org.dromara.mall.mapper.HyOrderItemMapper; +import org.dromara.mall.mapper.TzUserMapper; +import org.dromara.mall.service.ITzUserService; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 用户Service业务层处理 + * + * @author Lion Li + * @date 2024-07-30 + */ +@RequiredArgsConstructor +@Service +public class TzUserServiceImpl extends MPJBaseServiceImpl implements ITzUserService { + + private final TzUserMapper baseMapper; + + private final HyOrderItemMapper hyOrderItemMapper; + + /** + * 查询用户 + * + * @param userId 主键 + * @return 用户 + */ + @Override + public TzUserVo queryById(Long userId){ + return baseMapper.selectVoById(userId); + } + + /** + * 分页查询用户列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 用户分页列表 + */ + @Override + public TableDataInfo queryPageList(TzUserBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + + // 获取用户列表 + List userList = result.getRecords(); + + // 遍历用户列表,查询每个用户的已完成订单数量 + for (TzUserVo user : userList) { + LambdaQueryWrapper orderWrapper = Wrappers.lambdaQuery(); + orderWrapper.eq(HyOrderItem::getUserId, user.getUserId()); + orderWrapper.eq(HyOrderItem::getStatus, 6); + Long orderCount = hyOrderItemMapper.selectCount(orderWrapper); + user.setOrderNum(orderCount); + } + return TableDataInfo.build(result); + } + + /** + * 查询用户统计信息 + * + * @param bo + * @return + */ + @Override + public TzUserSumVo querySum(TzUserBo bo) { + TzUserSumVo sumVo = new TzUserSumVo(); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + // 查询用户总数 + sumVo.setUserNum(baseMapper.selectCount(lqw)); + + // 查询总余额 + BigDecimal totalBalance = baseMapper.selectList(lqw) + .stream() + .map(TzUser::getBalance) + .reduce(BigDecimal.ZERO, BigDecimal::add); + sumVo.setTotalBalance(totalBalance); + + // 查询已认证用户数量 + LambdaQueryWrapper authWrapper = buildQueryWrapper(bo); + authWrapper.eq(TzUser::getExamineFlag, 3); + Long authNum = baseMapper.selectCount(authWrapper); + sumVo.setAuthNum(authNum); + + //查询待审核用户数量 + LambdaQueryWrapper auditWrapper = buildQueryWrapper(bo); + auditWrapper.eq(TzUser::getExamineFlag, 2); + Long auditNum = baseMapper.selectCount(auditWrapper); + sumVo.setAuditNum(auditNum); + + // 查询订单总数 + /*LambdaQueryWrapper orderWrapper = Wrappers.lambdaQuery(); + Long orderNum = hyOrderItemMapper.selectCount(orderWrapper); + sumVo.setOrderNum(orderNum);*/ + return sumVo; + } + + /** + * 查询符合条件的用户列表 + * + * @param bo 查询条件 + * @return 用户列表 + */ + @Override + public List queryList(TzUserBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzUserBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getNickName()), TzUser::getNickName, bo.getNickName()); + lqw.like(StringUtils.isNotBlank(bo.getRealName()), TzUser::getRealName, bo.getRealName()); + lqw.eq(StringUtils.isNotBlank(bo.getUserMail()), TzUser::getUserMail, bo.getUserMail()); + lqw.eq(StringUtils.isNotBlank(bo.getLoginPassword()), TzUser::getLoginPassword, bo.getLoginPassword()); + lqw.eq(StringUtils.isNotBlank(bo.getPayPassword()), TzUser::getPayPassword, bo.getPayPassword()); + lqw.eq(StringUtils.isNotBlank(bo.getUserMobile()), TzUser::getUserMobile, bo.getUserMobile()); + lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), TzUser::getIdCard, bo.getIdCard()); + lqw.eq(bo.getModifyTime() != null, TzUser::getModifyTime, bo.getModifyTime()); + lqw.eq(bo.getUserRegtime() != null, TzUser::getUserRegtime, bo.getUserRegtime()); + lqw.eq(bo.getIsMember() != null, TzUser::getIsMember, bo.getIsMember()); + lqw.eq(bo.getExamineFlag() != null, TzUser::getExamineFlag, bo.getExamineFlag()); + lqw.eq(StringUtils.isNotBlank(bo.getUserRegip()), TzUser::getUserRegip, bo.getUserRegip()); + lqw.eq(bo.getUserLasttime() != null, TzUser::getUserLasttime, bo.getUserLasttime()); + lqw.eq(StringUtils.isNotBlank(bo.getUserLastip()), TzUser::getUserLastip, bo.getUserLastip()); + lqw.eq(StringUtils.isNotBlank(bo.getUserMemo()), TzUser::getUserMemo, bo.getUserMemo()); + lqw.eq(StringUtils.isNotBlank(bo.getSex()), TzUser::getSex, bo.getSex()); + lqw.eq(StringUtils.isNotBlank(bo.getBirthDate()), TzUser::getBirthDate, bo.getBirthDate()); + lqw.eq(StringUtils.isNotBlank(bo.getPic()), TzUser::getPic, bo.getPic()); + lqw.eq(bo.getStatus() != null, TzUser::getStatus, bo.getStatus()); + lqw.eq(bo.getScore() != null, TzUser::getScore, bo.getScore()); + lqw.between(params.get("beginModifyTime") != null && params.get("endModifyTime") != null, TzUser::getModifyTime, params.get("beginModifyTime"), params.get("endModifyTime")); + return lqw; + } + + /** + * 新增用户 + * + * @param bo 用户 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzUserBo bo) { + TzUser add = MapstructUtils.convert(bo, TzUser.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setUserId(add.getUserId()); + } + return flag; + } + + /** + * 修改用户 + * + * @param bo 用户 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzUserBo bo) { + TzUser update = MapstructUtils.convert(bo, TzUser.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 开启设计师开关 + * + * @param userPhone + * @param status + * @return + */ + @Override + public Boolean queryByUserPhone(String userPhone, Integer status) { + TzUser user = baseMapper.selectOne(Wrappers.lambdaQuery().eq(TzUser::getUserMobile, userPhone)); + if (user == null){ + throw new ServiceException("该用户未注册"); + } else{ + if(status == 1){ + user.setIsDesigner(1); + } else if (status == 2) { + user.setIsDesigner(0); + } + } + return baseMapper.updateById(user) > 0; + } + + /** + * 校验并批量删除用户信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 提交实名认证 + * + * @param bo 用户认证信息 + * @return 是否提交成功 + */ + @Override + public Boolean submitAuth(TzUserBo bo) { + // 检查是否已提交过认证 + TzUser user = baseMapper.selectById(bo.getUserId()); + if (user == null) { + throw new ServiceException("用户不存在"); + } + if (user.getExamineFlag() == 2 || user.getExamineFlag() == 3) { + throw new ServiceException("已提交过认证申请"); + } + TzUser update = MapstructUtils.convert(bo, TzUser.class); + update.setExamineFlag(2); + return baseMapper.updateById(update) > 0; + } + + /** + * 提交设计师认证 + * + * @param bo 设计师认证信息 + * @return 是否提交成功 + */ + @Override + public Boolean submitSjsAuth(TzUserBo bo) { + // 检查是否已提交过认证 + TzUser user = baseMapper.selectById(bo.getUserId()); + if (user == null) { + throw new ServiceException("用户不存在"); + } + if (user.getSjsFlag() == 2 || user.getSjsFlag() == 3) { + throw new ServiceException("已提交过设计师认证申请"); + } + TzUser update = MapstructUtils.convert(bo, TzUser.class); + update.setSjsFlag(2); + return baseMapper.updateById(update) > 0; + } + + @Override + public TableDataInfo queryPageListChart(TzUserBo bo, PageQuery pageQuery) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAs(TzUser::getUserId, "userId") + .selectAs(TzUser::getRealName, "realName") + .selectCount(HyOrderItem::getId, "orderNum") + .selectSum(HyOrderItem::getTotal, "orderTotal") + .leftJoin(HyOrderItem.class, HyOrderItem::getUserId, TzUser::getUserId) + .groupBy(TzUser::getUserId) + .orderByDesc("orderTotal"); + + // 添加查询条件 + if (bo != null) { + Map params = bo.getParams(); + wrapper.eq(HyOrderItem::getDelFlag, 1); + wrapper.ne(HyOrderItem::getPayState, 1); + wrapper.like(StringUtils.isNotBlank(bo.getNickName()), TzUser::getNickName, bo.getNickName()); + wrapper.like(StringUtils.isNotBlank(bo.getRealName()),TzUser::getRealName, bo.getRealName()); + wrapper.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + HyOrderItem::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + } + // 执行分页查询 + Page page = baseMapper.selectJoinPage(pageQuery.build(), TzUserVo.class, wrapper); + return TableDataInfo.build(page); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzWithdrawRequestServiceImpl.java b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzWithdrawRequestServiceImpl.java new file mode 100644 index 0000000..735fe59 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/TzWithdrawRequestServiceImpl.java @@ -0,0 +1,548 @@ +package org.dromara.mall.service.impl; + +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.lakala.zf.laop.java.sdk.demo.utils.KlkConstant; +import com.lakala.zf.laop.java.sdk.demo.utils.V3LakalaUserUtils; +import com.lkl.laop.sdk.request.V3SacsBalanceSeparateRequest; +import com.lkl.laop.sdk.request.V3SacsQueryRequest; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.mall.domain.*; +import org.dromara.mall.domain.bo.TzWithdrawRequestBo; +import org.dromara.mall.domain.vo.TzWithdrawRequestVo; +import org.dromara.mall.domain.vo.TzWithdrawSumVo; +import org.dromara.mall.mapper.*; +import org.dromara.mall.service.ITzWithdrawRequestService; +import org.dromara.system.domain.SysDictData; +import org.dromara.system.mapper.SysDictDataMapper; +import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.service.ISysTenantService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 提现申请Service业务层处理 + * + * @author Maosw + * @date 2024-12-12 + */ +@RequiredArgsConstructor +@Service +public class TzWithdrawRequestServiceImpl extends MPJBaseServiceImpl implements ITzWithdrawRequestService { + + private final TzWithdrawRequestMapper baseMapper; + + private final TzUserMapper userMapper; + + private final HyPromoterRecordMapper promoterRecordMapper; + + private final HyUserRecordMapper userRecordMapper; + + private final HyPromoterMapper promoterMapper; + + private final TzTenantRecordMapper tententRecordMapper; + + private final SysTenantMapper tenantMapper; + + private final ISysTenantService tenantService; + + private final SysDictDataMapper dictDataMapper; + + private final TzBankCardMapper bankCardMapper; + + /** + * 查询提现申请 + * + * @param id 主键 + * @return 提现申请 + */ + @Override + public TzWithdrawRequestVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询提现申请列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 提现申请分页列表 + */ + @Override + public TableDataInfo queryPageList(TzWithdrawRequestBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildMPJLambdaWrapper(bo); + lqw.orderByDesc(TzWithdrawRequest::getCreateTime); + Page result = baseMapper.selectJoinPage(pageQuery.build(), TzWithdrawRequestVo.class, lqw); + return TableDataInfo.build(result); + } + + /** + * 查询提现申请统计信息 + * + * @param bo + */ + @Override + public TzWithdrawSumVo querySum(TzWithdrawRequestBo bo) { + // 使用MPJLambdaWrapper构建多表关联查询 + MPJLambdaWrapper lqw = buildMPJLambdaWrapper(bo) + .selectCount(TzWithdrawRequest::getId, TzWithdrawSumVo::getTotalNum) + .selectSum(TzWithdrawRequest::getWithdrawAmount, TzWithdrawSumVo::getTotalAmount) + .selectSum(TzWithdrawRequest::getTaxAmount, TzWithdrawSumVo::getTotalTax) + .selectSum(TzWithdrawRequest::getZhTaxAmount, TzWithdrawSumVo::getTotalZhTax); + + // 执行查询 + TzWithdrawSumVo withdrawSum = baseMapper.selectJoinOne(TzWithdrawSumVo.class, lqw); + + //待审核数量 + LambdaQueryWrapper lqw1 = new LambdaQueryWrapper<>(); + lqw1.eq(TzWithdrawRequest::getWithdrawStatus, 1); + Long dshNum = baseMapper.selectCount(lqw1); + withdrawSum.setDshNum(dshNum); + + //已打款数量 + LambdaQueryWrapper lqw2 = new LambdaQueryWrapper<>(); + lqw2.eq(TzWithdrawRequest::getWithdrawStatus, 3); + Long ydkNum = baseMapper.selectCount(lqw2); + withdrawSum.setYdkNum(ydkNum); + + //审核拒绝数量 + LambdaQueryWrapper lqw3 = new LambdaQueryWrapper<>(); + lqw3.eq(TzWithdrawRequest::getWithdrawStatus, 5); + Long sjyNum = baseMapper.selectCount(lqw3); + withdrawSum.setSjyNum(sjyNum); + + //开票数量 + LambdaQueryWrapper lqw4 = new LambdaQueryWrapper<>(); + lqw4.eq(TzWithdrawRequest::getInvoiceType, 1); + Long kpNum = baseMapper.selectCount(lqw4); + withdrawSum.setKpNum(kpNum); + + //不开票数量 + LambdaQueryWrapper lqw5 = new LambdaQueryWrapper<>(); + lqw5.eq(TzWithdrawRequest::getInvoiceType, 2); + Long bkpNum = baseMapper.selectCount(lqw5); + withdrawSum.setBkpNum(bkpNum); + return withdrawSum; + } + + /** + * 查询符合条件的提现申请列表 + * + * @param bo 查询条件 + * @return 提现申请列表 + */ + @Override + public List queryList(TzWithdrawRequestBo bo) { + MPJLambdaWrapper lqw = buildMPJLambdaWrapper(bo); + return baseMapper.selectJoinList(TzWithdrawRequestVo.class,lqw); + } + + private MPJLambdaWrapper buildMPJLambdaWrapper(TzWithdrawRequestBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = new MPJLambdaWrapper<>(); + lqw.eq(bo.getUserId() != null, TzWithdrawRequest::getUserId, bo.getUserId()); + lqw.eq(bo.getRoleType() != null, TzWithdrawRequest::getRoleType, bo.getRoleType()); + lqw.eq(bo.getWithdrawAmount() != null, TzWithdrawRequest::getWithdrawAmount, bo.getWithdrawAmount()); + lqw.eq(bo.getCurrentBalance() != null, TzWithdrawRequest::getCurrentBalance, bo.getCurrentBalance()); + lqw.eq(bo.getWithdrawStatus() != null, TzWithdrawRequest::getWithdrawStatus, bo.getWithdrawStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), TzWithdrawRequest::getPaymentMethod, bo.getPaymentMethod()); + lqw.like(StringUtils.isNotBlank(bo.getCardHolderName()), TzWithdrawRequest::getCardHolderName, bo.getCardHolderName()); + lqw.like(StringUtils.isNotBlank(bo.getBankName()), TzWithdrawRequest::getBankName, bo.getBankName()); + lqw.like(StringUtils.isNotBlank(bo.getBranchName()), TzWithdrawRequest::getBranchName, bo.getBranchName()); + lqw.eq(StringUtils.isNotBlank(bo.getCardNumber()), TzWithdrawRequest::getCardNumber, bo.getCardNumber()); + lqw.between(params.get("beginApproveTime") != null && params.get("endApproveTime") != null, + TzWithdrawRequest::getApproveTime ,params.get("beginApproveTime"), params.get("endApproveTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzWithdrawRequest::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.eq(StringUtils.isNotBlank(bo.getApproveBy()), TzWithdrawRequest::getApproveBy, bo.getApproveBy()); + lqw.like(StringUtils.isNotBlank(bo.getRemark()), TzWithdrawRequest::getRemark, bo.getRemark()); + return lqw; + } + + private LambdaQueryWrapper buildQueryWrapper(TzWithdrawRequestBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, TzWithdrawRequest::getUserId, bo.getUserId()); + lqw.eq(bo.getRoleType() != null, TzWithdrawRequest::getRoleType, bo.getRoleType()); + lqw.eq(bo.getWithdrawAmount() != null, TzWithdrawRequest::getWithdrawAmount, bo.getWithdrawAmount()); + lqw.eq(bo.getCurrentBalance() != null, TzWithdrawRequest::getCurrentBalance, bo.getCurrentBalance()); + lqw.eq(bo.getWithdrawStatus() != null, TzWithdrawRequest::getWithdrawStatus, bo.getWithdrawStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getPaymentMethod()), TzWithdrawRequest::getPaymentMethod, bo.getPaymentMethod()); + lqw.like(StringUtils.isNotBlank(bo.getCardHolderName()), TzWithdrawRequest::getCardHolderName, bo.getCardHolderName()); + lqw.like(StringUtils.isNotBlank(bo.getBankName()), TzWithdrawRequest::getBankName, bo.getBankName()); + lqw.like(StringUtils.isNotBlank(bo.getBranchName()), TzWithdrawRequest::getBranchName, bo.getBranchName()); + lqw.eq(StringUtils.isNotBlank(bo.getCardNumber()), TzWithdrawRequest::getCardNumber, bo.getCardNumber()); + lqw.between(params.get("beginApproveTime") != null && params.get("endApproveTime") != null, + TzWithdrawRequest::getApproveTime ,params.get("beginApproveTime"), params.get("endApproveTime")); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzWithdrawRequest::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.eq(StringUtils.isNotBlank(bo.getApproveBy()), TzWithdrawRequest::getApproveBy, bo.getApproveBy()); + return lqw; + } + + /** + * 新增提现申请 + * + * @param bo 提现申请 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzWithdrawRequestBo bo) { + TzWithdrawRequest add = MapstructUtils.convert(bo, TzWithdrawRequest.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改提现申请 + * + * @param bo 提现申请 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzWithdrawRequestBo bo) { + TzWithdrawRequest update = MapstructUtils.convert(bo, TzWithdrawRequest.class); + return baseMapper.updateById(update) > 0; + } + + /** + * 校验并批量删除提现申请信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean applyWithdraw(TzWithdrawRequestBo bo) { + SysDictData gsTaxRate = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_gs_tax_rate").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); + if (gsTaxRate == null) { + throw new ServiceException("获取会员提现个税税率失败"); + } + SysDictData zhTaxRate = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_zh_tax_rate").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); + if (zhTaxRate == null) { + throw new ServiceException("获取会员提现增值税税率失败"); + } +// /*SysDictData sxfTaxRate = dictDataMapper.selectOne(new LambdaQueryWrapper().eq(SysDictData::getDictType, "hy_sxf_tax_rate").eq(SysDictData::getTenantId,"000000").eq(SysDictData::getIsDefault, "N")); +// if (sxfTaxRate == null) { +// throw new ServiceException("获取会员提现手续费税率失败"); +// }*/ + + // 1. 检查用户余额 + TzUser user = userMapper.selectById(bo.getUserId()); + if (user == null) { + throw new ServiceException("用户不存在"); + } + if (user.getBalance().compareTo(bo.getWithdrawAmount()) < 0) { + throw new ServiceException("余额不足"); + } + + // 2. 扣除用户余额 + boolean result = userMapper.update(null, + Wrappers.lambdaUpdate() + .setSql("balance = balance - " + bo.getWithdrawAmount()) + .eq(TzUser::getUserId, bo.getUserId()) + .ge(TzUser::getBalance, bo.getWithdrawAmount())) > 0; + + if (!result) { + throw new ServiceException("余额扣除失败"); + } + BigDecimal gsRate = BigDecimal.ZERO; + BigDecimal zhRate = BigDecimal.ZERO; +// BigDecimal sxfRate = BigDecimal.ZERO; + BigDecimal gsAmount = BigDecimal.ZERO; + BigDecimal zhAmount = BigDecimal.ZERO; +// BigDecimal sxfAmount = BigDecimal.ZERO; + + + if(bo.getInvoiceType() == 2){ + //判断gsTaxRate不等于0 + if (new BigDecimal(gsTaxRate.getDictValue()).compareTo(BigDecimal.ZERO) != 0) { + // 个税税率 + gsRate = new BigDecimal(gsTaxRate.getDictValue()); + // 个税税金 + gsAmount = bo.getWithdrawAmount().multiply(gsRate); + } + } + + //判断zhTaxRate不等于0 + if (new BigDecimal(zhTaxRate.getDictValue()).compareTo(BigDecimal.ZERO) != 0) { + // 增值税税率 + zhRate = new BigDecimal(zhTaxRate.getDictValue()); + // 增值税税金 + zhAmount = bo.getWithdrawAmount().multiply(zhRate); + } + + /*//判断sxfTaxRate不等于0 + if (new BigDecimal(sxfTaxRate.getDictValue()).compareTo(BigDecimal.ZERO) != 0) { + // 手续费税率 + sxfRate = new BigDecimal(sxfTaxRate.getDictValue()); + // 手续费税金 + sxfAmount = bo.getWithdrawAmount().multiply(sxfRate); + }*/ + + // 实际提现金额 + BigDecimal afterTaxAmount = bo.getWithdrawAmount().subtract(gsAmount).subtract(zhAmount); + + // 3. 创建提现申请记录 + bo.setCurrentBalance(user.getBalance()); + bo.setTaxRate(gsRate); + bo.setTaxAmount(gsAmount); + bo.setZhTaxRate(zhRate); + bo.setZhTaxAmount(zhAmount); +// bo.setSxfTaxRate(sxfRate); +// bo.setSxfTaxAmount(sxfAmount); + bo.setAfterTaxAmount(afterTaxAmount); + bo.setCreateTime(new Date()); + if (!insertByBo(bo)) { + throw new ServiceException("创建提现申请失败"); + } + + // 4. 添加提现记录 + HyUserRecord record = new HyUserRecord(); + record.setUserId(bo.getUserId()); + record.setUserName(user.getRealName()); + record.setUserPhone(user.getUserMobile()); + record.setAmount(bo.getWithdrawAmount()); + record.setBalance(user.getBalance().subtract(bo.getWithdrawAmount())); + record.setTaxRate(gsRate); + record.setTaxAmount(gsAmount); + record.setZhTaxRate(zhRate); + record.setZhTaxAmount(zhAmount); +// record.setSxfTaxRate(sxfRate); +// record.setSxfTaxAmount(sxfAmount); + record.setAfterTaxAmount(afterTaxAmount); + record.setType(3); + record.setCreateTime(new Date()); + record.setRemark("提现申请"); + if (userRecordMapper.insert(record) <= 0) { + throw new ServiceException("创建提现记录失败"); + } + return true; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean applyWithdrawPromoter(TzWithdrawRequestBo bo) { + // 1. 检查推广员余额 + HyPromoter promoter = promoterMapper.selectById(bo.getUserId()); + if (promoter == null) { + throw new ServiceException("推广员不存在"); + } + if (promoter.getBalance().compareTo(bo.getWithdrawAmount()) < 0) { + throw new ServiceException("余额不足"); + } + + // 2. 扣除推广员余额 + boolean result = promoterMapper.update(null, + Wrappers.lambdaUpdate() + .setSql("balance = balance - " + bo.getWithdrawAmount()) + .eq(HyPromoter::getId, bo.getUserId()) + .ge(HyPromoter::getBalance, bo.getWithdrawAmount())) > 0; + + if (!result) { + throw new ServiceException("余额扣除失败"); + } + + // 3. 创建提现申请记录 + bo.setCurrentBalance(promoter.getBalance()); + bo.setCreateTime(new Date()); + if (!insertByBo(bo)) { + throw new ServiceException("创建提现申请失败"); + } + + // 4. 添加提现记录 + HyPromoterRecord record = new HyPromoterRecord(); + record.setPromoterId(bo.getUserId()); + record.setAmount(bo.getWithdrawAmount()); + record.setBalance(promoter.getBalance().subtract(bo.getWithdrawAmount())); + record.setType(3); + record.setCreateTime(new Date()); + record.setRemark("提现申请"); + if (promoterRecordMapper.insert(record) <= 0) { + throw new ServiceException("创建提现记录失败"); + } + return true; + } + + @Override + public IPage getWithdrawList(TzWithdrawRequestBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo) + .orderByDesc(TzWithdrawRequest::getCreateTime); + return baseMapper.selectVoPage(pageQuery.build(), lqw); + } + + /** + * 审核提现 + * + * @param bo 提现申请信息 + * @return 处理结果消息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean examine(TzWithdrawRequestBo bo) throws Exception { + LoginUser loginUser = LoginHelper.getLoginUser(); + TzWithdrawRequest request = baseMapper.selectById(bo.getId()); + if (request == null) { + throw new ServiceException("提现申请不存在"); + } + if (request.getWithdrawStatus() != 1) { + throw new ServiceException("提现申请已处理"); + } + if (bo.getWithdrawStatus() == 2) { + Long totalAmt = bo.getAfterTaxAmount().multiply(new BigDecimal(100)).longValue(); + String outSeparateNo = getOutSeparateNo(); + + V3SacsBalanceSeparateRequest separateRequest = new V3SacsBalanceSeparateRequest(); + separateRequest.setMerchantNo(KlkConstant.merchantNo); + separateRequest.setOutSeparateNo(outSeparateNo); + separateRequest.setTotalAmt(String.valueOf(totalAmt)); + separateRequest.setCalType("0"); + separateRequest.setRecvDatas(getRecvDatas(request.getReceiverNo(),totalAmt)); + separateRequest.setNotifyUrl(KlkConstant.WITHDRAWAL); + JSONObject jsonObject = V3LakalaUserUtils.withdraw(separateRequest); + if ("SACS0000".equals(jsonObject.getString("code"))) { + JSONObject respData = jsonObject.getJSONObject("resp_data"); + request.setOutSeparateNo(outSeparateNo); + request.setSeparateNo(respData.getString("separate_no")); + String status = respData.getString("status"); + if ("SUCCESS".equals(status)) { + request.setWithdrawStatus(3); + } + if ("FAIL".equals(status)) { + request.setWithdrawStatus(4); + } + } else { + throw new ServiceException(jsonObject.getString("msg")); + } + + }else if (bo.getWithdrawStatus() == 5) { + //审核拒绝,资金退回 + TzUser user = userMapper.selectById(request.getUserId()); + if (user == null) { + throw new ServiceException("用户不存在"); + } + //用户余额退回 + boolean result = userMapper.update(null, + Wrappers.lambdaUpdate() + .setSql("balance = balance + " + request.getWithdrawAmount()) + .eq(TzUser::getUserId, request.getUserId())) > 0; + if (!result) { + throw new ServiceException("用户余额退回失败"); + } + //添加资金记录 + HyUserRecord record = new HyUserRecord(); + record.setUserId(request.getUserId()); + record.setUserName(user.getRealName()); + record.setUserPhone(user.getUserMobile()); + record.setAmount(request.getWithdrawAmount()); + record.setBalance(user.getBalance().add(request.getWithdrawAmount())); + record.setType(1); + record.setCreateTime(new Date()); + record.setRemark("提现申请审核拒绝,资金退回"); + if (userRecordMapper.insert(record) <= 0) { + throw new ServiceException("创建提现记录失败"); + } + } + + request.setApproveBy(loginUser.getNickname()); + request.setApproveTime(new Date()); + request.setRemark(bo.getRemark()); + request.setWithdrawStatus(bo.getWithdrawStatus()); + if(baseMapper.updateById(request) <= 0){ + throw new ServiceException("审核提现更新记录失败"); + } + return true; + } + + /** + * 根据分账系统生成唯一流水查询提现申请 + * + * @param separateNo 分账系统生成唯一流水 + * @param outSeparateNo 商户外部订单号 + * @return 提现申请 + */ + @Override + public TzWithdrawRequest queryWithdrawRequest(String separateNo, String outSeparateNo) { + return baseMapper.selectOne(new LambdaQueryWrapper().eq(TzWithdrawRequest::getOutSeparateNo, outSeparateNo).eq(TzWithdrawRequest::getSeparateNo, separateNo)); + } + + /** + * 根据提现申请ID更新提现申请 + * + * @param withdrawRequest 提现申请 + * @return 是否更新成功 + */ + @Override + public Boolean updateById1(TzWithdrawRequest withdrawRequest) { + return baseMapper.updateById(withdrawRequest) > 0; + } + + /** + * 查询提现申请详情 + * + * @param id + * @return + */ + @Override + public JSONObject queryPlus(Long id) throws Exception { + TzWithdrawRequest tzWithdrawRequest = baseMapper.selectById(id); + if (tzWithdrawRequest != null) { + V3SacsQueryRequest queryRequest = new V3SacsQueryRequest(); + queryRequest.setMerchantNo(KlkConstant.merchantNo); + queryRequest.setSeparateNo(tzWithdrawRequest.getSeparateNo()); + queryRequest.setOutSeparateNo(tzWithdrawRequest.getOutSeparateNo()); + JSONObject jsonObject = V3LakalaUserUtils.queryWithdraw(queryRequest); + if ("SACS0000".equals(jsonObject.getString("code"))) { + JSONObject respData = jsonObject.getJSONObject("resp_data"); + String finalStatus = respData.getString("final_status"); + if ("SUCCESS".equals(finalStatus)) { + tzWithdrawRequest.setWithdrawStatus(3); + } + baseMapper.updateById(tzWithdrawRequest); + } + return jsonObject; + } + return null; + } + + private List getRecvDatas(String receiverNo, Long totalAmt) { +// TzBankCard tzBankCard = bankCardMapper.selectOne(new LambdaQueryWrapper().eq(TzBankCard::getUserId, userId).eq(TzBankCard::getIsDefault, 1).eq(TzBankCard::getDelFlag, 1).orderByDesc(TzBankCard::getId).last("LIMIT 1")); + V3SacsBalanceSeparateRequest.RecvData recvData = new V3SacsBalanceSeparateRequest.RecvData(); + recvData.setRecvNo(receiverNo); + recvData.setSeparateValue(String.valueOf(totalAmt)); + return Collections.singletonList(recvData); + } + + /** + * 获取分账指令流水号 + * + * @return + */ + private String getOutSeparateNo() { + return UUID.randomUUID().toString().replace("-", ""); + } +} diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyBasketMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyBasketMapper.xml new file mode 100644 index 0000000..ad108b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyBasketMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCodeOrderMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCodeOrderMapper.xml new file mode 100644 index 0000000..0887417 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCodeOrderMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCouponRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCouponRecordMapper.xml new file mode 100644 index 0000000..98226a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyCouponRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyMemberCodeMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyMemberCodeMapper.xml new file mode 100644 index 0000000..87095bc --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyMemberCodeMapper.xml @@ -0,0 +1,66 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderItemMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderItemMapper.xml new file mode 100644 index 0000000..de1b8c9 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderItemMapper.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderMapper.xml new file mode 100644 index 0000000..9b88db1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderPaymentMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderPaymentMapper.xml new file mode 100644 index 0000000..2add249 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyOrderPaymentMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterMapper.xml new file mode 100644 index 0000000..65f2612 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterRecordMapper.xml new file mode 100644 index 0000000..b760aa4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyPromoterRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyUserRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyUserRecordMapper.xml new file mode 100644 index 0000000..9a66d89 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/HyUserRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAgreementMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAgreementMapper.xml new file mode 100644 index 0000000..11def7b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAgreementMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAreaMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAreaMapper.xml new file mode 100644 index 0000000..a4fbb0f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAreaMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAttachFileMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAttachFileMapper.xml new file mode 100644 index 0000000..f62a561 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzAttachFileMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBankCardMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBankCardMapper.xml new file mode 100644 index 0000000..529b87e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBankCardMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBasketMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBasketMapper.xml new file mode 100644 index 0000000..a5f2f58 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBasketMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBrandMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBrandMapper.xml new file mode 100644 index 0000000..f6c9862 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzBrandMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryBrandMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryBrandMapper.xml new file mode 100644 index 0000000..78ff468 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryBrandMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryMapper.xml new file mode 100644 index 0000000..25ed4b5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryPropMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryPropMapper.xml new file mode 100644 index 0000000..20f01da --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCategoryPropMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerMapper.xml new file mode 100644 index 0000000..45253a4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerMapper.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerRecordMapper.xml new file mode 100644 index 0000000..84d1ae7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzCustomerRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzDeliveryMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzDeliveryMapper.xml new file mode 100644 index 0000000..c58b732 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzDeliveryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzHotSearchMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzHotSearchMapper.xml new file mode 100644 index 0000000..e28e0e7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzHotSearchMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzIndexImgMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzIndexImgMapper.xml new file mode 100644 index 0000000..21321fa --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzIndexImgMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceApplyMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceApplyMapper.xml new file mode 100644 index 0000000..b90b3b7 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceApplyMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceTitleMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceTitleMapper.xml new file mode 100644 index 0000000..0934905 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzInvoiceTitleMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzMessageMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzMessageMapper.xml new file mode 100644 index 0000000..a73d5cd --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzMessageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzNoticeMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzNoticeMapper.xml new file mode 100644 index 0000000..d5810a6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzNoticeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderAllMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderAllMapper.xml new file mode 100644 index 0000000..39799aa --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderAllMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderItemMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderItemMapper.xml new file mode 100644 index 0000000..86fe268 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderItemMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderMapper.xml new file mode 100644 index 0000000..5b6983e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderMapper.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderReceiveMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderReceiveMapper.xml new file mode 100644 index 0000000..4ae297a --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderReceiveMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRecordMapper.xml new file mode 100644 index 0000000..c7c7892 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRefundMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRefundMapper.xml new file mode 100644 index 0000000..26f2ea5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderRefundMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderSettlementMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderSettlementMapper.xml new file mode 100644 index 0000000..5852a78 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderSettlementMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderShareMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderShareMapper.xml new file mode 100644 index 0000000..d4b46bf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzOrderShareMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPickAddrMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPickAddrMapper.xml new file mode 100644 index 0000000..83c8233 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPickAddrMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPictureAlbumMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPictureAlbumMapper.xml new file mode 100644 index 0000000..ae014cf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzPictureAlbumMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdBrowseMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdBrowseMapper.xml new file mode 100644 index 0000000..55e68ed --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdBrowseMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdCommMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdCommMapper.xml new file mode 100644 index 0000000..a2de213 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdCommMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdFavoriteMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdFavoriteMapper.xml new file mode 100644 index 0000000..a7fbec4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdFavoriteMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdMapper.xml new file mode 100644 index 0000000..ae15bf3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdMapper.xml @@ -0,0 +1,189 @@ + + + + + + p.prod_id, + p.pic, + p.prod_name, + p.price, + p.guiding_price, + p.brief, + p.video, + p.factory_address, + p.browse_num, + p.collect_num, + p.packing_rate, + p.unit, + p.is_floor, + p.label + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropMapper.xml new file mode 100644 index 0000000..586cfd3 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropValueMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropValueMapper.xml new file mode 100644 index 0000000..c7fb493 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdPropValueMapper.xml @@ -0,0 +1,18 @@ + + + + + + insert into tz_prod_prop_value (prop_id,prop_value) values + + (#{propId},#{prodPropValue.propValue}) + + + + + delete from tz_prod_prop_value where prop_id = #{propId} + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRecordMapper.xml new file mode 100644 index 0000000..1d11ee8 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRecordMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRelationMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRelationMapper.xml new file mode 100644 index 0000000..85b7946 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdRelationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagMapper.xml new file mode 100644 index 0000000..4890134 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagReferenceMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagReferenceMapper.xml new file mode 100644 index 0000000..47f9f32 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdTagReferenceMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdWishlistMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdWishlistMapper.xml new file mode 100644 index 0000000..2da80f6 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzProdWishlistMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzShopDetailMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzShopDetailMapper.xml new file mode 100644 index 0000000..4e5a05f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzShopDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSkuMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSkuMapper.xml new file mode 100644 index 0000000..34e9ce4 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSkuMapper.xml @@ -0,0 +1,27 @@ + + + + + + INSERT INTO `tz_sku` ( + `prod_id`,`properties`,`ori_price`,`price`,`guiding_price`,`stocks`,sku_code,sku_factory_code,`actual_stocks`, + `update_time`,`rec_time`,`party_code`,`model_id`, `pic`, + `sku_name`,`prod_name`,`version`,`weight`,`volume`, `status`, `is_delete` + ) + VALUES + + ( + #{prodId},#{sku.properties},#{sku.oriPrice},#{sku.price},#{sku.guidingPrice},#{sku.stocks},#{sku.skuCode},#{sku.skuFactoryCode}, + #{sku.actualStocks}, NOW(),NOW(),#{sku.partyCode},#{sku.modelId}, #{sku.pic}, + #{sku.skuName},#{sku.prodName},0,#{sku.weight},#{sku.volume}, #{sku.status},0 + ) + + + + + delete from tz_sku where prod_id = #{prodId} + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSmsLogMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSmsLogMapper.xml new file mode 100644 index 0000000..407e729 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzSmsLogMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTenantRecordMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTenantRecordMapper.xml new file mode 100644 index 0000000..1f168d1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTenantRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityFreeMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityFreeMapper.xml new file mode 100644 index 0000000..7d738cf --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityFreeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityMapper.xml new file mode 100644 index 0000000..19f8f2b --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTranscityMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeFreeMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeFreeMapper.xml new file mode 100644 index 0000000..ae4c8e1 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeFreeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeMapper.xml new file mode 100644 index 0000000..6755513 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransfeeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransportMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransportMapper.xml new file mode 100644 index 0000000..1ba14d5 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzTransportMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrMapper.xml new file mode 100644 index 0000000..f3531ec --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrOrderMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrOrderMapper.xml new file mode 100644 index 0000000..5a46f55 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddrOrderMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddressMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddressMapper.xml new file mode 100644 index 0000000..375f06f --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserAddressMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserCollectionMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserCollectionMapper.xml new file mode 100644 index 0000000..1dc344e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserCollectionMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserMapper.xml new file mode 100644 index 0000000..6ad505d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserSearchMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserSearchMapper.xml new file mode 100644 index 0000000..d459487 --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzUserSearchMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzWithdrawRequestMapper.xml b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzWithdrawRequestMapper.xml new file mode 100644 index 0000000..adad72d --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/mall/TzWithdrawRequestMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-mall/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml new file mode 100644 index 0000000..3ec35c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -0,0 +1,112 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + ruoyi-system + + + system系统模块 + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-translation + + + + + org.dromara + ruoyi-common-oss + + + + org.dromara + ruoyi-common-log + + + + + org.dromara + ruoyi-common-excel + + + + + org.dromara + ruoyi-common-sms + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + org.dromara + ruoyi-common-websocket + + + + org.dromara + ruoyi-common-sse + + + + com.github.yulichang + mybatis-plus-join-core + 1.5.2 + compile + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java new file mode 100644 index 0000000..ee5d9cc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java @@ -0,0 +1,55 @@ +package org.dromara.system.controller.monitor; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.system.domain.vo.CacheListInfoVo; +import org.redisson.spring.data.connection.RedissonConnectionFactory; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.*; + +/** + * 缓存监控 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@RestController +@RequestMapping("/monitor/cache") +public class CacheController { + + private final RedissonConnectionFactory connectionFactory; + + /** + * 获取缓存监控列表 + */ + @SaCheckPermission("monitor:cache:list") + @GetMapping() + public R getInfo() throws Exception { + RedisConnection connection = connectionFactory.getConnection(); + Properties commandStats = connection.commands().info("commandstats"); + + List> pieList = new ArrayList<>(); + if (commandStats != null) { + commandStats.stringPropertyNames().forEach(key -> { + Map data = new HashMap<>(2); + String property = commandStats.getProperty(key); + data.put("name", StringUtils.removeStart(key, "cmdstat_")); + data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); + pieList.add(data); + }); + } + + CacheListInfoVo infoVo = new CacheListInfoVo(); + infoVo.setInfo(connection.commands().info()); + infoVo.setDbSize(connection.commands().dbSize()); + infoVo.setCommandStats(pieList); + return R.ok(infoVo); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java new file mode 100644 index 0000000..98ac2d5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java @@ -0,0 +1,89 @@ +package org.dromara.system.controller.monitor; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysLogininforBo; +import org.dromara.system.domain.vo.SysLogininforVo; +import org.dromara.system.service.ISysLogininforService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 系统访问记录 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/monitor/logininfor") +public class SysLogininforController extends BaseController { + + private final ISysLogininforService logininforService; + + /** + * 获取系统访问记录列表 + */ + @SaCheckPermission("monitor:logininfor:list") + @GetMapping("/list") + public TableDataInfo list(SysLogininforBo logininfor, PageQuery pageQuery) { + return logininforService.selectPageLogininforList(logininfor, pageQuery); + } + + /** + * 导出系统访问记录列表 + */ + @Log(title = "登录日志", businessType = BusinessType.EXPORT) + @SaCheckPermission("monitor:logininfor:export") + @PostMapping("/export") + public void export(SysLogininforBo logininfor, HttpServletResponse response) { + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response); + } + + /** + * 批量删除登录日志 + * @param infoIds 日志ids + */ + @SaCheckPermission("monitor:logininfor:remove") + @Log(title = "登录日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{infoIds}") + public R remove(@PathVariable Long[] infoIds) { + return toAjax(logininforService.deleteLogininforByIds(infoIds)); + } + + /** + * 清理系统访问记录 + */ + @SaCheckPermission("monitor:logininfor:remove") + @Log(title = "登录日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public R clean() { + logininforService.cleanLogininfor(); + return R.ok(); + } + + @SaCheckPermission("monitor:logininfor:unlock") + @Log(title = "账户解锁", businessType = BusinessType.OTHER) + @GetMapping("/unlock/{userName}") + public R unlock(@PathVariable("userName") String userName) { + String loginName = CacheConstants.PWD_ERR_CNT_KEY + userName; + if (RedisUtils.hasKey(loginName)) { + RedisUtils.deleteObject(loginName); + } + return R.ok(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java new file mode 100644 index 0000000..5746253 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -0,0 +1,75 @@ +package org.dromara.system.controller.monitor; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysOperLogBo; +import org.dromara.system.domain.vo.SysOperLogVo; +import org.dromara.system.service.ISysOperLogService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 操作日志记录 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/monitor/operlog") +public class SysOperlogController extends BaseController { + + private final ISysOperLogService operLogService; + + /** + * 获取操作日志记录列表 + */ + @SaCheckPermission("monitor:operlog:list") + @GetMapping("/list") + public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { + return operLogService.selectPageOperLogList(operLog, pageQuery); + } + + /** + * 导出操作日志记录列表 + */ + @Log(title = "操作日志", businessType = BusinessType.EXPORT) + @SaCheckPermission("monitor:operlog:export") + @PostMapping("/export") + public void export(SysOperLogBo operLog, HttpServletResponse response) { + List list = operLogService.selectOperLogList(operLog); + ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response); + } + + /** + * 批量删除操作日志记录 + * @param operIds 日志ids + */ + @Log(title = "操作日志", businessType = BusinessType.DELETE) + @SaCheckPermission("monitor:operlog:remove") + @DeleteMapping("/{operIds}") + public R remove(@PathVariable Long[] operIds) { + return toAjax(operLogService.deleteOperLogByIds(operIds)); + } + + /** + * 清理操作日志记录 + */ + @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @SaCheckPermission("monitor:operlog:remove") + @DeleteMapping("/clean") + public R clean() { + operLogService.cleanOperLog(); + return R.ok(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java new file mode 100644 index 0000000..1cab232 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -0,0 +1,131 @@ +package org.dromara.system.controller.monitor; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.bean.BeanUtil; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.dto.UserOnlineDTO; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.SysUserOnline; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 在线用户监控 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@RestController +@RequestMapping("/monitor/online") +public class SysUserOnlineController extends BaseController { + + /** + * 获取在线用户监控列表 + * + * @param ipaddr IP地址 + * @param userName 用户名 + */ + @SaCheckPermission("monitor:online:list") + @GetMapping("/list") + public TableDataInfo list(String ipaddr, String userName) { + // 获取所有未过期的 token + Collection keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*"); + List userOnlineDTOList = new ArrayList<>(); + for (String key : keys) { + String token = StringUtils.substringAfterLast(key, ":"); + // 如果已经过期则跳过 + if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { + continue; + } + userOnlineDTOList.add(RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)); + } + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) { + userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> + StringUtils.equals(ipaddr, userOnline.getIpaddr()) && + StringUtils.equals(userName, userOnline.getUserName()) + ); + } else if (StringUtils.isNotEmpty(ipaddr)) { + userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> + StringUtils.equals(ipaddr, userOnline.getIpaddr()) + ); + } else if (StringUtils.isNotEmpty(userName)) { + userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline -> + StringUtils.equals(userName, userOnline.getUserName()) + ); + } + Collections.reverse(userOnlineDTOList); + userOnlineDTOList.removeAll(Collections.singleton(null)); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); + return TableDataInfo.build(userOnlineList); + } + + /** + * 强退用户 + * + * @param tokenId token值 + */ + @SaCheckPermission("monitor:online:forceLogout") + @Log(title = "在线用户", businessType = BusinessType.FORCE) + @DeleteMapping("/{tokenId}") + public R forceLogout(@PathVariable String tokenId) { + try { + StpUtil.kickoutByTokenValue(tokenId); + } catch (NotLoginException ignored) { + } + return R.ok(); + } + + /** + * 获取当前用户登录在线设备 + */ + @GetMapping() + public TableDataInfo getInfo() { + // 获取指定账号 id 的 token 集合 + List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); + List userOnlineDTOList = tokenIds.stream() + .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1) + .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)) + .collect(Collectors.toList()); + //复制和处理 SysUserOnline 对象列表 + Collections.reverse(userOnlineDTOList); + userOnlineDTOList.removeAll(Collections.singleton(null)); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); + return TableDataInfo.build(userOnlineList); + } + + /** + * 强退当前在线设备 + * + * @param tokenId token值 + */ + @Log(title = "在线设备", businessType = BusinessType.FORCE) + @DeleteMapping("/myself/{tokenId}") + public R remove(@PathVariable("tokenId") String tokenId) { + try { + // 获取指定账号 id 的 token 集合 + List keys = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); + keys.stream() + .filter(key -> key.equals(tokenId)) + .findFirst() + .ifPresent(key -> StpUtil.kickoutByTokenValue(tokenId)); + } catch (NotLoginException ignored) { + } + return R.ok(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java new file mode 100644 index 0000000..117cee6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -0,0 +1,116 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysClientBo; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.service.ISysClientService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 客户端管理 + * + * @author Michelle.Chung + * @date 2023-06-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/client") +public class SysClientController extends BaseController { + + private final ISysClientService sysClientService; + + /** + * 查询客户端管理列表 + */ + @SaCheckPermission("system:client:list") + @GetMapping("/list") + public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { + return sysClientService.queryPageList(bo, pageQuery); + } + + /** + * 导出客户端管理列表 + */ + @SaCheckPermission("system:client:export") + @Log(title = "客户端管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysClientBo bo, HttpServletResponse response) { + List list = sysClientService.queryList(bo); + ExcelUtil.exportExcel(list, "客户端管理", SysClientVo.class, response); + } + + /** + * 获取客户端管理详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:client:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(sysClientService.queryById(id)); + } + + /** + * 新增客户端管理 + */ + @SaCheckPermission("system:client:add") + @Log(title = "客户端管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) { + return toAjax(sysClientService.insertByBo(bo)); + } + + /** + * 修改客户端管理 + */ + @SaCheckPermission("system:client:edit") + @Log(title = "客户端管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) { + return toAjax(sysClientService.updateByBo(bo)); + } + + /** + * 状态修改 + */ + @SaCheckPermission("system:client:edit") + @Log(title = "客户端管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysClientBo bo) { + return toAjax(sysClientService.updateClientStatus(bo.getClientId(), bo.getStatus())); + } + + /** + * 删除客户端管理 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:client:remove") + @Log(title = "客户端管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(sysClientService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java new file mode 100644 index 0000000..7eb8447 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -0,0 +1,137 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysConfigBo; +import org.dromara.system.domain.vo.SysConfigVo; +import org.dromara.system.service.ISysConfigService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 参数配置 信息操作处理 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/config") +public class SysConfigController extends BaseController { + + private final ISysConfigService configService; + + /** + * 获取参数配置列表 + */ + @SaCheckPermission("system:config:list") + @GetMapping("/list") + public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { + return configService.selectPageConfigList(config, pageQuery); + } + + /** + * 导出参数配置列表 + */ + @Log(title = "参数管理", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:config:export") + @PostMapping("/export") + public void export(SysConfigBo config, HttpServletResponse response) { + List list = configService.selectConfigList(config); + ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response); + } + + /** + * 根据参数编号获取详细信息 + * + * @param configId 参数ID + */ + @SaCheckPermission("system:config:query") + @GetMapping(value = "/{configId}") + public R getInfo(@PathVariable Long configId) { + return R.ok(configService.selectConfigById(configId)); + } + + /** + * 根据参数键名查询参数值 + * + * @param configKey 参数Key + */ + @GetMapping(value = "/configKey/{configKey}") + public R getConfigKey(@PathVariable String configKey) { + return R.ok("操作成功", configService.selectConfigByKey(configKey)); + } + + /** + * 新增参数配置 + */ + @SaCheckPermission("system:config:add") + @Log(title = "参数管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysConfigBo config) { + if (!configService.checkConfigKeyUnique(config)) { + return R.fail("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); + } + configService.insertConfig(config); + return R.ok(); + } + + /** + * 修改参数配置 + */ + @SaCheckPermission("system:config:edit") + @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysConfigBo config) { + if (!configService.checkConfigKeyUnique(config)) { + return R.fail("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); + } + configService.updateConfig(config); + return R.ok(); + } + + /** + * 根据参数键名修改参数配置 + */ + @SaCheckPermission("system:config:edit") + @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @PutMapping("/updateByKey") + public R updateByKey(@RequestBody SysConfigBo config) { + configService.updateConfig(config); + return R.ok(); + } + + /** + * 删除参数配置 + * + * @param configIds 参数ID串 + */ + @SaCheckPermission("system:config:remove") + @Log(title = "参数管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public R remove(@PathVariable Long[] configIds) { + configService.deleteConfigByIds(configIds); + return R.ok(); + } + + /** + * 刷新参数缓存 + */ + @SaCheckPermission("system:config:remove") + @Log(title = "参数管理", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public R refreshCache() { + configService.resetConfigCache(); + return R.ok(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java new file mode 100644 index 0000000..45b8418 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -0,0 +1,140 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.convert.Convert; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysPostService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 部门信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/dept") +public class SysDeptController extends BaseController { + + private final ISysDeptService deptService; + private final ISysPostService postService; + + /** + * 获取部门列表 + */ + @SaCheckPermission("system:dept:list") + @GetMapping("/list") + public R> list(SysDeptBo dept) { + List depts = deptService.selectDeptList(dept); + return R.ok(depts); + } + + /** + * 查询部门列表(排除节点) + * + * @param deptId 部门ID + */ + @SaCheckPermission("system:dept:list") + @GetMapping("/list/exclude/{deptId}") + public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { + List depts = deptService.selectDeptList(new SysDeptBo()); + depts.removeIf(d -> d.getDeptId().equals(deptId) + || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); + return R.ok(depts); + } + + /** + * 根据部门编号获取详细信息 + * + * @param deptId 部门ID + */ + @SaCheckPermission("system:dept:query") + @GetMapping(value = "/{deptId}") + public R getInfo(@PathVariable Long deptId) { + deptService.checkDeptDataScope(deptId); + return R.ok(deptService.selectDeptById(deptId)); + } + + /** + * 新增部门 + */ + @SaCheckPermission("system:dept:add") + @Log(title = "部门管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysDeptBo dept) { + if (!deptService.checkDeptNameUnique(dept)) { + return R.fail("新增部门'" + dept.getDeptName() + "'失败,部门名称已存在"); + } + return toAjax(deptService.insertDept(dept)); + } + + /** + * 修改部门 + */ + @SaCheckPermission("system:dept:edit") + @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysDeptBo dept) { + Long deptId = dept.getDeptId(); + deptService.checkDeptDataScope(deptId); + if (!deptService.checkDeptNameUnique(dept)) { + return R.fail("修改部门'" + dept.getDeptName() + "'失败,部门名称已存在"); + } else if (dept.getParentId().equals(deptId)) { + return R.fail("修改部门'" + dept.getDeptName() + "'失败,上级部门不能是自己"); + } else if (StringUtils.equals(SystemConstants.DISABLE, dept.getStatus())) { + if (deptService.selectNormalChildrenDeptById(deptId) > 0) { + return R.fail("该部门包含未停用的子部门!"); + } else if (deptService.checkDeptExistUser(deptId)) { + return R.fail("该部门下存在已分配用户,不能禁用!"); + } + } + return toAjax(deptService.updateDept(dept)); + } + + /** + * 删除部门 + * + * @param deptId 部门ID + */ + @SaCheckPermission("system:dept:remove") + @Log(title = "部门管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{deptId}") + public R remove(@PathVariable Long deptId) { + if (deptService.hasChildByDeptId(deptId)) { + return R.warn("存在下级部门,不允许删除"); + } + if (deptService.checkDeptExistUser(deptId)) { + return R.warn("部门存在用户,不允许删除"); + } + if (postService.countPostByDeptId(deptId) > 0) { + return R.warn("部门存在岗位,不允许删除"); + } + deptService.checkDeptDataScope(deptId); + return toAjax(deptService.deleteDeptById(deptId)); + } + + /** + * 获取部门选择框列表 + * + * @param deptIds 部门ID串 + */ + @SaCheckPermission("system:dept:query") + @GetMapping("/optionselect") + public R> optionselect(@RequestParam(required = false) Long[] deptIds) { + return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java new file mode 100644 index 0000000..382f741 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -0,0 +1,123 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysDictDataBo; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.service.ISysDictDataService; +import org.dromara.system.service.ISysDictTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * 数据字典信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/dict/data") +public class SysDictDataController extends BaseController { + + private final ISysDictDataService dictDataService; + private final ISysDictTypeService dictTypeService; + + /** + * 查询字典数据列表 + */ + @SaCheckPermission("system:dict:list") + @GetMapping("/list") + public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { + return dictDataService.selectPageDictDataList(dictData, pageQuery); + } + + /** + * 导出字典数据列表 + */ + @Log(title = "字典数据", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:dict:export") + @PostMapping("/export") + public void export(SysDictDataBo dictData, HttpServletResponse response) { + List list = dictDataService.selectDictDataList(dictData); + ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response); + } + + /** + * 查询字典数据详细 + * + * @param dictCode 字典code + */ + @SaCheckPermission("system:dict:query") + @GetMapping(value = "/{dictCode}") + public R getInfo(@PathVariable Long dictCode) { + return R.ok(dictDataService.selectDictDataById(dictCode)); + } + + /** + * 根据字典类型查询字典数据信息 + * + * @param dictType 字典类型 + */ + @GetMapping(value = "/type/{dictType}") + public R> dictType(@PathVariable String dictType) { + List data = dictTypeService.selectDictDataByType(dictType); + if (ObjectUtil.isNull(data)) { + data = new ArrayList<>(); + } + return R.ok(data); + } + + /** + * 新增字典类型 + */ + @SaCheckPermission("system:dict:add") + @Log(title = "字典数据", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysDictDataBo dict) { + if (!dictDataService.checkDictDataUnique(dict)) { + return R.fail("新增字典数据'" + dict.getDictValue() + "'失败,字典键值已存在"); + } + dictDataService.insertDictData(dict); + return R.ok(); + } + + /** + * 修改保存字典类型 + */ + @SaCheckPermission("system:dict:edit") + @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysDictDataBo dict) { + if (!dictDataService.checkDictDataUnique(dict)) { + return R.fail("修改字典数据'" + dict.getDictValue() + "'失败,字典键值已存在"); + } + dictDataService.updateDictData(dict); + return R.ok(); + } + + /** + * 删除字典类型 + * + * @param dictCodes 字典code串 + */ + @SaCheckPermission("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictCodes}") + public R remove(@PathVariable Long[] dictCodes) { + dictDataService.deleteDictDataByIds(dictCodes); + return R.ok(); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java new file mode 100644 index 0000000..1e0b985 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -0,0 +1,125 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysDictTypeBo; +import org.dromara.system.domain.vo.SysDictTypeVo; +import org.dromara.system.service.ISysDictTypeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 数据字典信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/dict/type") +public class SysDictTypeController extends BaseController { + + private final ISysDictTypeService dictTypeService; + + /** + * 查询字典类型列表 + */ + @SaCheckPermission("system:dict:list") + @GetMapping("/list") + public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { + return dictTypeService.selectPageDictTypeList(dictType, pageQuery); + } + + /** + * 导出字典类型列表 + */ + @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:dict:export") + @PostMapping("/export") + public void export(SysDictTypeBo dictType, HttpServletResponse response) { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response); + } + + /** + * 查询字典类型详细 + * + * @param dictId 字典ID + */ + @SaCheckPermission("system:dict:query") + @GetMapping(value = "/{dictId}") + public R getInfo(@PathVariable Long dictId) { + return R.ok(dictTypeService.selectDictTypeById(dictId)); + } + + /** + * 新增字典类型 + */ + @SaCheckPermission("system:dict:add") + @Log(title = "字典类型", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysDictTypeBo dict) { + if (!dictTypeService.checkDictTypeUnique(dict)) { + return R.fail("新增字典'" + dict.getDictName() + "'失败,字典类型已存在"); + } + dictTypeService.insertDictType(dict); + return R.ok(); + } + + /** + * 修改字典类型 + */ + @SaCheckPermission("system:dict:edit") + @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysDictTypeBo dict) { + if (!dictTypeService.checkDictTypeUnique(dict)) { + return R.fail("修改字典'" + dict.getDictName() + "'失败,字典类型已存在"); + } + dictTypeService.updateDictType(dict); + return R.ok(); + } + + /** + * 删除字典类型 + * + * @param dictIds 字典ID串 + */ + @SaCheckPermission("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public R remove(@PathVariable Long[] dictIds) { + dictTypeService.deleteDictTypeByIds(dictIds); + return R.ok(); + } + + /** + * 刷新字典缓存 + */ + @SaCheckPermission("system:dict:remove") + @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public R refreshCache() { + dictTypeService.resetDictCache(); + return R.ok(); + } + + /** + * 获取字典选择框列表 + */ + @GetMapping("/optionselect") + public R> optionselect() { + List dictTypes = dictTypeService.selectDictTypeAll(); + return R.ok(dictTypes); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java new file mode 100644 index 0000000..d8cd335 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -0,0 +1,174 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaCheckRole; +import cn.dev33.satoken.annotation.SaMode; +import cn.hutool.core.lang.tree.Tree; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.SysMenu; +import org.dromara.system.domain.bo.SysMenuBo; +import org.dromara.system.domain.vo.MenuTreeSelectVo; +import org.dromara.system.domain.vo.RouterVo; +import org.dromara.system.domain.vo.SysMenuVo; +import org.dromara.system.service.ISysMenuService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 菜单信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/menu") +public class SysMenuController extends BaseController { + + private final ISysMenuService menuService; + + /** + * 获取路由信息 + * + * @return 路由信息 + */ + @GetMapping("/getRouters") + public R> getRouters() { + List menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId()); + return R.ok(menuService.buildMenus(menus)); + } + + /** + * 获取菜单列表 + */ + @SaCheckRole(value = { + TenantConstants.SUPER_ADMIN_ROLE_KEY, + TenantConstants.TENANT_ADMIN_ROLE_KEY + }, mode = SaMode.OR) + @SaCheckPermission("system:menu:list") + @GetMapping("/list") + public R> list(SysMenuBo menu) { + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); + return R.ok(menus); + } + + /** + * 根据菜单编号获取详细信息 + * + * @param menuId 菜单ID + */ + @SaCheckRole(value = { + TenantConstants.SUPER_ADMIN_ROLE_KEY, + TenantConstants.TENANT_ADMIN_ROLE_KEY + }, mode = SaMode.OR) + @SaCheckPermission("system:menu:query") + @GetMapping(value = "/{menuId}") + public R getInfo(@PathVariable Long menuId) { + return R.ok(menuService.selectMenuById(menuId)); + } + + /** + * 获取菜单下拉树列表 + */ + @SaCheckPermission("system:menu:query") + @GetMapping("/treeselect") + public R>> treeselect(SysMenuBo menu) { + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); + return R.ok(menuService.buildMenuTreeSelect(menus)); + } + + /** + * 加载对应角色菜单列表树 + * + * @param roleId 角色ID + */ + @SaCheckPermission("system:menu:query") + @GetMapping(value = "/roleMenuTreeselect/{roleId}") + public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { + List menus = menuService.selectMenuList(LoginHelper.getUserId()); + MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); + selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId)); + selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); + return R.ok(selectVo); + } + + /** + * 加载对应租户套餐菜单列表树 + * + * @param packageId 租户套餐ID + */ + @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:menu:query") + @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}") + public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { + List menus = menuService.selectMenuList(LoginHelper.getUserId()); + MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); + selectVo.setCheckedKeys(menuService.selectMenuListByPackageId(packageId)); + selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); + return R.ok(selectVo); + } + + /** + * 新增菜单 + */ + @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:menu:add") + @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysMenuBo menu) { + if (!menuService.checkMenuNameUnique(menu)) { + return R.fail("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } else if (SystemConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { + return R.fail("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); + } + return toAjax(menuService.insertMenu(menu)); + } + + /** + * 修改菜单 + */ + @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:menu:edit") + @Log(title = "菜单管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysMenuBo menu) { + if (!menuService.checkMenuNameUnique(menu)) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在"); + } else if (SystemConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头"); + } else if (menu.getMenuId().equals(menu.getParentId())) { + return R.fail("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己"); + } + return toAjax(menuService.updateMenu(menu)); + } + + /** + * 删除菜单 + * + * @param menuId 菜单ID + */ + @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:menu:remove") + @Log(title = "菜单管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{menuId}") + public R remove(@PathVariable("menuId") Long menuId) { + if (menuService.hasChildByMenuId(menuId)) { + return R.warn("存在子菜单,不允许删除"); + } + if (menuService.checkMenuExistRole(menuId)) { + return R.warn("菜单已分配,不允许删除"); + } + return toAjax(menuService.deleteMenuById(menuId)); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java new file mode 100644 index 0000000..5d65137 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -0,0 +1,90 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.service.DictService; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.sse.utils.SseMessageUtils; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysNoticeBo; +import org.dromara.system.domain.vo.SysNoticeVo; +import org.dromara.system.service.ISysNoticeService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 公告 信息操作处理 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/notice") +public class SysNoticeController extends BaseController { + + private final ISysNoticeService noticeService; + private final DictService dictService; + + /** + * 获取通知公告列表 + */ + @SaCheckPermission("system:notice:list") + @GetMapping("/list") + public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { + return noticeService.selectPageNoticeList(notice, pageQuery); + } + + /** + * 根据通知公告编号获取详细信息 + * + * @param noticeId 公告ID + */ + @SaCheckPermission("system:notice:query") + @GetMapping(value = "/{noticeId}") + public R getInfo(@PathVariable Long noticeId) { + return R.ok(noticeService.selectNoticeById(noticeId)); + } + + /** + * 新增通知公告 + */ + @SaCheckPermission("system:notice:add") + @Log(title = "通知公告", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysNoticeBo notice) { + int rows = noticeService.insertNotice(notice); + if (rows <= 0) { + return R.fail(); + } + String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType()); + SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle()); + return R.ok(); + } + + /** + * 修改通知公告 + */ + @SaCheckPermission("system:notice:edit") + @Log(title = "通知公告", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysNoticeBo notice) { + return toAjax(noticeService.updateNotice(notice)); + } + + /** + * 删除通知公告 + * + * @param noticeIds 公告ID串 + */ + @SaCheckPermission("system:notice:remove") + @Log(title = "通知公告", businessType = BusinessType.DELETE) + @DeleteMapping("/{noticeIds}") + public R remove(@PathVariable Long[] noticeIds) { + return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java new file mode 100644 index 0000000..4f523b2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -0,0 +1,105 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.core.validate.QueryGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysOssConfigBo; +import org.dromara.system.domain.vo.SysOssConfigVo; +import org.dromara.system.service.ISysOssConfigService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 对象存储配置 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/resource/oss/config") +public class SysOssConfigController extends BaseController { + + private final ISysOssConfigService ossConfigService; + + /** + * 查询对象存储配置列表 + */ + @SaCheckPermission("system:ossConfig:list") + @GetMapping("/list") + public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { + return ossConfigService.queryPageList(bo, pageQuery); + } + + /** + * 获取对象存储配置详细信息 + * + * @param ossConfigId OSS配置ID + */ + @SaCheckPermission("system:ossConfig:list") + @GetMapping("/{ossConfigId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long ossConfigId) { + return R.ok(ossConfigService.queryById(ossConfigId)); + } + + /** + * 新增对象存储配置 + */ + @SaCheckPermission("system:ossConfig:add") + @Log(title = "对象存储配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { + return toAjax(ossConfigService.insertByBo(bo)); + } + + /** + * 修改对象存储配置 + */ + @SaCheckPermission("system:ossConfig:edit") + @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { + return toAjax(ossConfigService.updateByBo(bo)); + } + + /** + * 删除对象存储配置 + * + * @param ossConfigIds OSS配置ID串 + */ + @SaCheckPermission("system:ossConfig:remove") + @Log(title = "对象存储配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ossConfigIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ossConfigIds) { + return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); + } + + /** + * 状态修改 + */ + @SaCheckPermission("system:ossConfig:edit") + @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysOssConfigBo bo) { + return toAjax(ossConfigService.updateOssConfigStatus(bo)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java new file mode 100644 index 0000000..6ceeb11 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -0,0 +1,108 @@ +package org.dromara.system.controller.system; + + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.QueryGroup; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysOssBo; +import org.dromara.system.domain.vo.SysOssUploadVo; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.service.ISysOssService; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + +/** + * 文件上传 控制层 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/resource/oss") +public class SysOssController extends BaseController { + + private final ISysOssService ossService; + + /** + * 查询OSS对象存储列表 + */ + @SaCheckPermission("system:oss:list") + @GetMapping("/list") + public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { + return ossService.queryPageList(bo, pageQuery); + } + + /** + * 查询OSS对象基于id串 + * + * @param ossIds OSS对象ID串 + */ + @SaCheckPermission("system:oss:query") + @GetMapping("/listByIds/{ossIds}") + public R> listByIds(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ossIds) { + List list = ossService.listByIds(Arrays.asList(ossIds)); + return R.ok(list); + } + + /** + * 上传OSS对象存储 + * + * @param file 文件 + */ + @SaCheckPermission("system:oss:upload") + @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) + @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R upload(@RequestPart("file") MultipartFile file) { + if (ObjectUtil.isNull(file)) { + return R.fail("上传文件不能为空"); + } + SysOssVo oss = ossService.upload(file); + SysOssUploadVo uploadVo = new SysOssUploadVo(); + uploadVo.setUrl(oss.getUrl()); + uploadVo.setFileName(oss.getOriginalName()); + uploadVo.setOssId(oss.getOssId().toString()); + return R.ok(uploadVo); + } + + /** + * 下载OSS对象 + * + * @param ossId OSS对象ID + */ + @SaCheckPermission("system:oss:download") + @GetMapping("/download/{ossId}") + public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { + ossService.download(ossId, response); + } + + /** + * 删除OSS对象存储 + * + * @param ossIds OSS对象ID串 + */ + @SaCheckPermission("system:oss:remove") + @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) + @DeleteMapping("/{ossIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ossIds) { + return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true)); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java new file mode 100644 index 0000000..5333a4a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -0,0 +1,133 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysPostBo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.service.ISysPostService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * 岗位信息操作处理 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/post") +public class SysPostController extends BaseController { + + private final ISysPostService postService; + + /** + * 获取岗位列表 + */ + @SaCheckPermission("system:post:list") + @GetMapping("/list") + public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { + return postService.selectPagePostList(post, pageQuery); + } + + /** + * 导出岗位列表 + */ + @Log(title = "岗位管理", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:post:export") + @PostMapping("/export") + public void export(SysPostBo post, HttpServletResponse response) { + List list = postService.selectPostList(post); + ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response); + } + + /** + * 根据岗位编号获取详细信息 + * + * @param postId 岗位ID + */ + @SaCheckPermission("system:post:query") + @GetMapping(value = "/{postId}") + public R getInfo(@PathVariable Long postId) { + return R.ok(postService.selectPostById(postId)); + } + + /** + * 新增岗位 + */ + @SaCheckPermission("system:post:add") + @Log(title = "岗位管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysPostBo post) { + if (!postService.checkPostNameUnique(post)) { + return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } else if (!postService.checkPostCodeUnique(post)) { + return R.fail("新增岗位'" + post.getPostName() + "'失败,岗位编码已存在"); + } + return toAjax(postService.insertPost(post)); + } + + /** + * 修改岗位 + */ + @SaCheckPermission("system:post:edit") + @Log(title = "岗位管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysPostBo post) { + if (!postService.checkPostNameUnique(post)) { + return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位名称已存在"); + } else if (!postService.checkPostCodeUnique(post)) { + return R.fail("修改岗位'" + post.getPostName() + "'失败,岗位编码已存在"); + } else if (SystemConstants.DISABLE.equals(post.getStatus()) + && postService.countUserPostById(post.getPostId()) > 0) { + return R.fail("该岗位下存在已分配用户,不能禁用!"); + } + return toAjax(postService.updatePost(post)); + } + + /** + * 删除岗位 + * + * @param postIds 岗位ID串 + */ + @SaCheckPermission("system:post:remove") + @Log(title = "岗位管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{postIds}") + public R remove(@PathVariable Long[] postIds) { + return toAjax(postService.deletePostByIds(postIds)); + } + + /** + * 获取岗位选择框列表 + * + * @param postIds 岗位ID串 + * @param deptId 部门id + */ + @SaCheckPermission("system:post:query") + @GetMapping("/optionselect") + public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { + List list = new ArrayList<>(); + if (ObjectUtil.isNotNull(deptId)) { + SysPostBo post = new SysPostBo(); + post.setDeptId(deptId); + list = postService.selectPostList(post); + } else if (postIds != null) { + list = postService.selectPostByIds(List.of(postIds)); + } + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java new file mode 100644 index 0000000..5f187cb --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -0,0 +1,133 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.secure.BCrypt; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.io.FileUtil; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.MimeTypeUtils; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.helper.DataPermissionHelper; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.bo.SysUserPasswordBo; +import org.dromara.system.domain.bo.SysUserProfileBo; +import org.dromara.system.domain.vo.AvatarVo; +import org.dromara.system.domain.vo.ProfileVo; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysOssService; +import org.dromara.system.service.ISysUserService; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Arrays; + +/** + * 个人信息 业务处理 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/user/profile") +public class SysProfileController extends BaseController { + + private final ISysUserService userService; + private final ISysOssService ossService; + + /** + * 个人信息 + */ + @GetMapping + public R profile() { + SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); + ProfileVo profileVo = new ProfileVo(); + profileVo.setUser(user); + profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId())); + profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId())); + return R.ok(profileVo); + } + + /** + * 修改用户信息 + */ + @RepeatSubmit + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping + public R updateProfile(@Validated @RequestBody SysUserProfileBo profile) { + SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class); + user.setUserId(LoginHelper.getUserId()); + String username = LoginHelper.getUsername(); + if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { + return R.fail("修改用户'" + username + "'失败,手机号码已存在"); + } + if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { + return R.fail("修改用户'" + username + "'失败,邮箱账号已存在"); + } + int rows = DataPermissionHelper.ignore(() -> userService.updateUserProfile(user)); + if (rows > 0) { + return R.ok(); + } + return R.fail("修改个人信息异常,请联系管理员"); + } + + /** + * 重置密码 + * + * @param bo 新旧密码 + */ + @RepeatSubmit + @ApiEncrypt + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + public R updatePwd(@Validated @RequestBody SysUserPasswordBo bo) { + SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); + String password = user.getPassword(); + if (!BCrypt.checkpw(bo.getOldPassword(), password)) { + return R.fail("修改密码失败,旧密码错误"); + } + if (BCrypt.checkpw(bo.getNewPassword(), password)) { + return R.fail("新密码不能与旧密码相同"); + } + int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword()))); + if (rows > 0) { + return R.ok(); + } + return R.fail("修改密码异常,请联系管理员"); + } + + /** + * 头像上传 + * + * @param avatarfile 用户头像 + */ + @RepeatSubmit + @Log(title = "用户头像", businessType = BusinessType.UPDATE) + @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R avatar(@RequestPart("avatarfile") MultipartFile avatarfile) { + if (!avatarfile.isEmpty()) { + String extension = FileUtil.extName(avatarfile.getOriginalFilename()); + if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { + return R.fail("文件格式不正确,请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); + } + SysOssVo oss = ossService.upload(avatarfile); + String avatar = oss.getUrl(); + boolean updateSuccess = DataPermissionHelper.ignore(() -> userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())); + if (updateSuccess) { + AvatarVo avatarVo = new AvatarVo(); + avatarVo.setImgUrl(avatar); + return R.ok(avatarVo); + } + } + return R.fail("上传图片异常,请联系管理员"); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java new file mode 100644 index 0000000..fffbcc7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -0,0 +1,229 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.bo.SysRoleBo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.DeptTreeSelectVo; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysDeptService; +import org.dromara.system.service.ISysRoleService; +import org.dromara.system.service.ISysUserService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 角色信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/role") +public class SysRoleController extends BaseController { + + private final ISysRoleService roleService; + private final ISysUserService userService; + private final ISysDeptService deptService; + + /** + * 获取角色信息列表 + */ + @SaCheckPermission("system:role:list") + @GetMapping("/list") + public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { + return roleService.selectPageRoleList(role, pageQuery); + } + + /** + * 导出角色信息列表 + */ + @Log(title = "角色管理", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:role:export") + @PostMapping("/export") + public void export(SysRoleBo role, HttpServletResponse response) { + List list = roleService.selectRoleList(role); + ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response); + } + + /** + * 根据角色编号获取详细信息 + * + * @param roleId 角色ID + */ + @SaCheckPermission("system:role:query") + @GetMapping(value = "/{roleId}") + public R getInfo(@PathVariable Long roleId) { + roleService.checkRoleDataScope(roleId); + return R.ok(roleService.selectRoleById(roleId)); + } + + /** + * 新增角色 + */ + @SaCheckPermission("system:role:add") + @Log(title = "角色管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + if (!roleService.checkRoleNameUnique(role)) { + return R.fail("新增角色'" + role.getRoleName() + "'失败,角色名称已存在"); + } else if (!roleService.checkRoleKeyUnique(role)) { + return R.fail("新增角色'" + role.getRoleName() + "'失败,角色权限已存在"); + } + return toAjax(roleService.insertRole(role)); + + } + + /** + * 修改保存角色 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + if (!roleService.checkRoleNameUnique(role)) { + return R.fail("修改角色:" + role.getRoleName() + " 失败,角色名称已存在"); + } else if (!roleService.checkRoleKeyUnique(role)) { + return R.fail("修改角色:" + role.getRoleName() + " 失败,角色权限已存在"); + } + + if (roleService.updateRole(role) > 0) { + roleService.cleanOnlineUserByRole(role.getRoleId()); + return R.ok(); + } + return R.fail("修改角色'" + role.getRoleName() + "'失败,请联系管理员"); + } + + /** + * 修改保存数据权限 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/dataScope") + public R dataScope(@RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.authDataScope(role)); + } + + /** + * 状态修改 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysRoleBo role) { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus())); + } + + /** + * 删除角色 + * + * @param roleIds 角色ID串 + */ + @SaCheckPermission("system:role:remove") + @Log(title = "角色管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{roleIds}") + public R remove(@PathVariable Long[] roleIds) { + return toAjax(roleService.deleteRoleByIds(roleIds)); + } + + /** + * 获取角色选择框列表 + * + * @param roleIds 角色ID串 + */ + @SaCheckPermission("system:role:query") + @GetMapping("/optionselect") + public R> optionselect(@RequestParam(required = false) Long[] roleIds) { + return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); + } + + /** + * 查询已分配用户角色列表 + */ + @SaCheckPermission("system:role:list") + @GetMapping("/authUser/allocatedList") + public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { + return userService.selectAllocatedList(user, pageQuery); + } + + /** + * 查询未分配用户角色列表 + */ + @SaCheckPermission("system:role:list") + @GetMapping("/authUser/unallocatedList") + public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { + return userService.selectUnallocatedList(user, pageQuery); + } + + /** + * 取消授权用户 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancel") + public R cancelAuthUser(@RequestBody SysUserRole userRole) { + return toAjax(roleService.deleteAuthUser(userRole)); + } + + /** + * 批量取消授权用户 + * + * @param roleId 角色ID + * @param userIds 用户ID串 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancelAll") + public R cancelAuthUserAll(Long roleId, Long[] userIds) { + return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + } + + /** + * 批量选择用户授权 + * + * @param roleId 角色ID + * @param userIds 用户ID串 + */ + @SaCheckPermission("system:role:edit") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/selectAll") + public R selectAuthUserAll(Long roleId, Long[] userIds) { + roleService.checkRoleDataScope(roleId); + return toAjax(roleService.insertAuthUsers(roleId, userIds)); + } + + /** + * 获取对应角色部门树列表 + * + * @param roleId 角色ID + */ + @SaCheckPermission("system:role:list") + @GetMapping(value = "/deptTree/{roleId}") + public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { + DeptTreeSelectVo selectVo = new DeptTreeSelectVo(); + selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId)); + selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo())); + return R.ok(selectVo); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java new file mode 100644 index 0000000..b0281cf --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java @@ -0,0 +1,38 @@ +package org.dromara.system.controller.system; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.vo.SysSocialVo; +import org.dromara.system.service.ISysSocialService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 社会化关系 + * + * @author thiszhc + * @date 2023-06-16 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/social") +public class SysSocialController extends BaseController { + + private final ISysSocialService socialUserService; + + /** + * 查询社会化关系列表 + */ + @GetMapping("/list") + public R> list() { + return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId())); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java new file mode 100644 index 0000000..1b06cbc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java @@ -0,0 +1,235 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.lock.annotation.Lock4j; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantSumVo; +import org.dromara.system.domain.vo.SysTenantVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysTenantService; +import org.dromara.system.service.ISysUserService; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 租户管理 + * + * @author Michelle.Chung + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/tenant") +@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") +public class SysTenantController extends BaseController { + + private final ISysTenantService tenantService; + + private final ISysUserService sysUserService; + + /** + * 查询租户列表 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:list") + @GetMapping("/list") + public TableDataInfo list(SysTenantBo bo, PageQuery pageQuery) { + return tenantService.queryPageList(bo, pageQuery); + } + + /** + * 查询租户统计信息 + */ + @SaCheckPermission("system:tenant:list") + @GetMapping("/listSum") + public R listSum(SysTenantBo bo) { + return R.ok(tenantService.querySum(bo)); + } + + /** + * 导出租户列表 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:export") + @Log(title = "租户管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysTenantBo bo, HttpServletResponse response) { + List list = tenantService.queryList(bo); + ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response); + } + + /** + * 获取租户详细信息 + * + * @param id 主键 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tenantService.queryById(id)); + } + + /** + * 根据tenantId获取租户信息 + * + * @param tenantId 主键 + */ + @GetMapping("getTenantById/{tenantId}") + public R getTenantById(@NotNull(message = "主键不能为空") + @PathVariable String tenantId) { + return R.ok(tenantService.getTenantById(tenantId)); + } + + /** + * 新增租户 + */ + @ApiEncrypt +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:add") + @Log(title = "租户管理", businessType = BusinessType.INSERT) + @Lock4j + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { + if (!tenantService.checkCompanyNameUnique(bo)) { + return R.fail("新增租户'" + bo.getCompanyName() + "'失败,企业名称已存在"); + } + SysUserVo sysUserVo = sysUserService.selectUserByUserName(bo.getUsername()); + if (ObjectUtil.isNotEmpty(sysUserVo)) { + return R.fail("新增租户'" + bo.getUsername() + "'失败,用户名已存在"); + } + return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo))); + } + + /** + * 修改租户 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:edit") + @Log(title = "租户管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { + tenantService.checkTenantAllowed(bo.getTenantId()); + if (!tenantService.checkCompanyNameUnique(bo)) { + return R.fail("修改租户'" + bo.getCompanyName() + "'失败,公司名称已存在"); + } + return toAjax(tenantService.updateByBo(bo)); + } + + /** + * 状态修改 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:edit") + @Log(title = "租户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysTenantBo bo) { + tenantService.checkTenantAllowed(bo.getTenantId()); + return toAjax(tenantService.updateTenantStatus(bo)); + } + + /** + * 删除租户 + * + * @param ids 主键串 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:remove") + @Log(title = "租户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true)); + } + + /** + * 动态切换租户 + * + * @param tenantId 租户ID + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @GetMapping("/dynamic/{tenantId}") + public R dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) { + TenantHelper.setDynamic(tenantId, true); + return R.ok(); + } + + /** + * 清除动态租户 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @GetMapping("/dynamic/clear") + public R dynamicClear() { + TenantHelper.clearDynamic(); + return R.ok(); + } + + + /** + * 根据租户编码查询租户是否存在 + * @param tenantCode + * @return + */ + @GetMapping("/getTenantByCode/{tenantCode}") + public R getTenantByCode(@NotBlank(message = "租户编码不能为空") @PathVariable String tenantCode) { + SysTenantVo sysTenantVo = tenantService.queryByTenantCode(tenantCode); + if(ObjectUtil.isNotNull(sysTenantVo)){ + return R.fail("租户'" + sysTenantVo.getTenantCode() + "'已存在"); + } + return R.ok(); + } + + + /** + * 同步租户套餐 + * + * @param tenantId 租户id + * @param packageId 套餐id + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenant:edit") + @Log(title = "租户管理", businessType = BusinessType.UPDATE) + @GetMapping("/syncTenantPackage") + public R syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, + @NotNull(message = "套餐ID不能为空") Long packageId) { + return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId))); + } + + /** + * 同步租户字典 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @Log(title = "租户管理", businessType = BusinessType.INSERT) + @GetMapping("/syncTenantDict") + public R syncTenantDict() { + if (!TenantHelper.isEnable()) { + return R.fail("当前未开启租户模式"); + } + tenantService.syncTenantDict(); + return R.ok("同步租户字典成功"); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java new file mode 100644 index 0000000..c7f56c6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java @@ -0,0 +1,140 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysTenantPackageBo; +import org.dromara.system.domain.vo.SysTenantPackageVo; +import org.dromara.system.service.ISysTenantPackageService; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 租户套餐管理 + * + * @author Michelle.Chung + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/tenant/package") +@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") +public class SysTenantPackageController extends BaseController { + + private final ISysTenantPackageService tenantPackageService; + + /** + * 查询租户套餐列表 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:list") + @GetMapping("/list") + public TableDataInfo list(SysTenantPackageBo bo, PageQuery pageQuery) { + return tenantPackageService.queryPageList(bo, pageQuery); + } + + /** + * 查询租户套餐下拉选列表 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:list") + @GetMapping("/selectList") + public R> selectList() { + return R.ok(tenantPackageService.selectList()); + } + + /** + * 导出租户套餐列表 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:export") + @Log(title = "租户套餐", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysTenantPackageBo bo, HttpServletResponse response) { + List list = tenantPackageService.queryList(bo); + ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response); + } + + /** + * 获取租户套餐详细信息 + * + * @param packageId 主键 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:query") + @GetMapping("/{packageId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long packageId) { + return R.ok(tenantPackageService.queryById(packageId)); + } + + /** + * 新增租户套餐 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:add") + @Log(title = "租户套餐", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) { + if (!tenantPackageService.checkPackageNameUnique(bo)) { + return R.fail("新增套餐'" + bo.getPackageName() + "'失败,套餐名称已存在"); + } + return toAjax(tenantPackageService.insertByBo(bo)); + } + + /** + * 修改租户套餐 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:edit") + @Log(title = "租户套餐", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) { + if (!tenantPackageService.checkPackageNameUnique(bo)) { + return R.fail("修改套餐'" + bo.getPackageName() + "'失败,套餐名称已存在"); + } + return toAjax(tenantPackageService.updateByBo(bo)); + } + + /** + * 状态修改 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:edit") + @Log(title = "租户套餐", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysTenantPackageBo bo) { + return toAjax(tenantPackageService.updatePackageStatus(bo)); + } + + /** + * 删除租户套餐 + * + * @param packageIds 主键串 + */ +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) + @SaCheckPermission("system:tenantPackage:remove") + @Log(title = "租户套餐", businessType = BusinessType.DELETE) + @DeleteMapping("/{packageIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] packageIds) { + return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java new file mode 100644 index 0000000..7ae78fa --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -0,0 +1,315 @@ +package org.dromara.system.controller.system; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.secure.BCrypt; +import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.encrypt.annotation.ApiEncrypt; +import org.dromara.common.excel.core.ExcelResult; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.bo.SysPostBo; +import org.dromara.system.domain.bo.SysRoleBo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.*; +import org.dromara.system.listener.SysUserImportListener; +import org.dromara.system.service.*; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.ArrayList; +import java.util.List; + +/** + * 用户信息 + * + * @author Lion Li + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/system/user") +public class SysUserController extends BaseController { + + private final ISysUserService userService; + private final ISysRoleService roleService; + private final ISysPostService postService; + private final ISysDeptService deptService; + private final ISysTenantService tenantService; + + /** + * 获取用户列表 + */ + @SaCheckPermission("system:user:list") + @GetMapping("/list") + public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { + return userService.selectPageUserList(user, pageQuery); + } + + /** + * 导出用户列表 + */ + @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @SaCheckPermission("system:user:export") + @PostMapping("/export") + public void export(SysUserBo user, HttpServletResponse response) { + List list = userService.selectUserExportList(user); + ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response); + } + + /** + * 导入数据 + * + * @param file 导入文件 + * @param updateSupport 是否更新已存在数据 + */ + @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @SaCheckPermission("system:user:import") + @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { + ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); + return R.ok(result.getAnalysis()); + } + + /** + * 获取导入模板 + */ + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) { + ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response); + } + + /** + * 获取用户信息 + * + * @return 用户信息 + */ + @GetMapping("/getInfo") + public R getInfo() { + UserInfoVo userInfoVo = new UserInfoVo(); + LoginUser loginUser = LoginHelper.getLoginUser(); + if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { + // 超级管理员 如果重新加载用户信息需清除动态租户 + TenantHelper.clearDynamic(); + } + SysUserVo user = userService.selectUserById(loginUser.getUserId()); + if (ObjectUtil.isNull(user)) { + return R.fail("没有权限访问用户数据!"); + } + userInfoVo.setUser(user); + userInfoVo.setPermissions(loginUser.getMenuPermission()); + userInfoVo.setRoles(loginUser.getRolePermission()); + return R.ok(userInfoVo); + } + + /** + * 根据用户编号获取详细信息 + * + * @param userId 用户ID + */ + @SaCheckPermission("system:user:query") + @GetMapping(value = {"/", "/{userId}"}) + public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { + SysUserInfoVo userInfoVo = new SysUserInfoVo(); + if (ObjectUtil.isNotNull(userId)) { + userService.checkUserDataScope(userId); + SysUserVo sysUser = userService.selectUserById(userId); + userInfoVo.setUser(sysUser); + userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); + Long deptId = sysUser.getDeptId(); + if (ObjectUtil.isNotNull(deptId)) { + SysPostBo postBo = new SysPostBo(); + postBo.setDeptId(deptId); + userInfoVo.setPosts(postService.selectPostList(postBo)); + userInfoVo.setPostIds(postService.selectPostListByUserId(userId)); + } + } + SysRoleBo roleBo = new SysRoleBo(); + roleBo.setStatus(SystemConstants.NORMAL); + List roles = roleService.selectRoleList(roleBo); + userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); + return R.ok(userInfoVo); + } + + /** + * 新增用户 + */ + @SaCheckPermission("system:user:add") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping + public R add(@Validated @RequestBody SysUserBo user) { + deptService.checkDeptDataScope(user.getDeptId()); + if (!userService.checkUserNameUnique(user)) { + return R.fail("新增用户'" + user.getUserName() + "'失败,登录账号已存在"); + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { + return R.fail("新增用户'" + user.getUserName() + "'失败,手机号码已存在"); + } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { + return R.fail("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在"); + } + if (TenantHelper.isEnable()) { + if (!tenantService.checkAccountBalance(TenantHelper.getTenantId())) { + return R.fail("当前租户下用户名额不足,请联系管理员"); + } + } + user.setPassword(BCrypt.hashpw(user.getPassword())); + return toAjax(userService.insertUser(user)); + } + + /** + * 修改用户 + */ + @SaCheckPermission("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping + public R edit(@Validated @RequestBody SysUserBo user) { + userService.checkUserAllowed(user.getUserId()); + userService.checkUserDataScope(user.getUserId()); + deptService.checkDeptDataScope(user.getDeptId()); + if (!userService.checkUserNameUnique(user)) { + return R.fail("修改用户'" + user.getUserName() + "'失败,登录账号已存在"); + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { + return R.fail("修改用户'" + user.getUserName() + "'失败,手机号码已存在"); + } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { + return R.fail("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); + } + return toAjax(userService.updateUser(user)); + } + + /** + * 删除用户 + * + * @param userIds 角色ID串 + */ + @SaCheckPermission("system:user:remove") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public R remove(@PathVariable Long[] userIds) { + if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) { + return R.fail("当前用户不能删除"); + } + return toAjax(userService.deleteUserByIds(userIds)); + } + + /** + * 根据用户ID串批量获取用户基础信息 + * + * @param userIds 用户ID串 + * @param deptId 部门ID + */ + @SaCheckPermission("system:user:query") + @GetMapping("/optionselect") + public R> optionselect(@RequestParam(required = false) Long[] userIds, + @RequestParam(required = false) Long deptId) { + return R.ok(userService.selectUserByIds(ArrayUtil.isEmpty(userIds) ? null : List.of(userIds), deptId)); + } + + /** + * 重置密码 + */ + @ApiEncrypt + @SaCheckPermission("system:user:resetPwd") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/resetPwd") + public R resetPwd(@RequestBody SysUserBo user) { + userService.checkUserAllowed(user.getUserId()); + userService.checkUserDataScope(user.getUserId()); + user.setPassword(BCrypt.hashpw(user.getPassword())); + return toAjax(userService.resetUserPwd(user.getUserId(), user.getPassword())); + } + + /** + * 状态修改 + */ + @SaCheckPermission("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public R changeStatus(@RequestBody SysUserBo user) { + userService.checkUserAllowed(user.getUserId()); + userService.checkUserDataScope(user.getUserId()); + return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus())); + } + + /** + * 根据用户编号获取授权角色 + * + * @param userId 用户ID + */ + @SaCheckPermission("system:user:query") + @GetMapping("/authRole/{userId}") + public R authRole(@PathVariable Long userId) { + userService.checkUserDataScope(userId); + SysUserVo user = userService.selectUserById(userId); + List roles = roleService.selectRolesAuthByUserId(userId); + SysUserInfoVo userInfoVo = new SysUserInfoVo(); + userInfoVo.setUser(user); + userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); + return R.ok(userInfoVo); + } + + /** + * 用户授权角色 + * + * @param userId 用户Id + * @param roleIds 角色ID串 + */ + @SaCheckPermission("system:user:edit") + @Log(title = "用户管理", businessType = BusinessType.GRANT) + @PutMapping("/authRole") + public R insertAuthRole(Long userId, Long[] roleIds) { + userService.checkUserDataScope(userId); + userService.insertUserAuth(userId, roleIds); + return R.ok(); + } + + /** + * 获取部门树列表 + */ + @SaCheckPermission("system:user:list") + @GetMapping("/deptTree") + public R>> deptTree(SysDeptBo dept) { + return R.ok(deptService.selectDeptTreeList(dept)); + } + + /** + * 获取部门下的所有用户信息 + */ + @SaCheckPermission("system:user:list") + @GetMapping("/list/dept/{deptId}") + public R> listByDept(@PathVariable @NotNull Long deptId) { + return R.ok(userService.selectUserListByDept(deptId)); + } + + /** + * 根据用户名查询用户是否存在 + * @param username + * @return + */ + @GetMapping("/getSysUserByUsername/{username}") + public R getSysUserByUsername(@NotBlank(message = "用户名不能为空") @PathVariable String username) { + SysUserVo sysUserVo = userService.selectUserByUserName(username); + if(ObjectUtil.isNotNull(sysUserVo)){ + return R.fail("用户'" + sysUserVo.getUserName() + "'已存在"); + } + return R.ok(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java new file mode 100644 index 0000000..6c956d5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java @@ -0,0 +1,47 @@ +package org.dromara.system.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.utils.StringUtils; + +/** + * 缓存信息 + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +public class SysCache { + + /** + * 缓存名称 + */ + private String cacheName = ""; + + /** + * 缓存键名 + */ + private String cacheKey = ""; + + /** + * 缓存内容 + */ + private String cacheValue = ""; + + /** + * 备注 + */ + private String remark = ""; + + public SysCache(String cacheName, String remark) { + this.cacheName = cacheName; + this.remark = remark; + } + + public SysCache(String cacheName, String cacheKey, String cacheValue) { + this.cacheName = StringUtils.replace(cacheName, ":", ""); + this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); + this.cacheValue = cacheValue; + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java new file mode 100644 index 0000000..426bc00 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java @@ -0,0 +1,79 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 授权管理对象 sys_client + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_client") +public class SysClient extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 客户端id + */ + private String clientId; + + /** + * 客户端key + */ + private String clientKey; + + /** + * 客户端秘钥 + */ + private String clientSecret; + + /** + * 授权类型 + */ + private String grantType; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * token活跃超时时间 + */ + private Long activeTimeout; + + /** + * token固定超时时间 + */ + private Long timeout; + + /** + * 状态(0正常 1停用) + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java new file mode 100644 index 0000000..df1355c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java @@ -0,0 +1,51 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * 参数配置表 sys_config + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_config") +public class SysConfig extends TenantEntity { + + /** + * 参数主键 + */ + @TableId(value = "config_id") + private Long configId; + + /** + * 参数名称 + */ + private String configName; + + /** + * 参数键名 + */ + private String configKey; + + /** + * 参数键值 + */ + private String configValue; + + /** + * 系统内置(Y是 N否) + */ + private String configType; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java new file mode 100644 index 0000000..b94fd8a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java @@ -0,0 +1,83 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 部门表 sys_dept + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_dept") +public class SysDept extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 部门ID + */ + @TableId(value = "dept_id") + private Long deptId; + + /** + * 父部门ID + */ + private Long parentId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 部门类别编码 + */ + private String deptCategory; + + /** + * 显示顺序 + */ + private Integer orderNum; + + /** + * 负责人 + */ + private Long leader; + + /** + * 联系电话 + */ + private String phone; + + /** + * 邮箱 + */ + private String email; + + /** + * 部门状态:0正常,1停用 + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 祖级列表 + */ + private String ancestors; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java new file mode 100644 index 0000000..9d83736 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java @@ -0,0 +1,71 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * 字典数据表 sys_dict_data + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_dict_data") +public class SysDictData extends TenantEntity { + + /** + * 字典编码 + */ + @TableId(value = "dict_code") + private Long dictCode; + + /** + * 字典排序 + */ + private Integer dictSort; + + /** + * 字典标签 + */ + private String dictLabel; + + /** + * 字典键值 + */ + private String dictValue; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 样式属性(其他样式扩展) + */ + private String cssClass; + + /** + * 表格字典样式 + */ + private String listClass; + + /** + * 是否默认(Y是 N否) + */ + private String isDefault; + + /** + * 备注 + */ + private String remark; + + public boolean getDefault() { + return SystemConstants.YES.equals(this.isDefault); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java new file mode 100644 index 0000000..dfd10a7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java @@ -0,0 +1,41 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * 字典类型表 sys_dict_type + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_dict_type") +public class SysDictType extends TenantEntity { + + /** + * 字典主键 + */ + @TableId(value = "dict_id") + private Long dictId; + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java new file mode 100644 index 0000000..f379dc6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java @@ -0,0 +1,86 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 系统访问记录表 sys_logininfor + * + * @author Lion Li + */ + +@Data +@TableName("sys_logininfor") +public class SysLogininfor implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @TableId(value = "info_id", type = IdType.ASSIGN_ID) + private Long infoId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 客户端 + */ + private String clientKey; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * 登录状态 0成功 1失败 + */ + private String status; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地点 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 提示消息 + */ + private String msg; + + /** + * 访问时间 + */ + private Date loginTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java new file mode 100644 index 0000000..2df5596 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java @@ -0,0 +1,191 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +/** + * 菜单权限表 sys_menu + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_menu") +public class SysMenu extends BaseEntity { + + /** + * 菜单ID + */ + @TableId(value = "menu_id") + private Long menuId; + + /** + * 父菜单ID + */ + private Long parentId; + + /** + * 菜单名称 + */ + private String menuName; + + /** + * 显示顺序 + */ + private Integer orderNum; + + /** + * 路由地址 + */ + private String path; + + /** + * 组件路径 + */ + private String component; + + /** + * 路由参数 + */ + private String queryParam; + + /** + * 是否为外链(0是 1否) + */ + private String isFrame; + + /** + * 是否缓存(0缓存 1不缓存) + */ + private String isCache; + + /** + * 类型(M目录 C菜单 F按钮) + */ + private String menuType; + + /** + * 显示状态(0显示 1隐藏) + */ + private String visible; + + /** + * 菜单状态(0正常 1停用) + */ + private String status; + + /** + * 权限字符串 + */ + private String perms; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 备注 + */ + private String remark; + + /** + * 父菜单名称 + */ + @TableField(exist = false) + private String parentName; + + /** + * 子菜单 + */ + @TableField(exist = false) + private List children = new ArrayList<>(); + + /** + * 获取路由名称 + */ + public String getRouteName() { + String routerName = StringUtils.capitalize(path); + // 非外链并且是一级目录(类型为目录) + if (isMenuFrame()) { + routerName = StringUtils.EMPTY; + } + return routerName; + } + + /** + * 获取路由地址 + */ + public String getRouterPath() { + String routerPath = this.path; + // 内链打开外网方式 + if (getParentId() != 0L && isInnerLink()) { + routerPath = innerLinkReplaceEach(routerPath); + } + // 非外链并且是一级目录(类型为目录) + if (0L == getParentId() && SystemConstants.TYPE_DIR.equals(getMenuType()) + && SystemConstants.NO_FRAME.equals(getIsFrame())) { + routerPath = "/" + this.path; + } + // 非外链并且是一级目录(类型为菜单) + else if (isMenuFrame()) { + routerPath = "/"; + } + return routerPath; + } + + /** + * 获取组件信息 + */ + public String getComponentInfo() { + String component = SystemConstants.LAYOUT; + if (StringUtils.isNotEmpty(this.component) && !isMenuFrame()) { + component = this.component; + } else if (StringUtils.isEmpty(this.component) && getParentId() != 0L && isInnerLink()) { + component = SystemConstants.INNER_LINK; + } else if (StringUtils.isEmpty(this.component) && isParentView()) { + component = SystemConstants.PARENT_VIEW; + } + return component; + } + + /** + * 是否为菜单内部跳转 + */ + public boolean isMenuFrame() { + return getParentId() == 0L && SystemConstants.TYPE_MENU.equals(menuType) && isFrame.equals(SystemConstants.NO_FRAME); + } + + /** + * 是否为内链组件 + */ + public boolean isInnerLink() { + return isFrame.equals(SystemConstants.NO_FRAME) && StringUtils.ishttp(path); + } + + /** + * 是否为parent_view组件 + */ + public boolean isParentView() { + return getParentId() != 0L && SystemConstants.TYPE_DIR.equals(menuType); + } + + /** + * 内链域名特殊字符替换 + */ + public static String innerLinkReplaceEach(String path) { + return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"}, + new String[]{"", "", "", "/", "/"}); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java new file mode 100644 index 0000000..fb1df87 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java @@ -0,0 +1,51 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + + +/** + * 通知公告表 sys_notice + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_notice") +public class SysNotice extends TenantEntity { + + /** + * 公告ID + */ + @TableId(value = "notice_id") + private Long noticeId; + + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型(1通知 2公告) + */ + private String noticeType; + + /** + * 公告内容 + */ + private String noticeContent; + + /** + * 公告状态(0正常 1关闭) + */ + private String status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java new file mode 100644 index 0000000..a987134 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java @@ -0,0 +1,116 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 操作日志记录表 oper_log + * + * @author Lion Li + */ + +@Data +@TableName("sys_oper_log") +public class SysOperLog implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 日志主键 + */ + @TableId(value = "oper_id", type = IdType.ASSIGN_ID) + private Long operId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 操作模块 + */ + private String title; + + /** + * 业务类型(0其它 1新增 2修改 3删除) + */ + private Integer businessType; + + /** + * 请求方法 + */ + private String method; + + /** + * 请求方式 + */ + private String requestMethod; + + /** + * 操作类别(0其它 1后台用户 2手机端用户) + */ + private Integer operatorType; + + /** + * 操作人员 + */ + private String operName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 请求url + */ + private String operUrl; + + /** + * 操作地址 + */ + private String operIp; + + /** + * 操作地点 + */ + private String operLocation; + + /** + * 请求参数 + */ + private String operParam; + + /** + * 返回参数 + */ + private String jsonResult; + + /** + * 操作状态(0正常 1异常) + */ + private Integer status; + + /** + * 错误消息 + */ + private String errorMsg; + + /** + * 操作时间 + */ + private Date operTime; + + /** + * 消耗时间 + */ + private Long costTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java new file mode 100644 index 0000000..e96d091 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java @@ -0,0 +1,50 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * OSS对象存储对象 + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_oss") +public class SysOss extends TenantEntity { + + /** + * 对象存储主键 + */ + @TableId(value = "oss_id") + private Long ossId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 原名 + */ + private String originalName; + + /** + * 文件后缀名 + */ + private String fileSuffix; + + /** + * URL地址 + */ + private String url; + + /** + * 服务商 + */ + private String service; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java new file mode 100644 index 0000000..4b67d63 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java @@ -0,0 +1,89 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 对象存储配置对象 sys_oss_config + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_oss_config") +public class SysOssConfig extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "oss_config_id") + private Long ossConfigId; + + /** + * 配置key + */ + private String configKey; + + /** + * accessKey + */ + private String accessKey; + + /** + * 秘钥 + */ + private String secretKey; + + /** + * 桶名称 + */ + private String bucketName; + + /** + * 前缀 + */ + private String prefix; + + /** + * 访问站点 + */ + private String endpoint; + + /** + * 自定义域名 + */ + private String domain; + + /** + * 是否https(0否 1是) + */ + private String isHttps; + + /** + * 域 + */ + private String region; + + /** + * 是否默认(0=是,1=否) + */ + private String status; + + /** + * 扩展字段 + */ + private String ext1; + + /** + * 备注 + */ + private String remark; + + /** + * 桶权限类型(0private 1public 2custom) + */ + private String accessPolicy; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java new file mode 100644 index 0000000..8ff8e99 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java @@ -0,0 +1,61 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * 岗位表 sys_post + * + * @author Lion Li + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_post") +public class SysPost extends TenantEntity { + + /** + * 岗位序号 + */ + @TableId(value = "post_id") + private Long postId; + + /** + * 部门id + */ + private Long deptId; + + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 岗位类别编码 + */ + private String postCategory; + + /** + * 岗位排序 + */ + private Integer postSort; + + /** + * 状态(0正常 1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java new file mode 100644 index 0000000..814542a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java @@ -0,0 +1,79 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.tenant.core.TenantEntity; + +/** + * 角色表 sys_role + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("sys_role") +public class SysRole extends TenantEntity { + + /** + * 角色ID + */ + @TableId(value = "role_id") + private Long roleId; + + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + + /** + * 角色排序 + */ + private Integer roleSort; + + /** + * 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) + */ + private String dataScope; + + /** + * 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) + */ + private Boolean menuCheckStrictly; + + /** + * 部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 ) + */ + private Boolean deptCheckStrictly; + + /** + * 角色状态(0正常 1停用) + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 备注 + */ + private String remark; + + public SysRole(Long roleId) { + this.roleId = roleId; + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java new file mode 100644 index 0000000..ba77694 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 角色和部门关联 sys_role_dept + * + * @author Lion Li + */ + +@Data +@TableName("sys_role_dept") +public class SysRoleDept { + + /** + * 角色ID + */ + @TableId(type = IdType.INPUT) + private Long roleId; + + /** + * 部门ID + */ + private Long deptId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java new file mode 100644 index 0000000..ba28f17 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 角色和菜单关联 sys_role_menu + * + * @author Lion Li + */ + +@Data +@TableName("sys_role_menu") +public class SysRoleMenu { + + /** + * 角色ID + */ + @TableId(type = IdType.INPUT) + private Long roleId; + + /** + * 菜单ID + */ + private Long menuId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java new file mode 100644 index 0000000..10f2936 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java @@ -0,0 +1,136 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 社会化关系对象 sys_social + * + * @author thiszhc + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_social") +public class SysSocial extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 的唯一ID + */ + private String authId; + + /** + * 用户来源 + */ + private String source; + + /** + * 用户的授权令牌 + */ + private String accessToken; + + /** + * 用户的授权令牌的有效期,部分平台可能没有 + */ + private int expireIn; + + /** + * 刷新令牌,部分平台可能没有 + */ + private String refreshToken; + + /** + * 用户的 open id + */ + private String openId; + + /** + * 授权的第三方账号 + */ + private String userName; + + /** + * 授权的第三方昵称 + */ + private String nickName; + + /** + * 授权的第三方邮箱 + */ + private String email; + + /** + * 授权的第三方头像地址 + */ + private String avatar; + + /** + * 平台的授权信息,部分平台可能没有 + */ + private String accessCode; + + /** + * 用户的 unionid + */ + private String unionId; + + /** + * 授予的权限,部分平台可能没有 + */ + private String scope; + + /** + * 个别平台的授权信息,部分平台可能没有 + */ + private String tokenType; + + /** + * id token,部分平台可能没有 + */ + private String idToken; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macAlgorithm; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macKey; + + /** + * 用户的授权code,部分平台可能没有 + */ + private String code; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthToken; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthTokenSecret; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java new file mode 100644 index 0000000..17c0eff --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java @@ -0,0 +1,160 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 租户对象 sys_tenant + * + * @author Michelle.Chung + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_tenant") +public class SysTenant extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id") + private Long id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 租户编号 + */ + private String tenantCode; + + /** + * 联系人 + */ + private String contactUserName; + + /** + * 联系电话 + */ + private String contactPhone; + + /** + * 企业名称 + */ + private String companyName; + + /** + * 统一社会信用代码 + */ + private String licenseNumber; + + /** + * 营业执照 + */ + private String licenseUrl; + + /** + * 地址 + */ + private String address; + + /** + * 域名 + */ + private String domain; + + /** + * 可用余额 + */ + private BigDecimal balance; + + /** + * 冻结余额 + */ + private BigDecimal blockedBalance; + + /** + * 企业简介 + */ + private String intro; + + /** + * 备注 + */ + private String remark; + + /** + *收款人姓名 + */ + private String payeeName; + + /** + *收款银行名称 + */ + private String payeeBank; + + /** + *收款银行卡号 + */ + private String payeeBankNum; + + + /** + * 租户套餐编号 + */ + private Long packageId; + + /** + * 过期时间 + */ + private Date expireTime; + + /** + * 用户数量(-1不限制) + */ + private Long accountCount; + + /** + * 租户状态(0正常 1停用) + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 客服企业微信链接 + */ + private String kfWx; + + /** + * 商户编号 + */ + private String merchantNo; + + /** + * 拉卡拉商户状态 + */ + private String merchantStatus; + + /** + * 拉卡拉商户信息 + */ + private String merchantInfo; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java new file mode 100644 index 0000000..2142fe9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java @@ -0,0 +1,62 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 租户套餐对象 sys_tenant_package + * + * @author Michelle.Chung + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_tenant_package") +public class SysTenantPackage extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户套餐id + */ + @TableId(value = "package_id") + private Long packageId; + + /** + * 套餐名称 + */ + private String packageName; + + /** + * 关联菜单id + */ + private String menuIds; + + /** + * 备注 + */ + private String remark; + + /** + * 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) + */ + private Boolean menuCheckStrictly; + + /** + * 状态(0正常 1停用) + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java new file mode 100644 index 0000000..63e90fc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -0,0 +1,115 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.tenant.core.TenantEntity; + +import java.util.Date; + +/** + * 用户对象 sys_user + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName("sys_user") +public class SysUser extends TenantEntity { + + /** + * 用户ID + */ + @TableId(value = "user_id") + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户类型(sys_user系统用户 kf_user客服 cg_user采购 cw_user财务) + */ + private String userType; + + /** + * 用户邮箱 + */ + private String email; + + /** + * 手机号码 + */ + private String phonenumber; + + /** + * 用户性别 + */ + private String sex; + + /** + * 用户头像 + */ + private Long avatar; + + /** + * 密码 + */ + @TableField( + insertStrategy = FieldStrategy.NOT_EMPTY, + updateStrategy = FieldStrategy.NOT_EMPTY, + whereStrategy = FieldStrategy.NOT_EMPTY + ) + private String password; + + /** + * 帐号状态(0正常 1停用) + */ + private String status; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + /** + * 最后登录IP + */ + private String loginIp; + + /** + * 最后登录时间 + */ + private Date loginDate; + + /** + * 备注 + */ + private String remark; + + + public SysUser(Long userId) { + this.userId = userId; + } + + public boolean isSuperAdmin() { + return SystemConstants.SUPER_ADMIN_ID.equals(this.userId); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java new file mode 100644 index 0000000..ba30eb6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java @@ -0,0 +1,63 @@ +package org.dromara.system.domain; + +import lombok.Data; + +/** + * 当前在线会话 + * + * @author Lion Li + */ +@Data +public class SysUserOnline { + + /** + * 会话编号 + */ + private String tokenId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 用户名称 + */ + private String userName; + + /** + * 客户端 + */ + private String clientKey; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地址 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 登录时间 + */ + private Long loginTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java new file mode 100644 index 0000000..119c117 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 用户和岗位关联 sys_user_post + * + * @author Lion Li + */ + +@Data +@TableName("sys_user_post") +public class SysUserPost { + + /** + * 用户ID + */ + @TableId(type = IdType.INPUT) + private Long userId; + + /** + * 岗位ID + */ + private Long postId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java new file mode 100644 index 0000000..0a50e80 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * 用户和角色关联 sys_user_role + * + * @author Lion Li + */ + +@Data +@TableName("sys_user_role") +public class SysUserRole { + + /** + * 用户ID + */ + @TableId(type = IdType.INPUT) + private Long userId; + + /** + * 角色ID + */ + private Long roleId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java new file mode 100644 index 0000000..359607a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java @@ -0,0 +1,81 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysClient; + +import java.util.List; + +/** + * 授权管理业务对象 sys_client + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysClient.class, reverseConvertGenerate = false) +public class SysClientBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 客户端id + */ + private String clientId; + + /** + * 客户端key + */ + @NotBlank(message = "客户端key不能为空", groups = { AddGroup.class, EditGroup.class }) + private String clientKey; + + /** + * 客户端秘钥 + */ + @NotBlank(message = "客户端秘钥不能为空", groups = { AddGroup.class, EditGroup.class }) + private String clientSecret; + + /** + * 授权类型 + */ + @NotNull(message = "授权类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private List grantTypeList; + + /** + * 授权类型 + */ + private String grantType; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * token活跃超时时间 + */ + private Long activeTimeout; + + /** + * token固定超时时间 + */ + private Long timeout; + + /** + * 状态(0正常 1停用) + */ + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java new file mode 100644 index 0000000..257935d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java @@ -0,0 +1,59 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysConfig; + +/** + * 参数配置业务对象 sys_config + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false) +public class SysConfigBo extends BaseEntity { + + /** + * 参数主键 + */ + private Long configId; + + /** + * 参数名称 + */ + @NotBlank(message = "参数名称不能为空") + @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符") + private String configName; + + /** + * 参数键名 + */ + @NotBlank(message = "参数键名不能为空") + @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符") + private String configKey; + + /** + * 参数键值 + */ + @NotBlank(message = "参数键值不能为空") + @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符") + private String configValue; + + /** + * 系统内置(Y是 N否) + */ + private String configType; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java new file mode 100644 index 0000000..5f64d6f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -0,0 +1,76 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysDept; + +/** + * 部门业务对象 sys_dept + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) +public class SysDeptBo extends BaseEntity { + + /** + * 部门id + */ + private Long deptId; + + /** + * 父部门ID + */ + private Long parentId; + + /** + * 部门名称 + */ + @NotBlank(message = "部门名称不能为空") + @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符") + private String deptName; + + /** + * 部门类别编码 + */ + @Size(min = 0, max = 100, message = "部门类别编码长度不能超过{max}个字符") + private String deptCategory; + + /** + * 显示顺序 + */ + @NotNull(message = "显示顺序不能为空") + private Integer orderNum; + + /** + * 负责人 + */ + private Long leader; + + /** + * 联系电话 + */ + @Size(min = 0, max = 11, message = "联系电话长度不能超过{max}个字符") + private String phone; + + /** + * 邮箱 + */ + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") + private String email; + + /** + * 部门状态(0正常 1停用) + */ + private String status; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java new file mode 100644 index 0000000..0f8f2a5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java @@ -0,0 +1,79 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysDictData; + +/** + * 字典数据业务对象 sys_dict_data + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false) +public class SysDictDataBo extends BaseEntity { + + /** + * 字典编码 + */ + private Long dictCode; + + /** + * 字典排序 + */ + private Integer dictSort; + + /** + * 字典标签 + */ + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符") + private String dictLabel; + + /** + * 字典键值 + */ + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符") + private String dictValue; + + /** + * 字典类型 + */ + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符") + private String dictType; + + /** + * 样式属性(其他样式扩展) + */ + @Size(min = 0, max = 100, message = "样式属性长度不能超过{max}个字符") + private String cssClass; + + /** + * 表格回显样式 + */ + private String listClass; + + /** + * 是否默认(Y是 N否) + */ + private String isDefault; + + /** + * 创建部门 + */ + private Long createDept; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java new file mode 100644 index 0000000..fcc1ac1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java @@ -0,0 +1,50 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.RegexConstants; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysDictType; + +/** + * 字典类型业务对象 sys_dict_type + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false) +public class SysDictTypeBo extends BaseEntity { + + /** + * 字典主键 + */ + private Long dictId; + + /** + * 字典名称 + */ + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符") + private String dictName; + + /** + * 字典类型 + */ + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符") + @Pattern(regexp = RegexConstants.DICTIONARY_TYPE, message = "字典类型必须以字母开头,且只能为(小写字母,数字,下滑线)") + private String dictType; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java new file mode 100644 index 0000000..1cbe129 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java @@ -0,0 +1,87 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysLogininfor; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 系统访问记录业务对象 sys_logininfor + * + * @author Michelle.Chung + */ + +@Data +@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false) +public class SysLogininforBo { + + /** + * 访问ID + */ + private Long infoId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 客户端 + */ + private String clientKey; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地点 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 登录状态(0成功 1失败) + */ + private String status; + + /** + * 提示消息 + */ + private String msg; + + /** + * 访问时间 + */ + private Date loginTime; + + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java new file mode 100644 index 0000000..fbaafaa --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java @@ -0,0 +1,110 @@ +package org.dromara.system.domain.bo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.constant.RegexConstants; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysMenu; + +/** + * 菜单权限业务对象 sys_menu + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) +public class SysMenuBo extends BaseEntity { + + /** + * 菜单ID + */ + private Long menuId; + + /** + * 父菜单ID + */ + private Long parentId; + + /** + * 菜单名称 + */ + @NotBlank(message = "菜单名称不能为空") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符") + private String menuName; + + /** + * 显示顺序 + */ + @NotNull(message = "显示顺序不能为空") + private Integer orderNum; + + /** + * 路由地址 + */ + @Size(min = 0, max = 200, message = "路由地址不能超过{max}个字符") + private String path; + + /** + * 组件路径 + */ + @Size(min = 0, max = 200, message = "组件路径不能超过{max}个字符") + private String component; + + /** + * 路由参数 + */ + private String queryParam; + + /** + * 是否为外链(0是 1否) + */ + private String isFrame; + + /** + * 是否缓存(0缓存 1不缓存) + */ + private String isCache; + + /** + * 菜单类型(M目录 C菜单 F按钮) + */ + @NotBlank(message = "菜单类型不能为空") + private String menuType; + + /** + * 显示状态(0显示 1隐藏) + */ + private String visible; + + /** + * 菜单状态(0正常 1停用) + */ + private String status; + + /** + * 权限标识 + */ + @JsonInclude(JsonInclude.Include.NON_NULL) + @Size(min = 0, max = 100, message = "权限标识长度不能超过{max}个字符") + @Pattern(regexp = RegexConstants.PERMISSION_STRING, message = "权限标识必须符合 tool:build:list 格式") + private String perms; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java new file mode 100644 index 0000000..cdcc575 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java @@ -0,0 +1,61 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.xss.Xss; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysNotice; + +/** + * 通知公告业务对象 sys_notice + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false) +public class SysNoticeBo extends BaseEntity { + + /** + * 公告ID + */ + private Long noticeId; + + /** + * 公告标题 + */ + @Xss(message = "公告标题不能包含脚本字符") + @NotBlank(message = "公告标题不能为空") + @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符") + private String noticeTitle; + + /** + * 公告类型(1通知 2公告) + */ + private String noticeType; + + /** + * 公告内容 + */ + private String noticeContent; + + /** + * 公告状态(0正常 1关闭) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 创建人名称 + */ + private String createByName; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java new file mode 100644 index 0000000..407947c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java @@ -0,0 +1,127 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMappers; +import lombok.Data; +import org.dromara.common.log.event.OperLogEvent; +import org.dromara.system.domain.SysOperLog; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 操作日志记录业务对象 sys_oper_log + * + * @author Michelle.Chung + * @date 2023-02-07 + */ + +@Data +@AutoMappers({ + @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), + @AutoMapper(target = OperLogEvent.class) +}) +public class SysOperLogBo { + + /** + * 日志主键 + */ + private Long operId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 模块标题 + */ + private String title; + + /** + * 业务类型(0其它 1新增 2修改 3删除) + */ + private Integer businessType; + + /** + * 业务类型数组 + */ + private Integer[] businessTypes; + + /** + * 方法名称 + */ + private String method; + + /** + * 请求方式 + */ + private String requestMethod; + + /** + * 操作类别(0其它 1后台用户 2手机端用户) + */ + private Integer operatorType; + + /** + * 操作人员 + */ + private String operName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 请求URL + */ + private String operUrl; + + /** + * 主机地址 + */ + private String operIp; + + /** + * 操作地点 + */ + private String operLocation; + + /** + * 请求参数 + */ + private String operParam; + + /** + * 返回参数 + */ + private String jsonResult; + + /** + * 操作状态(0正常 1异常) + */ + private Integer status; + + /** + * 错误消息 + */ + private String errorMsg; + + /** + * 操作时间 + */ + private Date operTime; + + /** + * 消耗时间 + */ + private Long costTime; + + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java new file mode 100644 index 0000000..a65a3b1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java @@ -0,0 +1,49 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysOss; + +/** + * OSS对象存储分页查询对象 sys_oss + * + * @author Lion Li + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysOss.class, reverseConvertGenerate = false) +public class SysOssBo extends BaseEntity { + + /** + * ossId + */ + private Long ossId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 原名 + */ + private String originalName; + + /** + * 文件后缀名 + */ + private String fileSuffix; + + /** + * URL地址 + */ + private String url; + + /** + * 服务商 + */ + private String service; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java new file mode 100644 index 0000000..6065eb1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java @@ -0,0 +1,109 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysOssConfig; + +/** + * 对象存储配置业务对象 sys_oss_config + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) +public class SysOssConfigBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long ossConfigId; + + /** + * 配置key + */ + @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间") + private String configKey; + + /** + * accessKey + */ + @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间") + private String accessKey; + + /** + * 秘钥 + */ + @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间") + private String secretKey; + + /** + * 桶名称 + */ + @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间") + private String bucketName; + + /** + * 前缀 + */ + private String prefix; + + /** + * 访问站点 + */ + @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间") + private String endpoint; + + /** + * 自定义域名 + */ + private String domain; + + /** + * 是否https(Y=是,N=否) + */ + private String isHttps; + + /** + * 是否默认(0=是,1=否) + */ + private String status; + + /** + * 域 + */ + private String region; + + /** + * 扩展字段 + */ + private String ext1; + + /** + * 备注 + */ + private String remark; + + /** + * 桶权限类型(0private 1public 2custom) + */ + @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String accessPolicy; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java new file mode 100644 index 0000000..09805cd --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java @@ -0,0 +1,75 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysPost; + +/** + * 岗位信息业务对象 sys_post + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysPost.class, reverseConvertGenerate = false) +public class SysPostBo extends BaseEntity { + + /** + * 岗位ID + */ + private Long postId; + + /** + * 部门id(单部门) + */ + @NotNull(message = "部门id不能为空") + private Long deptId; + + /** + * 归属部门id(部门树) + */ + private Long belongDeptId; + + /** + * 岗位编码 + */ + @NotBlank(message = "岗位编码不能为空") + @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符") + private String postCode; + + /** + * 岗位名称 + */ + @NotBlank(message = "岗位名称不能为空") + @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符") + private String postName; + + /** + * 岗位类别编码 + */ + @Size(min = 0, max = 100, message = "类别编码长度不能超过{max}个字符") + private String postCategory; + + /** + * 显示顺序 + */ + @NotNull(message = "显示顺序不能为空") + private Integer postSort; + + /** + * 状态(0正常 1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java new file mode 100644 index 0000000..3207bad --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java @@ -0,0 +1,94 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysRole; + +/** + * 角色信息业务对象 sys_role + * + * @author Michelle.Chung + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysRole.class, reverseConvertGenerate = false) +public class SysRoleBo extends BaseEntity { + + /** + * 角色ID + */ + private Long roleId; + + /** + * 角色名称 + */ + @NotBlank(message = "角色名称不能为空") + @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符") + private String roleName; + + /** + * 角色权限字符串 + */ + @NotBlank(message = "角色权限字符串不能为空") + @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符") + private String roleKey; + + /** + * 显示顺序 + */ + @NotNull(message = "显示顺序不能为空") + private Integer roleSort; + + /** + * 数据范围(1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限) + */ + private String dataScope; + + /** + * 菜单树选择项是否关联显示 + */ + private Boolean menuCheckStrictly; + + /** + * 部门树选择项是否关联显示 + */ + private Boolean deptCheckStrictly; + + /** + * 角色状态(0正常 1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 菜单组 + */ + private Long[] menuIds; + + /** + * 部门组(数据权限) + */ + private Long[] deptIds; + + public SysRoleBo(Long roleId) { + this.roleId = roleId; + } + + public boolean isSuperAdmin() { + return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java new file mode 100644 index 0000000..cede1e9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java @@ -0,0 +1,142 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.system.domain.SysSocial; + +/** + * 社会化关系业务对象 sys_social + * + * @author Lion Li + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysSocial.class, reverseConvertGenerate = false) +public class SysSocialBo extends TenantEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 认证唯一ID + */ + @NotBlank(message = "认证唯一ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String authId; + + /** + * 用户来源 + */ + @NotBlank(message = "用户来源不能为空", groups = { AddGroup.class, EditGroup.class }) + private String source; + + /** + * 用户的授权令牌 + */ + @NotBlank(message = "用户的授权令牌不能为空", groups = { AddGroup.class, EditGroup.class }) + private String accessToken; + + /** + * 用户的授权令牌的有效期,部分平台可能没有 + */ + private int expireIn; + + /** + * 刷新令牌,部分平台可能没有 + */ + private String refreshToken; + + /** + * 平台唯一id + */ + private String openId; + + /** + * 用户的 ID + */ + @NotBlank(message = "用户的ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 平台的授权信息,部分平台可能没有 + */ + private String accessCode; + + /** + * 用户的 unionid + */ + private String unionId; + + /** + * 授予的权限,部分平台可能没有 + */ + private String scope; + + /** + * 授权的第三方账号 + */ + private String userName; + + /** + * 授权的第三方昵称 + */ + private String nickName; + + /** + * 授权的第三方邮箱 + */ + private String email; + + /** + * 授权的第三方头像地址 + */ + private String avatar; + + /** + * 个别平台的授权信息,部分平台可能没有 + */ + private String tokenType; + + /** + * id token,部分平台可能没有 + */ + private String idToken; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macAlgorithm; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macKey; + + /** + * 用户的授权code,部分平台可能没有 + */ + private String code; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthToken; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthTokenSecret; + + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java new file mode 100644 index 0000000..0a24525 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java @@ -0,0 +1,174 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysTenant; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 租户业务对象 sys_tenant + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false) +public class SysTenantBo extends BaseEntity { + + /** + * id + */ + @NotNull(message = "id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 租户编号 + */ + @NotNull(message = "租户编号不能为空", groups = { EditGroup.class }) + private String tenantCode; + + /** + * 联系人 + */ + @NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contactUserName; + + /** + * 联系电话 + */ + @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) + private String contactPhone; + + /** + * 企业名称 + */ + @NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String companyName; + + /** + * 用户名(创建系统用户) + */ + @NotBlank(message = "用户名不能为空", groups = { AddGroup.class }) + private String username; + + /** + * 密码(创建系统用户) + */ + @NotBlank(message = "密码不能为空", groups = { AddGroup.class }) + private String password; + + /** + *收款人姓名 + */ + @NotBlank(message = "收款人姓名", groups = { AddGroup.class, EditGroup.class }) + private String payeeName; + + /** + *收款银行名称 + */ + @NotBlank(message = "收款银行名称", groups = { AddGroup.class, EditGroup.class }) + private String payeeBank; + + /** + *收款银行卡号 + */ + @NotBlank(message = "收款银行卡号", groups = { AddGroup.class, EditGroup.class }) + private String payeeBankNum; + + /** + * 统一社会信用代码 + */ + private String licenseNumber; + + /** + * 营业执照 + */ + private String licenseUrl; + + /** + * 地址 + */ + private String address; + + /** + * 域名 + */ + private String domain; + + /** + * 可用余额 + */ + private BigDecimal balance; + + /** + * 冻结余额 + */ + private BigDecimal blockedBalance; + + /** + * 企业简介 + */ + private String intro; + + /** + * 备注 + */ + private String remark; + + /** + * 租户套餐编号 + */ + @NotNull(message = "租户套餐不能为空", groups = { AddGroup.class }) + private Long packageId; + + /** + * 过期时间 + */ + private Date expireTime; + + /** + * 用户数量(-1不限制) + */ + private Long accountCount; + + /** + * 租户状态(0正常 1停用) + */ + private String status; + + /** + * 客服企业微信链接 + */ + private String kfWx; + + /** + * 商户编号 + */ + private String merchantNo; + + /** + * 拉卡拉商户状态 + */ + private String merchantStatus; + + /** + * 拉卡拉商户信息 + */ + private String merchantInfo; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java new file mode 100644 index 0000000..7aa2604 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java @@ -0,0 +1,59 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysTenantPackage; + +/** + * 租户套餐业务对象 sys_tenant_package + * + * @author Michelle.Chung + */ + +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysTenantPackage.class, reverseConvertGenerate = false) +public class SysTenantPackageBo extends BaseEntity { + + /** + * 租户套餐id + */ + @NotNull(message = "租户套餐id不能为空", groups = { EditGroup.class }) + private Long packageId; + + /** + * 套餐名称 + */ + @NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String packageName; + + /** + * 关联菜单id + */ + @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") + private Long[] menuIds; + + /** + * 备注 + */ + private String remark; + + /** + * 菜单树选择项是否关联显示 + */ + private Boolean menuCheckStrictly; + + /** + * 状态(0正常 1停用) + */ + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java new file mode 100644 index 0000000..b0d5575 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -0,0 +1,124 @@ +package org.dromara.system.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.xss.Xss; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.system.domain.SysUser; + +/** + * 用户信息业务对象 sys_user + * + * @author Michelle.Chung + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysUser.class, reverseConvertGenerate = false) +public class SysUserBo extends BaseEntity { + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 用户账号 + */ + @Xss(message = "用户账号不能包含脚本字符") + @NotBlank(message = "用户账号不能为空") + @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符") + private String userName; + + /** + * 用户昵称 + */ + @Xss(message = "用户昵称不能包含脚本字符") + @NotBlank(message = "用户昵称不能为空") + @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") + private String nickName; + + /** + * 用户类型(sys_user系统用户 kf_user客服 cg_user采购 cw_user财务) + */ + private String userType; + + /** + * 用户邮箱 + */ + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") + private String email; + + /** + * 手机号码 + */ + private String phonenumber; + + /** + * 用户性别(0男 1女 2未知) + */ + private String sex; + + /** + * 密码 + */ + private String password; + + /** + * 帐号状态(0正常 1停用) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 角色组 + */ + @Size(min = 1, message = "用户角色不能为空") + private Long[] roleIds; + + /** + * 岗位组 + */ + private Long[] postIds; + + /** + * 数据权限 当前角色ID + */ + private Long roleId; + + /** + * 排除不查询的用户(工作流用) + */ + private String excludeUserIds; + + public SysUserBo(Long userId) { + this.userId = userId; + } + + public boolean isSuperAdmin() { + return SystemConstants.SUPER_ADMIN_ID.equals(this.userId); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java new file mode 100644 index 0000000..8615fcd --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 用户密码修改bo + */ +@Data +public class SysUserPasswordBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 旧密码 + */ + @NotBlank(message = "旧密码不能为空") + private String oldPassword; + + /** + * 新密码 + */ + @NotBlank(message = "新密码不能为空") + private String newPassword; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java new file mode 100644 index 0000000..846dd79 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java @@ -0,0 +1,53 @@ +package org.dromara.system.domain.bo; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.dromara.common.core.constant.RegexConstants; +import org.dromara.common.core.xss.Xss; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.sensitive.annotation.Sensitive; +import org.dromara.common.sensitive.core.SensitiveStrategy; + +/** + * 个人信息业务处理 + * + * @author Michelle.Chung + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysUserProfileBo extends BaseEntity { + + /** + * 用户昵称 + */ + @Xss(message = "用户昵称不能包含脚本字符") + @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") + private String nickName; + + /** + * 用户邮箱 + */ + @Sensitive(strategy = SensitiveStrategy.EMAIL) + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") + private String email; + + /** + * 手机号码 + */ + @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确") + @Sensitive(strategy = SensitiveStrategy.PHONE) + private String phonenumber; + + /** + * 用户性别(0男 1女 2未知) + */ + private String sex; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java new file mode 100644 index 0000000..46c020b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java @@ -0,0 +1,18 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +/** + * 用户头像信息 + * + * @author Michelle.Chung + */ +@Data +public class AvatarVo { + + /** + * 头像地址 + */ + private String imgUrl; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java new file mode 100644 index 0000000..f827cba --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java @@ -0,0 +1,23 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +import java.util.List; +import java.util.Map; +import java.util.Properties; + +/** + * 缓存监控列表信息 + * + * @author Michelle.Chung + */ +@Data +public class CacheListInfoVo { + + private Properties info; + + private Long dbSize; + + private List> commandStats; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java new file mode 100644 index 0000000..6f7db28 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java @@ -0,0 +1,26 @@ +package org.dromara.system.domain.vo; + +import cn.hutool.core.lang.tree.Tree; +import lombok.Data; + +import java.util.List; + +/** + * 角色部门列表树信息 + * + * @author Michelle.Chung + */ +@Data +public class DeptTreeSelectVo { + + /** + * 选中部门列表 + */ + private List checkedKeys; + + /** + * 下拉树结构列表 + */ + private List> depts; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java new file mode 100644 index 0000000..0724538 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java @@ -0,0 +1,26 @@ +package org.dromara.system.domain.vo; + +import cn.hutool.core.lang.tree.Tree; +import lombok.Data; + +import java.util.List; + +/** + * 角色菜单列表树信息 + * + * @author Michelle.Chung + */ +@Data +public class MenuTreeSelectVo { + + /** + * 选中菜单列表 + */ + private List checkedKeys; + + /** + * 菜单下拉树结构列表 + */ + private List> menus; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java new file mode 100644 index 0000000..e740a97 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java @@ -0,0 +1,61 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; +import org.dromara.common.core.utils.StringUtils; + +/** + * 路由显示信息 + * + * @author ruoyi + */ + +@Data +public class MetaVo { + + /** + * 设置该路由在侧边栏和面包屑中展示的名字 + */ + private String title; + + /** + * 设置该路由的图标,对应路径src/assets/icons/svg + */ + private String icon; + + /** + * 设置为true,则不会被 缓存 + */ + private boolean noCache; + + /** + * 内链地址(http(s)://开头) + */ + private String link; + + public MetaVo(String title, String icon) { + this.title = title; + this.icon = icon; + } + + public MetaVo(String title, String icon, boolean noCache) { + this.title = title; + this.icon = icon; + this.noCache = noCache; + } + + public MetaVo(String title, String icon, String link) { + this.title = title; + this.icon = icon; + this.link = link; + } + + public MetaVo(String title, String icon, boolean noCache, String link) { + this.title = title; + this.icon = icon; + this.noCache = noCache; + if (StringUtils.ishttp(link)) { + this.link = link; + } + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java new file mode 100644 index 0000000..c047651 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +/** + * 用户个人信息 + * + * @author Michelle.Chung + */ +@Data +public class ProfileVo { + + /** + * 用户信息 + */ + private SysUserVo user; + + /** + * 用户所属角色组 + */ + private String roleGroup; + + /** + * 用户所属岗位组 + */ + private String postGroup; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java new file mode 100644 index 0000000..0d576ef --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java @@ -0,0 +1,62 @@ +package org.dromara.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.util.List; + +/** + * 路由配置信息 + * + * @author Lion Li + */ +@Data +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class RouterVo { + + /** + * 路由名字 + */ + private String name; + + /** + * 路由地址 + */ + private String path; + + /** + * 是否隐藏路由,当设置 true 的时候该路由不会再侧边栏出现 + */ + private boolean hidden; + + /** + * 重定向地址,当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + */ + private String redirect; + + /** + * 组件地址 + */ + private String component; + + /** + * 路由参数:如 {"id": 1, "name": "ry"} + */ + private String query; + + /** + * 当你一个路由下面的 children 声明的路由大于1个时,自动会变成嵌套的模式--如组件页面 + */ + private Boolean alwaysShow; + + /** + * 其他元素 + */ + private MetaVo meta; + + /** + * 子路由 + */ + private List children; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java new file mode 100644 index 0000000..bd502ed --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java @@ -0,0 +1,90 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysClient; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + + +/** + * 授权管理视图对象 sys_client + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysClient.class) +public class SysClientVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 客户端id + */ + @ExcelProperty(value = "客户端id") + private String clientId; + + /** + * 客户端key + */ + @ExcelProperty(value = "客户端key") + private String clientKey; + + /** + * 客户端秘钥 + */ + @ExcelProperty(value = "客户端秘钥") + private String clientSecret; + + /** + * 授权类型 + */ + @ExcelProperty(value = "授权类型") + private List grantTypeList; + + /** + * 授权类型 + */ + private String grantType; + + /** + * 设备类型 + */ + private String deviceType; + + /** + * token活跃超时时间 + */ + @ExcelProperty(value = "token活跃超时时间") + private Long activeTimeout; + + /** + * token固定超时时间 + */ + @ExcelProperty(value = "token固定超时时间") + private Long timeout; + + /** + * 状态(0正常 1停用) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=正常,1=停用") + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java new file mode 100644 index 0000000..946f3df --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java @@ -0,0 +1,72 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysConfig; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 参数配置视图对象 sys_config + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysConfig.class) +public class SysConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 参数主键 + */ + @ExcelProperty(value = "参数主键") + private Long configId; + + /** + * 参数名称 + */ + @ExcelProperty(value = "参数名称") + private String configName; + + /** + * 参数键名 + */ + @ExcelProperty(value = "参数键名") + private String configKey; + + /** + * 参数键值 + */ + @ExcelProperty(value = "参数键值") + private String configValue; + + /** + * 系统内置(Y是 N否) + */ + @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_yes_no") + private String configType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java new file mode 100644 index 0000000..098b865 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -0,0 +1,102 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysDept; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 部门视图对象 sys_dept + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDept.class) +public class SysDeptVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 部门id + */ + @ExcelProperty(value = "部门id") + private Long deptId; + + /** + * 父部门id + */ + private Long parentId; + + /** + * 父部门名称 + */ + private String parentName; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 部门类别编码 + */ + @ExcelProperty(value = "部门类别编码") + private String deptCategory; + + /** + * 显示顺序 + */ + private Integer orderNum; + + /** + * 负责人ID + */ + private Long leader; + + /** + * 负责人 + */ + @ExcelProperty(value = "负责人") + private String leaderName; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String phone; + + /** + * 邮箱 + */ + @ExcelProperty(value = "邮箱") + private String email; + + /** + * 部门状态(0正常 1停用) + */ + @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_normal_disable") + private String status; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java new file mode 100644 index 0000000..cd84881 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java @@ -0,0 +1,88 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysDictData; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 字典数据视图对象 sys_dict_data + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDictData.class) +public class SysDictDataVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字典编码 + */ + @ExcelProperty(value = "字典编码") + private Long dictCode; + + /** + * 字典排序 + */ + @ExcelProperty(value = "字典排序") + private Integer dictSort; + + /** + * 字典标签 + */ + @ExcelProperty(value = "字典标签") + private String dictLabel; + + /** + * 字典键值 + */ + @ExcelProperty(value = "字典键值") + private String dictValue; + + /** + * 字典类型 + */ + @ExcelProperty(value = "字典类型") + private String dictType; + + /** + * 样式属性(其他样式扩展) + */ + private String cssClass; + + /** + * 表格回显样式 + */ + private String listClass; + + /** + * 是否默认(Y是 N否) + */ + @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_yes_no") + private String isDefault; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java new file mode 100644 index 0000000..1b1f95a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java @@ -0,0 +1,57 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysDictType; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 字典类型视图对象 sys_dict_type + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysDictType.class) +public class SysDictTypeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 字典主键 + */ + @ExcelProperty(value = "字典主键") + private Long dictId; + + /** + * 字典名称 + */ + @ExcelProperty(value = "字典名称") + private String dictName; + + /** + * 字典类型 + */ + @ExcelProperty(value = "字典类型") + private String dictType; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java new file mode 100644 index 0000000..7ec7047 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java @@ -0,0 +1,106 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysLogininfor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 系统访问记录视图对象 sys_logininfor + * + * @author Michelle.Chung + * @date 2023-02-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysLogininfor.class) +public class SysLogininforVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 访问ID + */ + @ExcelProperty(value = "序号") + private Long infoId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 用户账号 + */ + @ExcelProperty(value = "用户账号") + private String userName; + + /** + * 客户端 + */ + @ExcelProperty(value = "客户端") + private String clientKey; + + /** + * 设备类型 + */ + @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_device_type") + private String deviceType; + + /** + * 登录状态(0成功 1失败) + */ + @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_common_status") + private String status; + + /** + * 登录IP地址 + */ + @ExcelProperty(value = "登录地址") + private String ipaddr; + + /** + * 登录地点 + */ + @ExcelProperty(value = "登录地点") + private String loginLocation; + + /** + * 浏览器类型 + */ + @ExcelProperty(value = "浏览器") + private String browser; + + /** + * 操作系统 + */ + @ExcelProperty(value = "操作系统") + private String os; + + + /** + * 提示消息 + */ + @ExcelProperty(value = "提示消息") + private String msg; + + /** + * 访问时间 + */ + @ExcelProperty(value = "访问时间") + private Date loginTime; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java new file mode 100644 index 0000000..a51564a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java @@ -0,0 +1,116 @@ +package org.dromara.system.domain.vo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysMenu; + +import java.io.Serial; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + + +/** + * 菜单权限视图对象 sys_menu + * + * @author Michelle.Chung + */ +@Data +@AutoMapper(target = SysMenu.class) +public class SysMenuVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 菜单ID + */ + private Long menuId; + + /** + * 菜单名称 + */ + private String menuName; + + /** + * 父菜单ID + */ + private Long parentId; + + /** + * 显示顺序 + */ + private Integer orderNum; + + /** + * 路由地址 + */ + private String path; + + /** + * 组件路径 + */ + private String component; + + /** + * 路由参数 + */ + private String queryParam; + + /** + * 是否为外链(0是 1否) + */ + private String isFrame; + + /** + * 是否缓存(0缓存 1不缓存) + */ + private String isCache; + + /** + * 菜单类型(M目录 C菜单 F按钮) + */ + private String menuType; + + /** + * 显示状态(0显示 1隐藏) + */ + private String visible; + + /** + * 菜单状态(0正常 1停用) + */ + private String status; + + /** + * 权限标识 + */ + private String perms; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 创建部门 + */ + private Long createDept; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 子菜单 + */ + private List children = new ArrayList<>(); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java new file mode 100644 index 0000000..271ae62 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java @@ -0,0 +1,73 @@ +package org.dromara.system.domain.vo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysNotice; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 通知公告视图对象 sys_notice + * + * @author Michelle.Chung + */ +@Data +@AutoMapper(target = SysNotice.class) +public class SysNoticeVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 公告ID + */ + private Long noticeId; + + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型(1通知 2公告) + */ + private String noticeType; + + /** + * 公告内容 + */ + private String noticeContent; + + /** + * 公告状态(0正常 1关闭) + */ + private String status; + + /** + * 备注 + */ + private String remark; + + /** + * 创建者 + */ + private Long createBy; + + /** + * 创建人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy") + private String createByName; + + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java new file mode 100644 index 0000000..145e11c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java @@ -0,0 +1,144 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysOperLog; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 操作日志记录视图对象 sys_oper_log + * + * @author Michelle.Chung + * @date 2023-02-07 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysOperLog.class) +public class SysOperLogVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 日志主键 + */ + @ExcelProperty(value = "日志主键") + private Long operId; + + /** + * 租户编号 + */ + private String tenantId; + + /** + * 模块标题 + */ + @ExcelProperty(value = "操作模块") + private String title; + + /** + * 业务类型(0其它 1新增 2修改 3删除) + */ + @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_oper_type") + private Integer businessType; + + /** + * 业务类型数组 + */ + private Integer[] businessTypes; + + /** + * 方法名称 + */ + @ExcelProperty(value = "请求方法") + private String method; + + /** + * 请求方式 + */ + @ExcelProperty(value = "请求方式") + private String requestMethod; + + /** + * 操作类别(0其它 1后台用户 2手机端用户) + */ + @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") + private Integer operatorType; + + /** + * 操作人员 + */ + @ExcelProperty(value = "操作人员") + private String operName; + + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 请求URL + */ + @ExcelProperty(value = "请求地址") + private String operUrl; + + /** + * 主机地址 + */ + @ExcelProperty(value = "操作地址") + private String operIp; + + /** + * 操作地点 + */ + @ExcelProperty(value = "操作地点") + private String operLocation; + + /** + * 请求参数 + */ + @ExcelProperty(value = "请求参数") + private String operParam; + + /** + * 返回参数 + */ + @ExcelProperty(value = "返回参数") + private String jsonResult; + + /** + * 操作状态(0正常 1异常) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_common_status") + private Integer status; + + /** + * 错误消息 + */ + @ExcelProperty(value = "错误消息") + private String errorMsg; + + /** + * 操作时间 + */ + @ExcelProperty(value = "操作时间") + private Date operTime; + + /** + * 消耗时间 + */ + @ExcelProperty(value = "消耗时间") + private Long costTime; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java new file mode 100644 index 0000000..53d2065 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java @@ -0,0 +1,97 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysOssConfig; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 对象存储配置视图对象 sys_oss_config + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysOssConfig.class) +public class SysOssConfigVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long ossConfigId; + + /** + * 配置key + */ + private String configKey; + + /** + * accessKey + */ + private String accessKey; + + /** + * 秘钥 + */ + private String secretKey; + + /** + * 桶名称 + */ + private String bucketName; + + /** + * 前缀 + */ + private String prefix; + + /** + * 访问站点 + */ + private String endpoint; + + /** + * 自定义域名 + */ + private String domain; + + /** + * 是否https(Y=是,N=否) + */ + private String isHttps; + + /** + * 域 + */ + private String region; + + /** + * 是否默认(0=是,1=否) + */ + private String status; + + /** + * 扩展字段 + */ + private String ext1; + + /** + * 备注 + */ + private String remark; + + /** + * 桶权限类型(0private 1public 2custom) + */ + private String accessPolicy; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java new file mode 100644 index 0000000..11e0ff8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java @@ -0,0 +1,28 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +/** + * 上传对象信息 + * + * @author Michelle.Chung + */ +@Data +public class SysOssUploadVo { + + /** + * URL地址 + */ + private String url; + + /** + * 文件名 + */ + private String fileName; + + /** + * 对象存储主键 + */ + private String ossId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java new file mode 100644 index 0000000..fde5360 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java @@ -0,0 +1,72 @@ +package org.dromara.system.domain.vo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysOss; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * OSS对象存储视图对象 sys_oss + * + * @author Lion Li + */ +@Data +@AutoMapper(target = SysOss.class) +public class SysOssVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 对象存储主键 + */ + private Long ossId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 原名 + */ + private String originalName; + + /** + * 文件后缀名 + */ + private String fileSuffix; + + /** + * URL地址 + */ + private String url; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 上传人 + */ + private Long createBy; + + /** + * 上传人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy") + private String createByName; + + /** + * 服务商 + */ + private String service; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java new file mode 100644 index 0000000..69be547 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -0,0 +1,91 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysPost; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 岗位信息视图对象 sys_post + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysPost.class) +public class SysPostVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 岗位ID + */ + @ExcelProperty(value = "岗位序号") + private Long postId; + + /** + * 部门id + */ + @ExcelProperty(value = "部门id") + private Long deptId; + + /** + * 岗位编码 + */ + @ExcelProperty(value = "岗位编码") + private String postCode; + + /** + * 岗位名称 + */ + @ExcelProperty(value = "岗位名称") + private String postName; + + /** + * 岗位类别编码 + */ + @ExcelProperty(value = "类别编码") + private String postCategory; + + /** + * 显示顺序 + */ + @ExcelProperty(value = "岗位排序") + private Integer postSort; + + /** + * 状态(0正常 1停用) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_normal_disable") + private String status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 部门名 + */ + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId") + private String deptName; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java new file mode 100644 index 0000000..ffb2c6d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java @@ -0,0 +1,100 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysRole; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 角色信息视图对象 sys_role + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysRole.class) +public class SysRoleVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 角色ID + */ + @ExcelProperty(value = "角色序号") + private Long roleId; + + /** + * 角色名称 + */ + @ExcelProperty(value = "角色名称") + private String roleName; + + /** + * 角色权限字符串 + */ + @ExcelProperty(value = "角色权限") + private String roleKey; + + /** + * 显示顺序 + */ + @ExcelProperty(value = "角色排序") + private Integer roleSort; + + /** + * 数据范围(1:全部数据权限 2:自定数据权限 3:本部门数据权限 4:本部门及以下数据权限) + */ + @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") + private String dataScope; + + /** + * 菜单树选择项是否关联显示 + */ + @ExcelProperty(value = "菜单树选择项是否关联显示") + private Boolean menuCheckStrictly; + + /** + * 部门树选择项是否关联显示 + */ + @ExcelProperty(value = "部门树选择项是否关联显示") + private Boolean deptCheckStrictly; + + /** + * 角色状态(0正常 1停用) + */ + @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_normal_disable") + private String status; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 用户是否存在此角色标识 默认不存在 + */ + private boolean flag = false; + + public boolean isSuperAdmin() { + return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java new file mode 100644 index 0000000..948dbcc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java @@ -0,0 +1,144 @@ +package org.dromara.system.domain.vo; + +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.system.domain.SysSocial; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 社会化关系视图对象 sys_social + * + * @author thiszhc + */ +@Data +@AutoMapper(target = SysSocial.class) +public class SysSocialVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 用户ID + */ + private Long userId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 的唯一ID + */ + private String authId; + + /** + * 用户来源 + */ + private String source; + + /** + * 用户的授权令牌 + */ + private String accessToken; + + /** + * 用户的授权令牌的有效期,部分平台可能没有 + */ + private int expireIn; + + /** + * 刷新令牌,部分平台可能没有 + */ + private String refreshToken; + + /** + * 用户的 open id + */ + private String openId; + + /** + * 授权的第三方账号 + */ + private String userName; + + /** + * 授权的第三方昵称 + */ + private String nickName; + + /** + * 授权的第三方邮箱 + */ + private String email; + + /** + * 授权的第三方头像地址 + */ + private String avatar; + + + /** + * 平台的授权信息,部分平台可能没有 + */ + private String accessCode; + + /** + * 用户的 unionid + */ + private String unionId; + + /** + * 授予的权限,部分平台可能没有 + */ + private String scope; + + /** + * 个别平台的授权信息,部分平台可能没有 + */ + private String tokenType; + + /** + * id token,部分平台可能没有 + */ + private String idToken; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macAlgorithm; + + /** + * 小米平台用户的附带属性,部分平台可能没有 + */ + private String macKey; + + /** + * 用户的授权code,部分平台可能没有 + */ + private String code; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthToken; + + /** + * Twitter平台用户的附带属性,部分平台可能没有 + */ + private String oauthTokenSecret; + + /** + * 创建时间 + */ + private Date createTime; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java new file mode 100644 index 0000000..a413d63 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java @@ -0,0 +1,66 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysTenantPackage; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 租户套餐视图对象 sys_tenant_package + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysTenantPackage.class) +public class SysTenantPackageVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户套餐id + */ + @ExcelProperty(value = "租户套餐id") + private Long packageId; + + /** + * 套餐名称 + */ + @ExcelProperty(value = "套餐名称") + private String packageName; + + /** + * 关联菜单id + */ + @ExcelProperty(value = "关联菜单id") + private String menuIds; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 菜单树选择项是否关联显示 + */ + @ExcelProperty(value = "菜单树选择项是否关联显示") + private Boolean menuCheckStrictly; + + /** + * 状态(0正常 1停用) + */ + @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=正常,1=停用") + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantSumVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantSumVo.java new file mode 100644 index 0000000..8b2d8e0 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantSumVo.java @@ -0,0 +1,29 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @author admin + */ +@Data +@ExcelIgnoreUnannotated +public class SysTenantSumVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 总数量 + */ + private Long totalNum; + + //总余额 + private BigDecimal totalBalance; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java new file mode 100644 index 0000000..28c854d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java @@ -0,0 +1,193 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.system.domain.SysTenant; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 租户视图对象 sys_tenant + * + * @author Michelle.Chung + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SysTenant.class) +public class SysTenantVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 租户ID + */ + @ExcelProperty(value = "租户ID") + private String tenantId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantCode; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String contactUserName; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String contactPhone; + + /** + * 企业名称 + */ + @ExcelProperty(value = "企业名称") + private String companyName; + + /** + * 统一社会信用代码 + */ + @ExcelProperty(value = "统一社会信用代码") + private String licenseNumber; + + /** + * 营业执照 + */ + @ExcelProperty(value = "营业执照") + private String licenseUrl; + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String address; + + /** + * 域名 + */ + @ExcelProperty(value = "域名") + private String domain; + + /** + * 可用余额 + */ + @ExcelProperty(value = "可用余额") + private BigDecimal balance; + + /** + * 冻结余额 + */ + @ExcelProperty(value = "冻结余额") + private BigDecimal blockedBalance; + + /** + * 企业简介 + */ + @ExcelProperty(value = "企业简介") + private String intro; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 租户套餐编号 + */ + @ExcelProperty(value = "租户套餐编号") + private Long packageId; + + /** + * 过期时间 + */ + @ExcelProperty(value = "过期时间") + private Date expireTime; + + /** + * 用户数量(-1不限制) + */ + @ExcelProperty(value = "用户数量") + private Long accountCount; + + /** + *收款人姓名 + */ + @ExcelProperty(value = "收款人姓名") + private String payeeName; + + /** + *收款银行名称 + */ + @ExcelProperty(value = "收款银行名称") + private String payeeBank; + + /** + *收款银行卡号 + */ + @ExcelProperty(value = "收款银行卡号") + private String payeeBankNum; + + /** + * 租户状态(0正常 1停用) + */ + @ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=正常,1=停用") + private String status; + + /** + * 客服企业微信链接 + */ + @ExcelProperty(value = "客服企业微信链接") + private String kfWx; + + /** + * 商户编号 + */ + @ExcelProperty(value = "商户编号") + private String merchantNo; + + /** + * 拉卡拉商户状态 + */ + @ExcelProperty(value = "拉卡拉商户状态") + private String merchantStatus; + + /** + * 拉卡拉商户信息 + */ + @ExcelProperty(value = "拉卡拉商户信息") + private String merchantInfo; + + /** + * 订单数量 + */ + @ExcelProperty(value = "订单数量") + private Long orderNum; + + /** + * 订单总金额 + */ + @ExcelProperty(value = "订单总金额") + private BigDecimal orderTotal; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java new file mode 100644 index 0000000..0fc9e23 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java @@ -0,0 +1,94 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 用户对象导出VO + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +public class SysUserExportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户序号") + private Long userId; + + /** + * 用户账号 + */ + @ExcelProperty(value = "登录名称") + private String userName; + + /** + * 用户昵称 + */ + @ExcelProperty(value = "用户名称") + private String nickName; + + /** + * 用户邮箱 + */ + @ExcelProperty(value = "用户邮箱") + private String email; + + /** + * 手机号码 + */ + @ExcelProperty(value = "手机号码") + private String phonenumber; + + /** + * 用户性别 + */ + @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_user_sex") + private String sex; + + /** + * 帐号状态(0正常 1停用) + */ + @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_normal_disable") + private String status; + + /** + * 最后登录IP + */ + @ExcelProperty(value = "最后登录IP") + private String loginIp; + + /** + * 最后登录时间 + */ + @ExcelProperty(value = "最后登录时间") + private Date loginDate; + + /** + * 部门名称 + */ + @ExcelProperty(value = "部门名称") + private String deptName; + + /** + * 负责人 + */ + @ExcelProperty(value = "部门负责人") + private String leaderName; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java new file mode 100644 index 0000000..d0242d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java @@ -0,0 +1,76 @@ +package org.dromara.system.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 用户对象导入VO + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +// @Accessors(chain = true) // 导入不允许使用 会找不到set方法 +public class SysUserImportVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @ExcelProperty(value = "用户序号") + private Long userId; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门编号") + private Long deptId; + + /** + * 用户账号 + */ + @ExcelProperty(value = "登录名称") + private String userName; + + /** + * 用户昵称 + */ + @ExcelProperty(value = "用户名称") + private String nickName; + + /** + * 用户邮箱 + */ + @ExcelProperty(value = "用户邮箱") + private String email; + + /** + * 手机号码 + */ + @ExcelProperty(value = "手机号码") + private String phonenumber; + + /** + * 用户性别 + */ + @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_user_sex") + private String sex; + + /** + * 帐号状态(0正常 1停用) + */ + @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "sys_normal_disable") + private String status; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java new file mode 100644 index 0000000..e41355d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java @@ -0,0 +1,40 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +import java.util.List; + +/** + * 用户信息 + * + * @author Michelle.Chung + */ +@Data +public class SysUserInfoVo { + + /** + * 用户信息 + */ + private SysUserVo user; + + /** + * 角色ID列表 + */ + private List roleIds; + + /** + * 角色列表 + */ + private List roles; + + /** + * 岗位ID列表 + */ + private List postIds; + + /** + * 岗位列表 + */ + private List posts; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java new file mode 100644 index 0000000..cc9d88a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -0,0 +1,142 @@ +package org.dromara.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.sensitive.annotation.Sensitive; +import org.dromara.common.sensitive.core.SensitiveStrategy; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysUser; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 用户信息视图对象 sys_user + * + * @author Michelle.Chung + */ +@Data +@AutoMapper(target = SysUser.class) +public class SysUserVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户类型(sys_user系统用户 kf_user客服 cg_user采购 cw_user财务) + */ + private String userType; + + /** + * 用户邮箱 + */ + @Sensitive(strategy = SensitiveStrategy.EMAIL, perms = "system:user:edit") + private String email; + + /** + * 手机号码 + */ + @Sensitive(strategy = SensitiveStrategy.PHONE, perms = "system:user:edit") + private String phonenumber; + + /** + * 用户性别(0男 1女 2未知) + */ + private String sex; + + /** + * 头像地址 + */ + @Translation(type = TransConstant.OSS_ID_TO_URL) + private Long avatar; + + /** + * 密码 + */ + @JsonIgnore + @JsonProperty + private String password; + + /** + * 帐号状态(0正常 1停用) + */ + private String status; + + /** + * 最后登录IP + */ + private String loginIp; + + /** + * 最后登录时间 + */ + private Date loginDate; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 部门名 + */ + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId") + private String deptName; + + /** + * 角色对象 + */ + private List roles; + + /** + * 角色组 + */ + private Long[] roleIds; + + /** + * 岗位组 + */ + private Long[] postIds; + + /** + * 数据权限 当前角色ID + */ + private Long roleId; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java new file mode 100644 index 0000000..48fa92a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java @@ -0,0 +1,30 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +import java.util.Set; + +/** + * 登录用户信息 + * + * @author Michelle.Chung + */ +@Data +public class UserInfoVo { + + /** + * 用户基本信息 + */ + private SysUserVo user; + + /** + * 菜单权限 + */ + private Set permissions; + + /** + * 角色权限 + */ + private Set roles; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java new file mode 100644 index 0000000..993fb94 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java @@ -0,0 +1,127 @@ +package org.dromara.system.listener; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.crypto.digest.BCrypt; +import cn.hutool.http.HtmlUtil; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.excel.core.ExcelListener; +import org.dromara.common.excel.core.ExcelResult; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserImportVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.service.ISysConfigService; +import org.dromara.system.service.ISysUserService; + +import java.util.List; + +/** + * 系统用户自定义导入 + * + * @author Lion Li + */ +@Slf4j +public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { + + private final ISysUserService userService; + + private final String password; + + private final Boolean isUpdateSupport; + + private final Long operUserId; + + private int successNum = 0; + private int failureNum = 0; + private final StringBuilder successMsg = new StringBuilder(); + private final StringBuilder failureMsg = new StringBuilder(); + + public SysUserImportListener(Boolean isUpdateSupport) { + String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword"); + this.userService = SpringUtils.getBean(ISysUserService.class); + this.password = BCrypt.hashpw(initPassword); + this.isUpdateSupport = isUpdateSupport; + this.operUserId = LoginHelper.getUserId(); + } + + @Override + public void invoke(SysUserImportVo userVo, AnalysisContext context) { + SysUserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName()); + try { + // 验证是否存在这个用户 + if (ObjectUtil.isNull(sysUser)) { + SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); + ValidatorUtils.validate(user); + user.setPassword(password); + user.setCreateBy(operUserId); + userService.insertUser(user); + successNum++; + successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); + } else if (isUpdateSupport) { + Long userId = sysUser.getUserId(); + SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); + user.setUserId(userId); + ValidatorUtils.validate(user); + userService.checkUserAllowed(user.getUserId()); + userService.checkUserDataScope(user.getUserId()); + user.setUpdateBy(operUserId); + userService.updateUser(user); + successNum++; + successMsg.append("
").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功"); + } else { + failureNum++; + failureMsg.append("
").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在"); + } + } catch (Exception e) { + failureNum++; + String msg = "
" + failureNum + "、账号 " + HtmlUtil.cleanHtmlTag(userVo.getUserName()) + " 导入失败:"; + String message = e.getMessage(); + if (e instanceof ConstraintViolationException cvException) { + message = StreamUtils.join(cvException.getConstraintViolations(), ConstraintViolation::getMessage, ", "); + } + failureMsg.append(msg).append(message); + log.error(msg, e); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + + } + + @Override + public ExcelResult getExcelResult() { + return new ExcelResult<>() { + + @Override + public String getAnalysis() { + if (failureNum > 0) { + failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:"); + throw new ServiceException(failureMsg.toString()); + } else { + successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:"); + } + return successMsg.toString(); + } + + @Override + public List getList() { + return null; + } + + @Override + public List getErrorList() { + return null; + } + }; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java new file mode 100644 index 0000000..6a97191 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysClient; +import org.dromara.system.domain.vo.SysClientVo; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +public interface SysClientMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..0eaaee8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysConfig; +import org.dromara.system.domain.vo.SysConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java new file mode 100644 index 0000000..b69624c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -0,0 +1,78 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.vo.SysDeptVo; + +import java.util.List; + +/** + * 部门管理 数据层 + * + * @author Lion Li + */ +public interface SysDeptMapper extends BaseMapperPlus { + + /** + * 查询部门管理数据 + * + * @param queryWrapper 查询条件 + * @return 部门信息集合 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id") + }) + List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 分页查询部门管理数据 + * + * @param queryWrapper 查询条件 + * @return 部门信息集合 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + }) + Page selectPageDeptList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 统计指定部门ID的部门数量 + * + * @param deptId 部门ID + * @return 该部门ID的部门数量 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id") + }) + long countDeptById(Long deptId); + + /** + * 根据父部门ID查询其所有子部门的列表 + * + * @param parentId 父部门ID + * @return 包含子部门的列表 + */ + default List selectListByParentId(Long parentId) { + return this.selectList(new LambdaQueryWrapper() + .select(SysDept::getDeptId) + .apply(DataBaseHelper.findInSet(parentId, "ancestors"))); + } + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @param deptCheckStrictly 部门树选择项是否关联显示 + * @return 选中部门列表 + */ + List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java new file mode 100644 index 0000000..7298db3 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java @@ -0,0 +1,29 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysDictData; +import org.dromara.system.domain.vo.SysDictDataVo; + +import java.util.List; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictDataMapper extends BaseMapperPlus { + + /** + * 根据字典类型查询字典数据列表 + * + * @param dictType 字典类型 + * @return 符合条件的字典数据列表 + */ + default List selectDictDataByType(String dictType) { + return selectVoList( + new LambdaQueryWrapper() + .eq(SysDictData::getDictType, dictType) + .orderByAsc(SysDictData::getDictSort)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..ae15639 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysDictType; +import org.dromara.system.domain.vo.SysDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..85edd1d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysLogininfor; +import org.dromara.system.domain.vo.SysLogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +public interface SysLogininforMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java new file mode 100644 index 0000000..205413b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -0,0 +1,76 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysMenu; +import org.dromara.system.domain.vo.SysMenuVo; + +import java.util.List; + +/** + * 菜单表 数据层 + * + * @author Lion Li + */ +public interface SysMenuMapper extends BaseMapperPlus { + + /** + * 根据用户查询系统菜单列表 + * + * @param queryWrapper 查询条件 + * @return 菜单列表 + */ + List selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + List selectMenuPermsByUserId(Long userId); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + List selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询菜单 + * + * @return 菜单列表 + */ + default List selectMenuTreeAll() { + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU) + .eq(SysMenu::getStatus, SystemConstants.NORMAL) + .orderByAsc(SysMenu::getParentId) + .orderByAsc(SysMenu::getOrderNum); + return this.selectList(lqw); + } + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ + List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @param menuCheckStrictly 菜单树选择项是否关联显示 + * @return 选中菜单列表 + */ + List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..1e27b77 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysNotice; +import org.dromara.system.domain.vo.SysNoticeVo; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +public interface SysNoticeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..5d20404 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysOperLog; +import org.dromara.system.domain.vo.SysOperLogVo; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +public interface SysOperLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java new file mode 100644 index 0000000..f93d34d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysOssConfig; +import org.dromara.system.domain.vo.SysOssConfigVo; + +/** + * 对象存储配置Mapper接口 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +public interface SysOssConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java new file mode 100644 index 0000000..3da621d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java @@ -0,0 +1,13 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysOss; +import org.dromara.system.domain.vo.SysOssVo; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +public interface SysOssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java new file mode 100644 index 0000000..60da074 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -0,0 +1,43 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysPost; +import org.dromara.system.domain.vo.SysPostVo; + +import java.util.List; + +/** + * 岗位信息 数据层 + * + * @author Lion Li + */ +public interface SysPostMapper extends BaseMapperPlus { + + /** + * 分页查询岗位列表 + * + * @param page 分页对象 + * @param queryWrapper 查询条件 + * @return 包含岗位信息的分页结果 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "create_by") + }) + Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 查询用户所属岗位组 + * + * @param userId 用户ID + * @return 结果 + */ + List selectPostsByUserId(Long userId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java new file mode 100644 index 0000000..3de0bb6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java @@ -0,0 +1,13 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysRoleDept; + +/** + * 角色与部门关联表 数据层 + * + * @author Lion Li + */ +public interface SysRoleDeptMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java new file mode 100644 index 0000000..9cb1ea5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -0,0 +1,75 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.vo.SysRoleVo; + +import java.util.List; + +/** + * 角色表 数据层 + * + * @author Lion Li + */ +public interface SysRoleMapper extends BaseMapperPlus { + + /** + * 分页查询角色列表 + * + * @param page 分页对象 + * @param queryWrapper 查询条件 + * @return 包含角色信息的分页结果 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "r.create_by") + }) + Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据条件分页查询角色数据 + * + * @param queryWrapper 查询条件 + * @return 角色数据集合信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "r.create_by") + }) + List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据角色ID查询角色信息 + * + * @param roleId 角色ID + * @return 对应的角色信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "r.create_by") + }) + SysRoleVo selectRoleById(Long roleId); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + List selectRolePermissionByUserId(Long userId); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + List selectRolesByUserId(Long userId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java new file mode 100644 index 0000000..0a657b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java @@ -0,0 +1,13 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysRoleMenu; + +/** + * 角色与菜单关联表 数据层 + * + * @author Lion Li + */ +public interface SysRoleMenuMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java new file mode 100644 index 0000000..b942061 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysSocial; +import org.dromara.system.domain.vo.SysSocialVo; + +/** + * 社会化关系Mapper接口 + * + * @author thiszhc + */ +public interface SysSocialMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java new file mode 100644 index 0000000..e974c83 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.mapper; + +import com.github.yulichang.base.MPJBaseMapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.vo.SysTenantVo; + +/** + * 租户Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantMapper extends BaseMapperPlus, MPJBaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java new file mode 100644 index 0000000..10ca170 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysTenantPackage; +import org.dromara.system.domain.vo.SysTenantPackageVo; + +/** + * 租户套餐Mapper接口 + * + * @author Michelle.Chung + */ +public interface SysTenantPackageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java new file mode 100644 index 0000000..46695aa --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -0,0 +1,123 @@ +package org.dromara.system.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysUserExportVo; +import org.dromara.system.domain.vo.SysUserVo; + +import java.util.List; + +/** + * 用户表 数据层 + * + * @author Lion Li + */ +public interface SysUserMapper extends BaseMapperPlus { + + /** + * 分页查询用户列表,并进行数据权限控制 + * + * @param page 分页参数 + * @param queryWrapper 查询条件 + * @return 分页的用户信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "u.dept_id"), + @DataColumn(key = "userName", value = "u.user_id") + }) + Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 查询用户列表,并进行数据权限控制 + * + * @param queryWrapper 查询条件 + * @return 用户信息集合 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") + }) + List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据条件分页查询用户列表 + * + * @param queryWrapper 查询条件 + * @return 用户信息集合信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "u.user_id") + }) + List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据条件分页查询已配用户角色列表 + * + * @param queryWrapper 查询条件 + * @return 用户信息集合信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "u.user_id") + }) + Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param queryWrapper 查询条件 + * @return 用户信息集合信息 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "d.dept_id"), + @DataColumn(key = "userName", value = "u.user_id") + }) + Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 根据用户ID统计用户数量 + * + * @param userId 用户ID + * @return 用户数量 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") + }) + long countUserById(Long userId); + + /** + * 根据条件更新用户数据 + * + * @param user 要更新的用户实体 + * @param updateWrapper 更新条件封装器 + * @return 更新操作影响的行数 + */ + @Override + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") + }) + int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper updateWrapper); + + /** + * 根据用户ID更新用户数据 + * + * @param user 要更新的用户实体 + * @return 更新操作影响的行数 + */ + @Override + @DataPermission({ + @DataColumn(key = "deptName", value = "dept_id"), + @DataColumn(key = "userName", value = "user_id") + }) + int updateById(@Param(Constants.ENTITY) SysUser user); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java new file mode 100644 index 0000000..07c1371 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java @@ -0,0 +1,13 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysUserPost; + +/** + * 用户与岗位关联表 数据层 + * + * @author Lion Li + */ +public interface SysUserPostMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..8340348 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java @@ -0,0 +1,23 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.SysUserRole; + +import java.util.List; + +/** + * 用户与角色关联表 数据层 + * + * @author Lion Li + */ +public interface SysUserRoleMapper extends BaseMapperPlus { + + /** + * 根据角色ID查询关联的用户ID列表 + * + * @param roleId 角色ID + * @return 关联到指定角色的用户ID列表 + */ + List selectUserIdsByRoleId(Long roleId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java new file mode 100644 index 0000000..90482ac --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java @@ -0,0 +1,28 @@ +package org.dromara.system.runner; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.system.service.ISysOssConfigService; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +/** + * 初始化 system 模块对应业务数据 + * + * @author Lion Li + */ +@Slf4j +@RequiredArgsConstructor +@Component +public class SystemApplicationRunner implements ApplicationRunner { + + private final ISysOssConfigService ossConfigService; + + @Override + public void run(ApplicationArguments args) throws Exception { + ossConfigService.init(); + log.info("初始化OSS配置成功"); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java new file mode 100644 index 0000000..d888009 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java @@ -0,0 +1,59 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysClientBo; +import org.dromara.system.domain.vo.SysClientVo; + +import java.util.Collection; +import java.util.List; + +/** + * 客户端管理Service接口 + * + * @author Michelle.Chung + * @date 2023-06-18 + */ +public interface ISysClientService { + + /** + * 查询客户端管理 + */ + SysClientVo queryById(Long id); + + /** + * 查询客户端信息基于客户端id + */ + SysClientVo queryByClientId(String clientId); + + /** + * 查询客户端管理列表 + */ + TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery); + + /** + * 查询客户端管理列表 + */ + List queryList(SysClientBo bo); + + /** + * 新增客户端管理 + */ + Boolean insertByBo(SysClientBo bo); + + /** + * 修改客户端管理 + */ + Boolean updateByBo(SysClientBo bo); + + /** + * 修改状态 + */ + int updateClientStatus(String clientId, String status); + + /** + * 校验并批量删除客户端管理信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java new file mode 100644 index 0000000..f7efda7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java @@ -0,0 +1,87 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysConfigBo; +import org.dromara.system.domain.vo.SysConfigVo; + +import java.util.List; + +/** + * 参数配置 服务层 + * + * @author Lion Li + */ +public interface ISysConfigService { + + + TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery); + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + SysConfigVo selectConfigById(Long configId); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数键值 + */ + String selectConfigByKey(String configKey); + + /** + * 获取注册开关 + * @param tenantId 租户id + * @return true开启,false关闭 + */ + boolean selectRegisterEnabled(String tenantId); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + List selectConfigList(SysConfigBo config); + + /** + * 新增参数配置 + * + * @param bo 参数配置信息 + * @return 结果 + */ + String insertConfig(SysConfigBo bo); + + /** + * 修改参数配置 + * + * @param bo 参数配置信息 + * @return 结果 + */ + String updateConfig(SysConfigBo bo); + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + void deleteConfigByIds(Long[] configIds); + + /** + * 重置参数缓存数据 + */ + void resetConfigCache(); + + /** + * 校验参数键名是否唯一 + * + * @param config 参数信息 + * @return 结果 + */ + boolean checkConfigKeyUnique(SysConfigBo config); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java new file mode 100644 index 0000000..3f252f7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java @@ -0,0 +1,26 @@ +package org.dromara.system.service; + +/** + * 通用 数据权限 服务 + * + * @author Lion Li + */ +public interface ISysDataScopeService { + + /** + * 获取角色自定义权限 + * + * @param roleId 角色id + * @return 部门id组 + */ + String getRoleCustom(Long roleId); + + /** + * 获取部门及以下权限 + * + * @param deptId 部门id + * @return 部门id组 + */ + String getDeptAndChild(Long deptId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java new file mode 100644 index 0000000..bf16642 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -0,0 +1,125 @@ +package org.dromara.system.service; + +import cn.hutool.core.lang.tree.Tree; +import org.dromara.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.vo.SysDeptVo; + +import java.util.List; + +/** + * 部门管理 服务层 + * + * @author Lion Li + */ +public interface ISysDeptService { + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + List selectDeptList(SysDeptBo dept); + + /** + * 查询部门树结构信息 + * + * @param dept 部门信息 + * @return 部门树信息集合 + */ + List> selectDeptTreeList(SysDeptBo dept); + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + List> buildDeptTreeSelect(List depts); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + List selectDeptListByRoleId(Long roleId); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + SysDeptVo selectDeptById(Long deptId); + + /** + * 通过部门ID串查询部门 + * + * @param deptIds 部门id串 + * @return 部门列表信息 + */ + List selectDeptByIds(List deptIds); + + /** + * 根据ID查询所有子部门数(正常状态) + * + * @param deptId 部门ID + * @return 子部门数 + */ + long selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在部门子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + boolean hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + boolean checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + boolean checkDeptNameUnique(SysDeptBo dept); + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + void checkDeptDataScope(Long deptId); + + /** + * 新增保存部门信息 + * + * @param bo 部门信息 + * @return 结果 + */ + int insertDept(SysDeptBo bo); + + /** + * 修改保存部门信息 + * + * @param bo 部门信息 + * @return 结果 + */ + int updateDept(SysDeptBo bo); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + int deleteDeptById(Long deptId); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java new file mode 100644 index 0000000..7eddf80 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java @@ -0,0 +1,75 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysDictDataBo; +import org.dromara.system.domain.vo.SysDictDataVo; + +import java.util.List; + +/** + * 字典 业务层 + * + * @author Lion Li + */ +public interface ISysDictDataService { + + + TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); + + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + List selectDictDataList(SysDictDataBo dictData); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + String selectDictLabel(String dictType, String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + SysDictDataVo selectDictDataById(Long dictCode); + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + void deleteDictDataByIds(Long[] dictCodes); + + /** + * 新增保存字典数据信息 + * + * @param bo 字典数据信息 + * @return 结果 + */ + List insertDictData(SysDictDataBo bo); + + /** + * 修改保存字典数据信息 + * + * @param bo 字典数据信息 + * @return 结果 + */ + List updateDictData(SysDictDataBo bo); + + /** + * 校验字典键值是否唯一 + * + * @param dict 字典数据 + * @return 结果 + */ + boolean checkDictDataUnique(SysDictDataBo dict); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java new file mode 100644 index 0000000..3b32d6c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java @@ -0,0 +1,95 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysDictTypeBo; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.domain.vo.SysDictTypeVo; + +import java.util.List; + +/** + * 字典 业务层 + * + * @author Lion Li + */ +public interface ISysDictTypeService { + + + TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); + + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + List selectDictTypeList(SysDictTypeBo dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + List selectDictTypeAll(); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + List selectDictDataByType(String dictType); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + SysDictTypeVo selectDictTypeById(Long dictId); + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + SysDictTypeVo selectDictTypeByType(String dictType); + + /** + * 批量删除字典信息 + * + * @param dictIds 需要删除的字典ID + */ + void deleteDictTypeByIds(Long[] dictIds); + + /** + * 重置字典缓存数据 + */ + void resetDictCache(); + + /** + * 新增保存字典类型信息 + * + * @param bo 字典类型信息 + * @return 结果 + */ + List insertDictType(SysDictTypeBo bo); + + /** + * 修改保存字典类型信息 + * + * @param bo 字典类型信息 + * @return 结果 + */ + List updateDictType(SysDictTypeBo bo); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + boolean checkDictTypeUnique(SysDictTypeBo dictType); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java new file mode 100644 index 0000000..6b3b7a6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java @@ -0,0 +1,47 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysLogininforBo; +import org.dromara.system.domain.vo.SysLogininforVo; + +import java.util.List; + +/** + * 系统访问日志情况信息 服务层 + * + * @author Lion Li + */ +public interface ISysLogininforService { + + + TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery); + + /** + * 新增系统登录日志 + * + * @param bo 访问日志对象 + */ + void insertLogininfor(SysLogininforBo bo); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + List selectLogininforList(SysLogininforBo logininfor); + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + int deleteLogininforByIds(Long[] infoIds); + + /** + * 清空系统登录日志 + */ + void cleanLogininfor(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java new file mode 100644 index 0000000..72d705e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java @@ -0,0 +1,147 @@ +package org.dromara.system.service; + +import cn.hutool.core.lang.tree.Tree; +import org.dromara.system.domain.SysMenu; +import org.dromara.system.domain.bo.SysMenuBo; +import org.dromara.system.domain.vo.RouterVo; +import org.dromara.system.domain.vo.SysMenuVo; + +import java.util.List; +import java.util.Set; + +/** + * 菜单 业务层 + * + * @author Lion Li + */ +public interface ISysMenuService { + + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + List selectMenuList(Long userId); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @param userId 用户ID + * @return 菜单列表 + */ + List selectMenuList(SysMenuBo menu, Long userId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + Set selectMenuPermsByUserId(Long userId); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + Set selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询菜单树信息 + * + * @param userId 用户ID + * @return 菜单列表 + */ + List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + List selectMenuListByRoleId(Long roleId); + + /** + * 根据租户套餐ID查询菜单树信息 + * + * @param packageId 租户套餐ID + * @return 选中菜单列表 + */ + List selectMenuListByPackageId(Long packageId); + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + List buildMenus(List menus); + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + List> buildMenuTreeSelect(List menus); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + SysMenuVo selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + boolean hasChildByMenuId(Long menuId); + + /** + * 查询菜单是否存在角色 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + boolean checkMenuExistRole(Long menuId); + + /** + * 新增保存菜单信息 + * + * @param bo 菜单信息 + * @return 结果 + */ + int insertMenu(SysMenuBo bo); + + /** + * 修改保存菜单信息 + * + * @param bo 菜单信息 + * @return 结果 + */ + int updateMenu(SysMenuBo bo); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + boolean checkMenuNameUnique(SysMenuBo menu); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java new file mode 100644 index 0000000..8ec999d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java @@ -0,0 +1,67 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysNoticeBo; +import org.dromara.system.domain.vo.SysNoticeVo; + +import java.util.List; + +/** + * 公告 服务层 + * + * @author Lion Li + */ +public interface ISysNoticeService { + + + TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); + + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + SysNoticeVo selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + List selectNoticeList(SysNoticeBo notice); + + /** + * 新增公告 + * + * @param bo 公告信息 + * @return 结果 + */ + int insertNotice(SysNoticeBo bo); + + /** + * 修改公告 + * + * @param bo 公告信息 + * @return 结果 + */ + int updateNotice(SysNoticeBo bo); + + /** + * 删除公告信息 + * + * @param noticeId 公告ID + * @return 结果 + */ + int deleteNoticeById(Long noticeId); + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + int deleteNoticeByIds(Long[] noticeIds); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java new file mode 100644 index 0000000..9573510 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java @@ -0,0 +1,54 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysOperLogBo; +import org.dromara.system.domain.vo.SysOperLogVo; + +import java.util.List; + +/** + * 操作日志 服务层 + * + * @author Lion Li + */ +public interface ISysOperLogService { + + TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); + + /** + * 新增操作日志 + * + * @param bo 操作日志对象 + */ + void insertOperlog(SysOperLogBo bo); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + List selectOperLogList(SysOperLogBo operLog); + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + int deleteOperLogByIds(Long[] operIds); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + SysOperLogVo selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + void cleanOperLog(); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java new file mode 100644 index 0000000..2f6dfc9 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java @@ -0,0 +1,64 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysOssConfigBo; +import org.dromara.system.domain.vo.SysOssConfigVo; + +import java.util.Collection; + +/** + * 对象存储配置Service接口 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +public interface ISysOssConfigService { + + /** + * 初始化OSS配置 + */ + void init(); + + /** + * 查询单个 + */ + SysOssConfigVo queryById(Long ossConfigId); + + /** + * 查询列表 + */ + TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery); + + /** + * 根据新增业务对象插入对象存储配置 + * + * @param bo 对象存储配置新增业务对象 + * @return 结果 + */ + Boolean insertByBo(SysOssConfigBo bo); + + /** + * 根据编辑业务对象修改对象存储配置 + * + * @param bo 对象存储配置编辑业务对象 + * @return 结果 + */ + Boolean updateByBo(SysOssConfigBo bo); + + /** + * 校验并删除数据 + * + * @param ids 主键集合 + * @param isValid 是否校验,true-删除前校验,false-不校验 + * @return 结果 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 启用停用状态 + */ + int updateOssConfigStatus(SysOssConfigBo bo); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java new file mode 100644 index 0000000..cd4fab4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -0,0 +1,80 @@ +package org.dromara.system.service; + +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysOssBo; +import org.dromara.system.domain.vo.SysOssVo; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +/** + * 文件上传 服务层 + * + * @author Lion Li + */ +public interface ISysOssService { + + /** + * 查询OSS对象存储列表 + * + * @param sysOss OSS对象存储分页查询对象 + * @param pageQuery 分页查询实体类 + * @return 结果 + */ + TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); + + /** + * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * + * @param ossIds 一组文件在数据库中的唯一标识集合 + * @return 包含 SysOssVo 对象的列表 + */ + List listByIds(Collection ossIds); + + /** + * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * + * @param ossId 文件在数据库中的唯一标识 + * @return SysOssVo 对象,包含文件信息 + */ + SysOssVo getById(Long ossId); + + /** + * 上传 MultipartFile 到对象存储服务,并保存文件信息到数据库 + * + * @param file 要上传的 MultipartFile 对象 + * @return 上传成功后的 SysOssVo 对象,包含文件信息 + */ + SysOssVo upload(MultipartFile file); + + /** + * 上传文件到对象存储服务,并保存文件信息到数据库 + * + * @param file 要上传的文件对象 + * @return 上传成功后的 SysOssVo 对象,包含文件信息 + */ + SysOssVo upload(File file); + + /** + * 文件下载方法,支持一次性下载完整文件 + * + * @param ossId OSS对象ID + * @param response HttpServletResponse对象,用于设置响应头和向客户端发送文件内容 + */ + void download(Long ossId, HttpServletResponse response) throws IOException; + + /** + * 删除OSS对象存储 + * + * @param ids OSS对象ID串 + * @param isValid 判断是否需要校验 + * @return 结果 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java new file mode 100644 index 0000000..0116df5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java @@ -0,0 +1,28 @@ +package org.dromara.system.service; + +import java.util.Set; + +/** + * 用户权限处理 + * + * @author Lion Li + */ +public interface ISysPermissionService { + + /** + * 获取角色数据权限 + * + * @param userId 用户id + * @return 角色权限信息 + */ + Set getRolePermission(Long userId); + + /** + * 获取菜单数据权限 + * + * @param userId 用户id + * @return 菜单权限信息 + */ + Set getMenuPermission(Long userId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java new file mode 100644 index 0000000..a760d49 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -0,0 +1,130 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysPostBo; +import org.dromara.system.domain.vo.SysPostVo; + +import java.util.List; + +/** + * 岗位信息 服务层 + * + * @author Lion Li + */ +public interface ISysPostService { + + + TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery); + + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位列表 + */ + List selectPostList(SysPostBo post); + + /** + * 查询用户所属岗位组 + * + * @param userId 用户ID + * @return 岗位ID + */ + List selectPostsByUserId(Long userId); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + List selectPostAll(); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + SysPostVo selectPostById(Long postId); + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + List selectPostListByUserId(Long userId); + + /** + * 通过岗位ID串查询岗位 + * + * @param postIds 岗位id串 + * @return 岗位列表信息 + */ + List selectPostByIds(List postIds); + + /** + * 校验岗位名称 + * + * @param post 岗位信息 + * @return 结果 + */ + boolean checkPostNameUnique(SysPostBo post); + + /** + * 校验岗位编码 + * + * @param post 岗位信息 + * @return 结果 + */ + boolean checkPostCodeUnique(SysPostBo post); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + long countUserPostById(Long postId); + + /** + * 通过部门ID查询岗位使用数量 + * + * @param deptId 部门id + * @return 结果 + */ + long countPostByDeptId(Long deptId); + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + int deletePostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + int deletePostByIds(Long[] postIds); + + /** + * 新增保存岗位信息 + * + * @param bo 岗位信息 + * @return 结果 + */ + int insertPost(SysPostBo bo); + + /** + * 修改保存岗位信息 + * + * @param bo 岗位信息 + * @return 结果 + */ + int updatePost(SysPostBo bo); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java new file mode 100644 index 0000000..cec4bf7 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -0,0 +1,202 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.bo.SysRoleBo; +import org.dromara.system.domain.vo.SysRoleVo; + +import java.util.List; +import java.util.Set; + +/** + * 角色业务层 + * + * @author Lion Li + */ +public interface ISysRoleService { + + + TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery); + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + List selectRoleList(SysRoleBo role); + + /** + * 根据用户ID查询角色列表 + * + * @param userId 用户ID + * @return 角色列表 + */ + List selectRolesByUserId(Long userId); + + /** + * 根据用户ID查询角色列表(包含被授权状态) + * + * @param userId 用户ID + * @return 角色列表 + */ + List selectRolesAuthByUserId(Long userId); + + /** + * 根据用户ID查询角色权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + Set selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + SysRoleVo selectRoleById(Long roleId); + + /** + * 通过角色ID串查询角色 + * + * @param roleIds 角色ID串 + * @return 角色列表信息 + */ + List selectRoleByIds(List roleIds); + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + boolean checkRoleNameUnique(SysRoleBo role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + boolean checkRoleKeyUnique(SysRoleBo role); + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + void checkRoleAllowed(SysRoleBo role); + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + void checkRoleDataScope(Long roleId); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + long countUserRoleByRoleId(Long roleId); + + /** + * 新增保存角色信息 + * + * @param bo 角色信息 + * @return 结果 + */ + int insertRole(SysRoleBo bo); + + /** + * 修改保存角色信息 + * + * @param bo 角色信息 + * @return 结果 + */ + int updateRole(SysRoleBo bo); + + /** + * 修改角色状态 + * + * @param roleId 角色ID + * @param status 角色状态 + * @return 结果 + */ + int updateRoleStatus(Long roleId, String status); + + /** + * 修改数据权限信息 + * + * @param bo 角色信息 + * @return 结果 + */ + int authDataScope(SysRoleBo bo); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + int deleteRoleByIds(Long[] roleIds); + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + int deleteAuthUser(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + int deleteAuthUsers(Long roleId, Long[] userIds); + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + int insertAuthUsers(Long roleId, Long[] userIds); + + void cleanOnlineUserByRole(Long roleId); + + void cleanOnlineUser(List userIds); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java new file mode 100644 index 0000000..cc7016e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java @@ -0,0 +1,53 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.bo.SysSocialBo; +import org.dromara.system.domain.vo.SysSocialVo; + +import java.util.List; + +/** + * 社会化关系Service接口 + * + * @author thiszhc + */ +public interface ISysSocialService { + + + /** + * 查询社会化关系 + */ + SysSocialVo queryById(String id); + + /** + * 查询社会化关系列表 + */ + List queryList(SysSocialBo bo); + + /** + * 查询社会化关系列表 + */ + List queryListByUserId(Long userId); + + /** + * 新增授权关系 + */ + Boolean insertByBo(SysSocialBo bo); + + /** + * 更新社会化关系 + */ + Boolean updateByBo(SysSocialBo bo); + + /** + * 删除社会化关系信息 + */ + Boolean deleteWithValidById(Long id); + + + /** + * 根据 authId 查询 + */ + List selectByAuthId(String authId); + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java new file mode 100644 index 0000000..d060b68 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java @@ -0,0 +1,62 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysTenantPackageBo; +import org.dromara.system.domain.vo.SysTenantPackageVo; + +import java.util.Collection; +import java.util.List; + +/** + * 租户套餐Service接口 + * + * @author Michelle.Chung + */ +public interface ISysTenantPackageService { + + /** + * 查询租户套餐 + */ + SysTenantPackageVo queryById(Long packageId); + + /** + * 查询租户套餐列表 + */ + TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery); + + /** + * 查询租户套餐已启用列表 + */ + List selectList(); + + /** + * 查询租户套餐列表 + */ + List queryList(SysTenantPackageBo bo); + + /** + * 新增租户套餐 + */ + Boolean insertByBo(SysTenantPackageBo bo); + + /** + * 修改租户套餐 + */ + Boolean updateByBo(SysTenantPackageBo bo); + + /** + * 校验套餐名称是否唯一 + */ + boolean checkPackageNameUnique(SysTenantPackageBo bo); + + /** + * 修改套餐状态 + */ + int updatePackageStatus(SysTenantPackageBo bo); + + /** + * 校验并批量删除租户套餐信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java new file mode 100644 index 0000000..88953b4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java @@ -0,0 +1,118 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantSumVo; +import org.dromara.system.domain.vo.SysTenantVo; + +import java.util.Collection; +import java.util.List; + +/** + * 租户Service接口 + * + * @author Michelle.Chung + */ +public interface ISysTenantService { + + /** + * 查询租户 + */ + SysTenantVo queryById(Long id); + + /** + * 基于租户ID查询租户 + */ + SysTenantVo queryByTenantId(String tenantId); + + /** + * 基于租户编码查询租户 + */ + SysTenantVo queryByTenantCode(String tenantCode); + + /** + * 基于租户编码查询租户 + */ + SysTenant queryByCode(String tenantCode); + + /** + * 查询租户列表 + */ + TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery); + + /** + * 查询租户列表 + */ + List queryList(SysTenantBo bo); + + /** + * 新增租户 + */ + Boolean insertByBo(SysTenantBo bo); + + /** + * 修改租户 + */ + Boolean updateByBo(SysTenantBo bo); + + /** + * 修改租户状态 + */ + int updateTenantStatus(SysTenantBo bo); + + /** + * 校验租户是否允许操作 + */ + void checkTenantAllowed(String tenantId); + + /** + * 校验并批量删除租户信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 校验企业名称是否唯一 + */ + boolean checkCompanyNameUnique(SysTenantBo bo); + + /** + * 校验账号余额 + */ + boolean checkAccountBalance(String tenantId); + + /** + * 校验有效期 + */ + boolean checkExpireTime(String tenantId); + + /** + * 同步租户套餐 + */ + Boolean syncTenantPackage(String tenantId, Long packageId); + + /** + * 同步租户字典 + */ + void syncTenantDict(); + + /** + * 根据tenantId获取租户信息 + * @param tenantId + * @return + */ + SysTenantVo getTenantById(String tenantId); + + /** + * 根据tenantId获取租户信息 + * @param tenantId + * @return + */ + SysTenant getTenantByTenantId(String tenantId); + + /** + * 查询租户统计信息 + */ + SysTenantSumVo querySum(SysTenantBo bo); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java new file mode 100644 index 0000000..fbc1c09 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -0,0 +1,223 @@ +package org.dromara.system.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysUserExportVo; +import org.dromara.system.domain.vo.SysUserVo; + +import java.util.List; + +/** + * 用户 业务层 + * + * @author Lion Li + */ +public interface ISysUserService { + + + TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery); + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + List selectUserExportList(SysUserBo user); + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + SysUserVo selectUserByUserName(String userName); + + /** + * 通过手机号查询用户 + * + * @param phonenumber 手机号 + * @return 用户对象信息 + */ + SysUserVo selectUserByPhonenumber(String phonenumber); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + SysUserVo selectUserById(Long userId); + + /** + * 通过用户ID串查询用户 + * + * @param userIds 用户ID串 + * @param deptId 部门id + * @return 用户列表信息 + */ + List selectUserByIds(List userIds, Long deptId); + + /** + * 根据用户ID查询用户所属角色组 + * + * @param userId 用户ID + * @return 结果 + */ + String selectUserRoleGroup(Long userId); + + /** + * 根据用户ID查询用户所属岗位组 + * + * @param userId 用户ID + * @return 结果 + */ + String selectUserPostGroup(Long userId); + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + boolean checkUserNameUnique(SysUserBo user); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + boolean checkPhoneUnique(SysUserBo user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + boolean checkEmailUnique(SysUserBo user); + + /** + * 校验用户是否允许操作 + * + * @param userId 用户ID + */ + void checkUserAllowed(Long userId); + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + void checkUserDataScope(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + int insertUser(SysUserBo user); + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + boolean registerUser(SysUserBo user, String tenantId); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + int updateUser(SysUserBo user); + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + void insertUserAuth(Long userId, Long[] roleIds); + + /** + * 修改用户状态 + * + * @param userId 用户ID + * @param status 帐号状态 + * @return 结果 + */ + int updateUserStatus(Long userId, String status); + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + int updateUserProfile(SysUserBo user); + + /** + * 修改用户头像 + * + * @param userId 用户ID + * @param avatar 头像地址 + * @return 结果 + */ + boolean updateUserAvatar(Long userId, Long avatar); + + /** + * 重置用户密码 + * + * @param userId 用户ID + * @param password 密码 + * @return 结果 + */ + int resetUserPwd(Long userId, String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + int deleteUserByIds(Long[] userIds); + + /** + * 通过部门id查询当前部门所有用户 + * + * @param deptId 部门id + * @return 结果 + */ + List selectUserListByDept(Long deptId); + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java new file mode 100644 index 0000000..4f6e676 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -0,0 +1,151 @@ +package org.dromara.system.service.impl; + +import cn.hutool.crypto.SecureUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysClient; +import org.dromara.system.domain.bo.SysClientBo; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.mapper.SysClientMapper; +import org.dromara.system.service.ISysClientService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 客户端管理Service业务层处理 + * + * @author Michelle.Chung + * @date 2023-06-18 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SysClientServiceImpl implements ISysClientService { + + private final SysClientMapper baseMapper; + + /** + * 查询客户端管理 + */ + @Override + public SysClientVo queryById(Long id) { + SysClientVo vo = baseMapper.selectVoById(id); + vo.setGrantTypeList(List.of(vo.getGrantType().split(","))); + return vo; + } + + + /** + * 查询客户端管理 + */ + @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") + @Override + public SysClientVo queryByClientId(String clientId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysClient::getClientId, clientId)); + } + + /** + * 查询客户端管理列表 + */ + @Override + public TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(r -> r.setGrantTypeList(List.of(r.getGrantType().split(",")))); + return TableDataInfo.build(result); + } + + /** + * 查询客户端管理列表 + */ + @Override + public List queryList(SysClientBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysClientBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysClient::getClientId, bo.getClientId()); + lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysClient::getClientKey, bo.getClientKey()); + lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysClient::getClientSecret, bo.getClientSecret()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysClient::getStatus, bo.getStatus()); + lqw.orderByAsc(SysClient::getId); + return lqw; + } + + /** + * 新增客户端管理 + */ + @Override + public Boolean insertByBo(SysClientBo bo) { + SysClient add = MapstructUtils.convert(bo, SysClient.class); + validEntityBeforeSave(add); + add.setGrantType(String.join(",", bo.getGrantTypeList())); + // 生成clientid + String clientKey = bo.getClientKey(); + String clientSecret = bo.getClientSecret(); + add.setClientId(SecureUtil.md5(clientKey + clientSecret)); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改客户端管理 + */ + @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#bo.clientId") + @Override + public Boolean updateByBo(SysClientBo bo) { + SysClient update = MapstructUtils.convert(bo, SysClient.class); + validEntityBeforeSave(update); + update.setGrantType(String.join(",", bo.getGrantTypeList())); + return baseMapper.updateById(update) > 0; + } + + /** + * 修改状态 + */ + @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") + @Override + public int updateClientStatus(String clientId, String status) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysClient::getStatus, status) + .eq(SysClient::getClientId, clientId)); + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysClient entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除客户端管理 + */ + @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true) + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..3a564da --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,217 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.ConfigService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.SysConfig; +import org.dromara.system.domain.bo.SysConfigBo; +import org.dromara.system.domain.vo.SysConfigVo; +import org.dromara.system.mapper.SysConfigMapper; +import org.dromara.system.service.ISysConfigService; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 参数配置 服务层实现 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysConfigServiceImpl implements ISysConfigService, ConfigService { + + private final SysConfigMapper baseMapper; + + @Override + public TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + @Override + @DS("master") + public SysConfigVo selectConfigById(Long configId) { + return baseMapper.selectVoById(configId); + } + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数key + * @return 参数键值 + */ + @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") + @Override + public String selectConfigByKey(String configKey) { + SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysConfig::getConfigKey, configKey)); + return ObjectUtils.notNullGetter(retConfig, SysConfig::getConfigValue, StringUtils.EMPTY); + } + + /** + * 获取注册开关 + * @param tenantId 租户id + * @return true开启,false关闭 + */ + @Override + public boolean selectRegisterEnabled(String tenantId) { + SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> { + return baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysConfig::getConfigKey, "sys.account.registerUser")); + }); + if (ObjectUtil.isNull(retConfig)) { + return false; + } + return Convert.toBool(retConfig.getConfigValue()); + } + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + @Override + public List selectConfigList(SysConfigBo config) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysConfigBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysConfig::getConfigName, bo.getConfigName()); + lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysConfig::getConfigType, bo.getConfigType()); + lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(SysConfig::getConfigId); + return lqw; + } + + /** + * 新增参数配置 + * + * @param bo 参数配置信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") + @Override + public String insertConfig(SysConfigBo bo) { + SysConfig config = MapstructUtils.convert(bo, SysConfig.class); + int row = baseMapper.insert(config); + if (row > 0) { + return config.getConfigValue(); + } + throw new ServiceException("操作失败"); + } + + /** + * 修改参数配置 + * + * @param bo 参数配置信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") + @Override + public String updateConfig(SysConfigBo bo) { + int row = 0; + SysConfig config = MapstructUtils.convert(bo, SysConfig.class); + if (config.getConfigId() != null) { + SysConfig temp = baseMapper.selectById(config.getConfigId()); + if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { + CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey()); + } + row = baseMapper.updateById(config); + } else { + CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); + row = baseMapper.update(config, new LambdaQueryWrapper() + .eq(SysConfig::getConfigKey, config.getConfigKey())); + } + if (row > 0) { + return config.getConfigValue(); + } + throw new ServiceException("操作失败"); + } + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + @Override + public void deleteConfigByIds(Long[] configIds) { + for (Long configId : configIds) { + SysConfig config = baseMapper.selectById(configId); + if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) { + throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); + } + CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); + } + baseMapper.deleteByIds(Arrays.asList(configIds)); + } + + /** + * 重置参数缓存数据 + */ + @Override + public void resetConfigCache() { + CacheUtils.clear(CacheNames.SYS_CONFIG); + } + + /** + * 校验参数键名是否唯一 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public boolean checkConfigKeyUnique(SysConfigBo config) { + long configId = ObjectUtils.notNull(config.getConfigId(), -1L); + SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey())); + if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { + return false; + } + return true; + } + + /** + * 根据参数 key 获取参数值 + * + * @param configKey 参数 key + * @return 参数值 + */ + @Override + public String getConfigValue(String configKey) { + return SpringUtils.getAopProxy(this).selectConfigByKey(configKey); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java new file mode 100644 index 0000000..12a5072 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java @@ -0,0 +1,78 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.SysRoleDept; +import org.dromara.system.mapper.SysDeptMapper; +import org.dromara.system.mapper.SysRoleDeptMapper; +import org.dromara.system.service.ISysDataScopeService; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 数据权限 实现 + *

+ * 注意: 此Service内不允许调用标注`数据权限`注解的方法 + * 例如: deptMapper.selectList 此 selectList 方法标注了`数据权限`注解 会出现循环解析的问题 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service("sdss") +public class SysDataScopeServiceImpl implements ISysDataScopeService { + + private final SysRoleDeptMapper roleDeptMapper; + private final SysDeptMapper deptMapper; + + /** + * 获取角色自定义权限 + * + * @param roleId 角色Id + * @return 部门Id组 + */ + @Cacheable(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId", condition = "#roleId != null") + @Override + public String getRoleCustom(Long roleId) { + if (ObjectUtil.isNull(roleId)) { + return "-1"; + } + List list = roleDeptMapper.selectList( + new LambdaQueryWrapper() + .select(SysRoleDept::getDeptId) + .eq(SysRoleDept::getRoleId, roleId)); + if (CollUtil.isNotEmpty(list)) { + return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); + } + return "-1"; + } + + /** + * 获取部门及以下权限 + * + * @param deptId 部门Id + * @return 部门Id组 + */ + @Cacheable(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId", condition = "#deptId != null") + @Override + public String getDeptAndChild(Long deptId) { + if (ObjectUtil.isNull(deptId)) { + return "-1"; + } + List deptList = deptMapper.selectListByParentId(deptId); + List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + ids.add(deptId); + if (CollUtil.isNotEmpty(ids)) { + return StreamUtils.join(ids, Convert::toStr); + } + return "-1"; + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java new file mode 100644 index 0000000..ecd309f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -0,0 +1,388 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.dto.DeptDTO; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.DeptService; +import org.dromara.common.core.utils.*; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.bo.SysDeptBo; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.mapper.SysDeptMapper; +import org.dromara.system.mapper.SysRoleMapper; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.service.ISysDeptService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.cache.annotation.Caching; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * 部门管理 服务实现 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysDeptServiceImpl implements ISysDeptService, DeptService { + + private final SysDeptMapper baseMapper; + private final SysRoleMapper roleMapper; + private final SysUserMapper userMapper; + + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @Override + public List selectDeptList(SysDeptBo dept) { + LambdaQueryWrapper lqw = buildQueryWrapper(dept); + return baseMapper.selectDeptList(lqw); + } + + /** + * 查询部门树结构信息 + * + * @param bo 部门信息 + * @return 部门树信息集合 + */ + @Override + public List> selectDeptTreeList(SysDeptBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List depts = baseMapper.selectDeptList(lqw); + return buildDeptTreeSelect(depts); + } + + private LambdaQueryWrapper buildQueryWrapper(SysDeptBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysDept::getDelFlag, SystemConstants.NORMAL); + lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); + lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId()); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); + lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); + lqw.orderByAsc(SysDept::getAncestors); + lqw.orderByAsc(SysDept::getParentId); + lqw.orderByAsc(SysDept::getOrderNum); + lqw.orderByAsc(SysDept::getDeptId); + return lqw; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + @Override + public List> buildDeptTreeSelect(List depts) { + if (CollUtil.isEmpty(depts)) { + return CollUtil.newArrayList(); + } + // 获取当前列表中每一个节点的parentId,然后在列表中查找是否有id与其parentId对应,若无对应,则表明此时节点列表中,该节点在当前列表中属于顶级节点 + List> treeList = CollUtil.newArrayList(); + for (SysDeptVo d : depts) { + Long parentId = d.getParentId(); + SysDeptVo sysDeptVo = StreamUtils.findFirst(depts, it -> it.getDeptId().longValue() == parentId); + if (ObjectUtil.isNull(sysDeptVo)) { + List> trees = TreeBuildUtils.build(depts, parentId, (dept, tree) -> + tree.setId(dept.getDeptId()) + .setParentId(dept.getParentId()) + .setName(dept.getDeptName()) + .setWeight(dept.getOrderNum()) + .putExtra("disabled", SystemConstants.DISABLE.equals(dept.getStatus()))); + Tree tree = StreamUtils.findFirst(trees, it -> it.getId().longValue() == d.getDeptId()); + treeList.add(tree); + } + } + return treeList; + } + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + @Override + public List selectDeptListByRoleId(Long roleId) { + SysRole role = roleMapper.selectById(roleId); + return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); + } + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") + @Override + public SysDeptVo selectDeptById(Long deptId) { + SysDeptVo dept = baseMapper.selectVoById(deptId); + if (ObjectUtil.isNull(dept)) { + return null; + } + SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() + .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId())); + dept.setParentName(ObjectUtils.notNullGetter(parentDept, SysDeptVo::getDeptName)); + return dept; + } + + @Override + public List selectDeptByIds(List deptIds) { + return baseMapper.selectDeptList(new LambdaQueryWrapper() + .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) + .eq(SysDept::getStatus, SystemConstants.NORMAL) + .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); + } + + /** + * 通过部门ID查询部门名称 + * + * @param deptIds 部门ID串逗号分隔 + * @return 部门名称串逗号分隔 + */ + @Override + public String selectDeptNameByIds(String deptIds) { + List list = new ArrayList<>(); + for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { + SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); + if (ObjectUtil.isNotNull(vo)) { + list.add(vo.getDeptName()); + } + } + return String.join(StringUtils.SEPARATOR, list); + } + + /** + * 根据部门ID查询部门负责人 + * + * @param deptId 部门ID,用于指定需要查询的部门 + * @return 返回该部门的负责人ID + */ + @Override + public Long selectDeptLeaderById(Long deptId) { + SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(deptId); + return vo.getLeader(); + } + + /** + * 查询部门 + * + * @return 部门列表 + */ + @Override + public List selectDeptsByList() { + List list = baseMapper.selectDeptList(new LambdaQueryWrapper() + .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getParentId) + .eq(SysDept::getStatus, SystemConstants.NORMAL)); + return BeanUtil.copyToList(list, DeptDTO.class); + } + + /** + * 根据ID查询所有子部门数(正常状态) + * + * @param deptId 部门ID + * @return 子部门数 + */ + @Override + public long selectNormalChildrenDeptById(Long deptId) { + return baseMapper.selectCount(new LambdaQueryWrapper() + .eq(SysDept::getStatus, SystemConstants.NORMAL) + .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); + } + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public boolean hasChildByDeptId(Long deptId) { + return baseMapper.exists(new LambdaQueryWrapper() + .eq(SysDept::getParentId, deptId)); + } + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + @Override + public boolean checkDeptExistUser(Long deptId) { + return userMapper.exists(new LambdaQueryWrapper() + .eq(SysUser::getDeptId, deptId)); + } + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public boolean checkDeptNameUnique(SysDeptBo dept) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysDept::getDeptName, dept.getDeptName()) + .eq(SysDept::getParentId, dept.getParentId()) + .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())); + return !exist; + } + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + @Override + public void checkDeptDataScope(Long deptId) { + if (ObjectUtil.isNull(deptId)) { + return; + } + if (LoginHelper.isSuperAdmin()) { + return; + } + if (baseMapper.countDeptById(deptId) == 0) { + throw new ServiceException("没有权限访问部门数据!"); + } + } + + /** + * 新增保存部门信息 + * + * @param bo 部门信息 + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true) + @Override + public int insertDept(SysDeptBo bo) { + SysDept info = baseMapper.selectById(bo.getParentId()); + // 如果父节点不为正常状态,则不允许新增子节点 + if (!SystemConstants.NORMAL.equals(info.getStatus())) { + throw new ServiceException("部门停用,不允许新增"); + } + SysDept dept = MapstructUtils.convert(bo, SysDept.class); + dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); + return baseMapper.insert(dept); + } + + /** + * 修改保存部门信息 + * + * @param bo 部门信息 + * @return 结果 + */ + @Caching(evict = { + @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId"), + @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true) + }) + @Override + @Transactional(rollbackFor = Exception.class) + public int updateDept(SysDeptBo bo) { + SysDept dept = MapstructUtils.convert(bo, SysDept.class); + SysDept oldDept = baseMapper.selectById(dept.getDeptId()); + if (ObjectUtil.isNull(oldDept)) { + throw new ServiceException("部门不存在,无法修改"); + } + if (!oldDept.getParentId().equals(dept.getParentId())) { + // 如果是新父部门 则校验是否具有新父部门权限 避免越权 + this.checkDeptDataScope(dept.getParentId()); + SysDept newParentDept = baseMapper.selectById(dept.getParentId()); + if (ObjectUtil.isNotNull(newParentDept)) { + String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId(); + String oldAncestors = oldDept.getAncestors(); + dept.setAncestors(newAncestors); + updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); + } + } else { + dept.setAncestors(oldDept.getAncestors()); + } + int result = baseMapper.updateById(dept); + // 如果部门状态为启用,且部门祖级列表不为空,且部门祖级列表不等于根部门祖级列表(如果部门祖级列表不等于根部门祖级列表,则说明存在上级部门) + if (SystemConstants.NORMAL.equals(dept.getStatus()) + && StringUtils.isNotEmpty(dept.getAncestors()) + && !StringUtils.equals(SystemConstants.ROOT_DEPT_ANCESTORS, dept.getAncestors())) { + // 如果该部门是启用状态,则启用该部门的所有上级部门 + updateParentDeptStatusNormal(dept); + } + return result; + } + + /** + * 修改该部门的父级部门状态 + * + * @param dept 当前部门 + */ + private void updateParentDeptStatusNormal(SysDept dept) { + String ancestors = dept.getAncestors(); + Long[] deptIds = Convert.toLongArray(ancestors); + baseMapper.update(null, new LambdaUpdateWrapper() + .set(SysDept::getStatus, SystemConstants.NORMAL) + .in(SysDept::getDeptId, Arrays.asList(deptIds))); + } + + /** + * 修改子元素关系 + * + * @param deptId 被修改的部门ID + * @param newAncestors 新的父ID集合 + * @param oldAncestors 旧的父ID集合 + */ + private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { + List children = baseMapper.selectList(new LambdaQueryWrapper() + .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); + List list = new ArrayList<>(); + for (SysDept child : children) { + SysDept dept = new SysDept(); + dept.setDeptId(child.getDeptId()); + dept.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); + list.add(dept); + } + if (CollUtil.isNotEmpty(list)) { + if (baseMapper.updateBatchById(list)) { + list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId())); + } + } + } + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + @Caching(evict = { + @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId"), + @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId") + }) + @Override + public int deleteDeptById(Long deptId) { + return baseMapper.deleteById(deptId); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java new file mode 100644 index 0000000..a0f8b56 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -0,0 +1,157 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.system.domain.SysDictData; +import org.dromara.system.domain.bo.SysDictDataBo; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.mapper.SysDictDataMapper; +import org.dromara.system.service.ISysDictDataService; +import org.springframework.cache.annotation.CachePut; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 字典 业务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysDictDataServiceImpl implements ISysDictDataService { + + private final SysDictDataMapper baseMapper; + + @Override + public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataList(SysDictDataBo dictData) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysDictDataBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort()); + lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel()); + lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType()); + lqw.orderByAsc(SysDictData::getDictSort); + return lqw; + } + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + @Override + public String selectDictLabel(String dictType, String dictValue) { + return baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysDictData::getDictLabel) + .eq(SysDictData::getDictType, dictType) + .eq(SysDictData::getDictValue, dictValue)) + .getDictLabel(); + } + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + @Override + public SysDictDataVo selectDictDataById(Long dictCode) { + return baseMapper.selectVoById(dictCode); + } + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + @Override + public void deleteDictDataByIds(Long[] dictCodes) { + for (Long dictCode : dictCodes) { + SysDictData data = baseMapper.selectById(dictCode); + baseMapper.deleteById(dictCode); + CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType()); + } + } + + /** + * 新增保存字典数据信息 + * + * @param bo 字典数据信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @Override + public List insertDictData(SysDictDataBo bo) { + SysDictData data = MapstructUtils.convert(bo, SysDictData.class); + int row = baseMapper.insert(data); + if (row > 0) { + return baseMapper.selectDictDataByType(data.getDictType()); + } + throw new ServiceException("操作失败"); + } + + /** + * 修改保存字典数据信息 + * + * @param bo 字典数据信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @Override + public List updateDictData(SysDictDataBo bo) { + SysDictData data = MapstructUtils.convert(bo, SysDictData.class); + int row = baseMapper.updateById(data); + if (row > 0) { + return baseMapper.selectDictDataByType(data.getDictType()); + } + throw new ServiceException("操作失败"); + } + + /** + * 校验字典键值是否唯一 + * + * @param dict 字典数据 + * @return 结果 + */ + @Override + public boolean checkDictDataUnique(SysDictDataBo dict) { + Long dictCode = ObjectUtils.notNull(dict.getDictCode(), -1L); + SysDictData entity = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue())); + if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) { + return false; + } + return true; + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java new file mode 100644 index 0000000..9d80d50 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -0,0 +1,295 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.dto.DictDataDTO; +import org.dromara.common.core.domain.dto.DictTypeDTO; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.DictService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.system.domain.SysDictData; +import org.dromara.system.domain.SysDictType; +import org.dromara.system.domain.bo.SysDictTypeBo; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.domain.vo.SysDictTypeVo; +import org.dromara.system.mapper.SysDictDataMapper; +import org.dromara.system.mapper.SysDictTypeMapper; +import org.dromara.system.service.ISysDictTypeService; +import org.springframework.cache.annotation.CachePut; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 字典 业务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService { + + private final SysDictTypeMapper baseMapper; + private final SysDictDataMapper dictDataMapper; + + @Override + public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeList(SysDictTypeBo dictType) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysDictTypeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName()); + lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType()); + lqw.between(params.get("beginTime") != null && params.get("endTime") != null, + SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(SysDictType::getDictId); + return lqw; + } + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeAll() { + return baseMapper.selectVoList(); + } + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") + @Override + public List selectDictDataByType(String dictType) { + List dictDatas = dictDataMapper.selectDictDataByType(dictType); + if (CollUtil.isNotEmpty(dictDatas)) { + return dictDatas; + } + return null; + } + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + @Override + public SysDictTypeVo selectDictTypeById(Long dictId) { + return baseMapper.selectVoById(dictId); + } + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + @Cacheable(cacheNames = CacheNames.SYS_DICT_TYPE, key = "#dictType") + @Override + public SysDictTypeVo selectDictTypeByType(String dictType) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysDictType::getDictType, dictType)); + } + + /** + * 批量删除字典类型信息 + * + * @param dictIds 需要删除的字典ID + */ + @Override + public void deleteDictTypeByIds(Long[] dictIds) { + for (Long dictId : dictIds) { + SysDictType dictType = baseMapper.selectById(dictId); + if (dictDataMapper.exists(new LambdaQueryWrapper() + .eq(SysDictData::getDictType, dictType.getDictType()))) { + throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); + } + CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType()); + CacheUtils.evict(CacheNames.SYS_DICT_TYPE, dictType.getDictType()); + } + baseMapper.deleteByIds(Arrays.asList(dictIds)); + } + + /** + * 重置字典缓存数据 + */ + @Override + public void resetDictCache() { + CacheUtils.clear(CacheNames.SYS_DICT); + CacheUtils.clear(CacheNames.SYS_DICT_TYPE); + } + + /** + * 新增保存字典类型信息 + * + * @param bo 字典类型信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @Override + public List insertDictType(SysDictTypeBo bo) { + SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); + int row = baseMapper.insert(dict); + if (row > 0) { + // 新增 type 下无 data 数据 返回空防止缓存穿透 + return new ArrayList<>(); + } + throw new ServiceException("操作失败"); + } + + /** + * 修改保存字典类型信息 + * + * @param bo 字典类型信息 + * @return 结果 + */ + @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") + @Override + @Transactional(rollbackFor = Exception.class) + public List updateDictType(SysDictTypeBo bo) { + SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); + SysDictType oldDict = baseMapper.selectById(dict.getDictId()); + dictDataMapper.update(null, new LambdaUpdateWrapper() + .set(SysDictData::getDictType, dict.getDictType()) + .eq(SysDictData::getDictType, oldDict.getDictType())); + int row = baseMapper.updateById(dict); + if (row > 0) { + CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); + CacheUtils.evict(CacheNames.SYS_DICT_TYPE, oldDict.getDictType()); + return dictDataMapper.selectDictDataByType(dict.getDictType()); + } + throw new ServiceException("操作失败"); + } + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + @Override + public boolean checkDictTypeUnique(SysDictTypeBo dictType) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysDictType::getDictType, dictType.getDictType()) + .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId())); + return !exist; + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @param separator 分隔符 + * @return 字典标签 + */ + @Override + public String getDictLabel(String dictType, String dictValue, String separator) { + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); + if (StringUtils.containsAny(dictValue, separator)) { + return Arrays.stream(dictValue.split(separator)) + .map(v -> map.getOrDefault(v, StringUtils.EMPTY)) + .collect(Collectors.joining(separator)); + } else { + return map.getOrDefault(dictValue, StringUtils.EMPTY); + } + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @param separator 分隔符 + * @return 字典值 + */ + @Override + public String getDictValue(String dictType, String dictLabel, String separator) { + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue); + if (StringUtils.containsAny(dictLabel, separator)) { + return Arrays.stream(dictLabel.split(separator)) + .map(l -> map.getOrDefault(l, StringUtils.EMPTY)) + .collect(Collectors.joining(separator)); + } else { + return map.getOrDefault(dictLabel, StringUtils.EMPTY); + } + } + + /** + * 获取字典下所有的字典值与标签 + * + * @param dictType 字典类型 + * @return dictValue为key,dictLabel为值组成的Map + */ + @Override + public Map getAllDictByDictType(String dictType) { + List list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + return StreamUtils.toMap(list, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); + } + + /** + * 根据字典类型查询详细信息 + * + * @param dictType 字典类型 + * @return 字典类型详细信息 + */ + @Override + public DictTypeDTO getDictTypeDto(String dictType) { + SysDictTypeVo vo = SpringUtils.getAopProxy(this).selectDictTypeByType(dictType); + return BeanUtil.toBean(vo, DictTypeDTO.class); + } + + /** + * 根据字典类型查询字典数据列表 + * + * @param dictType 字典类型 + * @return 字典数据列表 + */ + @Override + public List getDictDataDto(String dictType) { + List list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + return BeanUtil.copyToList(list, DictDataDTO.class); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java new file mode 100644 index 0000000..72b497e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java @@ -0,0 +1,175 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.useragent.UserAgent; +import cn.hutool.http.useragent.UserAgentUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.ServletUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ip.AddressUtils; +import org.dromara.common.log.event.LogininforEvent; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.SysLogininfor; +import org.dromara.system.domain.bo.SysLogininforBo; +import org.dromara.system.domain.vo.SysClientVo; +import org.dromara.system.domain.vo.SysLogininforVo; +import org.dromara.system.mapper.SysLogininforMapper; +import org.dromara.system.service.ISysClientService; +import org.dromara.system.service.ISysLogininforService; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Slf4j +@Service +public class SysLogininforServiceImpl implements ISysLogininforService { + + private final SysLogininforMapper baseMapper; + + private final ISysClientService clientService; + + /** + * 记录登录信息 + * + * @param logininforEvent 登录事件 + */ + @Async + @EventListener + public void recordLogininfor(LogininforEvent logininforEvent) { + HttpServletRequest request = logininforEvent.getRequest(); + final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent")); + final String ip = ServletUtils.getClientIP(request); + // 客户端信息 + String clientId = request.getHeader(LoginHelper.CLIENT_KEY); + SysClientVo client = null; + if (StringUtils.isNotBlank(clientId)) { + client = clientService.queryByClientId(clientId); + } + + String address = AddressUtils.getRealAddressByIP(ip); + StringBuilder s = new StringBuilder(); + s.append(getBlock(ip)); + s.append(address); + s.append(getBlock(logininforEvent.getUsername())); + s.append(getBlock(logininforEvent.getStatus())); + s.append(getBlock(logininforEvent.getMessage())); + // 打印信息到日志 + log.info(s.toString(), logininforEvent.getArgs()); + // 获取客户端操作系统 + String os = userAgent.getOs().getName(); + // 获取客户端浏览器 + String browser = userAgent.getBrowser().getName(); + // 封装对象 + SysLogininforBo logininfor = new SysLogininforBo(); + logininfor.setTenantId(logininforEvent.getTenantId()); + logininfor.setUserName(logininforEvent.getUsername()); + if (ObjectUtil.isNotNull(client)) { + logininfor.setClientKey(client.getClientKey()); + logininfor.setDeviceType(client.getDeviceType()); + } + logininfor.setIpaddr(ip); + logininfor.setLoginLocation(address); + logininfor.setBrowser(browser); + logininfor.setOs(os); + logininfor.setMsg(logininforEvent.getMessage()); + // 日志状态 + if (StringUtils.equalsAny(logininforEvent.getStatus(), Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) { + logininfor.setStatus(Constants.SUCCESS); + } else if (Constants.LOGIN_FAIL.equals(logininforEvent.getStatus())) { + logininfor.setStatus(Constants.FAIL); + } + // 插入数据 + insertLogininfor(logininfor); + } + + private String getBlock(Object msg) { + if (msg == null) { + msg = ""; + } + return "[" + msg.toString() + "]"; + } + + @Override + public TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery) { + Map params = logininfor.getParams(); + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) + .between(params.get("beginTime") != null && params.get("endTime") != null, + SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); + if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { + lqw.orderByDesc(SysLogininfor::getInfoId); + } + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + /** + * 新增系统登录日志 + * + * @param bo 访问日志对象 + */ + @Override + public void insertLogininfor(SysLogininforBo bo) { + SysLogininfor logininfor = MapstructUtils.convert(bo, SysLogininfor.class); + logininfor.setLoginTime(new Date()); + baseMapper.insert(logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + @Override + public List selectLogininforList(SysLogininforBo logininfor) { + Map params = logininfor.getParams(); + return baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) + .between(params.get("beginTime") != null && params.get("endTime") != null, + SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) + .orderByDesc(SysLogininfor::getInfoId)); + } + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + @Override + public int deleteLogininforByIds(Long[] infoIds) { + return baseMapper.deleteByIds(Arrays.asList(infoIds)); + } + + /** + * 清空系统登录日志 + */ + @Override + public void cleanLogininfor() { + baseMapper.delete(new LambdaQueryWrapper<>()); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java new file mode 100644 index 0000000..40643e1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -0,0 +1,372 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.TreeBuildUtils; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.SysMenu; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysRoleMenu; +import org.dromara.system.domain.SysTenantPackage; +import org.dromara.system.domain.bo.SysMenuBo; +import org.dromara.system.domain.vo.MetaVo; +import org.dromara.system.domain.vo.RouterVo; +import org.dromara.system.domain.vo.SysMenuVo; +import org.dromara.system.mapper.SysMenuMapper; +import org.dromara.system.mapper.SysRoleMapper; +import org.dromara.system.mapper.SysRoleMenuMapper; +import org.dromara.system.mapper.SysTenantPackageMapper; +import org.dromara.system.service.ISysMenuService; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * 菜单 业务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysMenuServiceImpl implements ISysMenuService { + + private final SysMenuMapper baseMapper; + private final SysRoleMapper roleMapper; + private final SysRoleMenuMapper roleMenuMapper; + private final SysTenantPackageMapper tenantPackageMapper; + + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + @Override + public List selectMenuList(Long userId) { + return selectMenuList(new SysMenuBo(), userId); + } + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + @Override + public List selectMenuList(SysMenuBo menu, Long userId) { + List menuList; + // 管理员显示所有菜单信息 + if (LoginHelper.isSuperAdmin(userId)) { + menuList = baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()) + .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()) + .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus()) + .orderByAsc(SysMenu::getParentId) + .orderByAsc(SysMenu::getOrderNum)); + } else { + QueryWrapper wrapper = Wrappers.query(); + wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId) + .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) + .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) + .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) + .orderByAsc("m.parent_id") + .orderByAsc("m.order_num"); + List list = baseMapper.selectMenuListByUserId(wrapper); + menuList = MapstructUtils.convert(list, SysMenuVo.class); + } + return menuList; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByUserId(Long userId) { + List perms = baseMapper.selectMenuPermsByUserId(userId); + Set permsSet = new HashSet<>(); + for (String perm : perms) { + if (StringUtils.isNotEmpty(perm)) { + permsSet.addAll(StringUtils.splitList(perm.trim())); + } + } + return permsSet; + } + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByRoleId(Long roleId) { + List perms = baseMapper.selectMenuPermsByRoleId(roleId); + Set permsSet = new HashSet<>(); + for (String perm : perms) { + if (StringUtils.isNotEmpty(perm)) { + permsSet.addAll(StringUtils.splitList(perm.trim())); + } + } + return permsSet; + } + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户名称 + * @return 菜单列表 + */ + @Override + public List selectMenuTreeByUserId(Long userId) { + List menus; + if (LoginHelper.isSuperAdmin(userId)) { + menus = baseMapper.selectMenuTreeAll(); + } else { + menus = baseMapper.selectMenuTreeByUserId(userId); + } + return getChildPerms(menus, 0); + } + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + @Override + public List selectMenuListByRoleId(Long roleId) { + SysRole role = roleMapper.selectById(roleId); + return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); + } + + /** + * 根据租户套餐ID查询菜单树信息 + * + * @param packageId 租户套餐ID + * @return 选中菜单列表 + */ + @Override + public List selectMenuListByPackageId(Long packageId) { + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); + if (CollUtil.isEmpty(menuIds)) { + return List.of(); + } + List parentIds = null; + if (tenantPackage.getMenuCheckStrictly()) { + parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() + .select(SysMenu::getParentId) + .in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); + } + return baseMapper.selectObjs(new LambdaQueryWrapper() + .in(SysMenu::getMenuId, menuIds) + .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); + } + + /** + * 构建前端路由所需要的菜单 + * 路由name命名规则 path首字母转大写 + id + * + * @param menus 菜单列表 + * @return 路由列表 + */ + @Override + public List buildMenus(List menus) { + List routers = new LinkedList<>(); + for (SysMenu menu : menus) { + String name = menu.getRouteName() + menu.getMenuId(); + RouterVo router = new RouterVo(); + router.setHidden("1".equals(menu.getVisible())); + router.setName(name); + router.setPath(menu.getRouterPath()); + router.setComponent(menu.getComponentInfo()); + router.setQuery(menu.getQueryParam()); + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + List cMenus = menu.getChildren(); + if (CollUtil.isNotEmpty(cMenus) && SystemConstants.TYPE_DIR.equals(menu.getMenuType())) { + router.setAlwaysShow(true); + router.setRedirect("noRedirect"); + router.setChildren(buildMenus(cMenus)); + } else if (menu.isMenuFrame()) { + String frameName = StringUtils.capitalize(menu.getPath()) + menu.getMenuId(); + router.setMeta(null); + List childrenList = new ArrayList<>(); + RouterVo children = new RouterVo(); + children.setPath(menu.getPath()); + children.setComponent(menu.getComponent()); + children.setName(frameName); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + children.setQuery(menu.getQueryParam()); + childrenList.add(children); + router.setChildren(childrenList); + } else if (menu.getParentId().intValue() == 0 && menu.isInnerLink()) { + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); + router.setPath("/"); + List childrenList = new ArrayList<>(); + RouterVo children = new RouterVo(); + String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath()); + String innerLinkName = StringUtils.capitalize(routerPath) + menu.getMenuId(); + children.setPath(routerPath); + children.setComponent(SystemConstants.INNER_LINK); + children.setName(innerLinkName); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); + childrenList.add(children); + router.setChildren(childrenList); + } + routers.add(router); + } + return routers; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + @Override + public List> buildMenuTreeSelect(List menus) { + if (CollUtil.isEmpty(menus)) { + return CollUtil.newArrayList(); + } + return TreeBuildUtils.build(menus, (menu, tree) -> { + Tree menuTree = tree.setId(menu.getMenuId()) + .setParentId(menu.getParentId()) + .setName(menu.getMenuName()) + .setWeight(menu.getOrderNum()); + menuTree.put("menuType", menu.getMenuType()); + menuTree.put("icon", menu.getIcon()); + }); + } + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + @Override + public SysMenuVo selectMenuById(Long menuId) { + return baseMapper.selectVoById(menuId); + } + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean hasChildByMenuId(Long menuId) { + return baseMapper.exists(new LambdaQueryWrapper().eq(SysMenu::getParentId, menuId)); + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean checkMenuExistRole(Long menuId) { + return roleMenuMapper.exists(new LambdaQueryWrapper().eq(SysRoleMenu::getMenuId, menuId)); + } + + /** + * 新增保存菜单信息 + * + * @param bo 菜单信息 + * @return 结果 + */ + @Override + public int insertMenu(SysMenuBo bo) { + SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); + return baseMapper.insert(menu); + } + + /** + * 修改保存菜单信息 + * + * @param bo 菜单信息 + * @return 结果 + */ + @Override + public int updateMenu(SysMenuBo bo) { + SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); + return baseMapper.updateById(menu); + } + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int deleteMenuById(Long menuId) { + return baseMapper.deleteById(menuId); + } + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public boolean checkMenuNameUnique(SysMenuBo menu) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysMenu::getMenuName, menu.getMenuName()) + .eq(SysMenu::getParentId, menu.getParentId()) + .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId())); + return !exist; + } + + /** + * 根据父节点的ID获取所有子节点 + * + * @param list 分类表 + * @param parentId 传入的父节点ID + * @return String + */ + private List getChildPerms(List list, int parentId) { + List returnList = new ArrayList<>(); + for (SysMenu t : list) { + // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 + if (t.getParentId() == parentId) { + recursionFn(list, t); + returnList.add(t); + } + } + return returnList; + } + + /** + * 递归列表 + */ + private void recursionFn(List list, SysMenu t) { + // 得到子节点列表 + List childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); + t.setChildren(childList); + for (SysMenu tChild : childList) { + // 判断是否有子节点 + if (list.stream().anyMatch(n -> n.getParentId().equals(tChild.getMenuId()))) { + recursionFn(list, tChild); + } + } + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 0000000..3ff87bd --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,124 @@ +package org.dromara.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysNotice; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.bo.SysNoticeBo; +import org.dromara.system.domain.vo.SysNoticeVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysNoticeMapper; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.service.ISysNoticeService; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * 公告 服务层实现 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysNoticeServiceImpl implements ISysNoticeService { + + private final SysNoticeMapper baseMapper; + private final SysUserMapper userMapper; + + @Override + public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + @Override + public SysNoticeVo selectNoticeById(Long noticeId) { + return baseMapper.selectVoById(noticeId); + } + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + @Override + public List selectNoticeList(SysNoticeBo notice) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysNoticeBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType()); + if (StringUtils.isNotBlank(bo.getCreateByName())) { + SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, bo.getCreateByName())); + lqw.eq(SysNotice::getCreateBy, ObjectUtils.notNullGetter(sysUser, SysUserVo::getUserId)); + } + lqw.orderByAsc(SysNotice::getNoticeId); + return lqw; + } + + /** + * 新增公告 + * + * @param bo 公告信息 + * @return 结果 + */ + @Override + public int insertNotice(SysNoticeBo bo) { + SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); + return baseMapper.insert(notice); + } + + /** + * 修改公告 + * + * @param bo 公告信息 + * @return 结果 + */ + @Override + public int updateNotice(SysNoticeBo bo) { + SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); + return baseMapper.updateById(notice); + } + + /** + * 删除公告对象 + * + * @param noticeId 公告ID + * @return 结果 + */ + @Override + public int deleteNoticeById(Long noticeId) { + return baseMapper.deleteById(noticeId); + } + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + @Override + public int deleteNoticeByIds(Long[] noticeIds) { + return baseMapper.deleteByIds(Arrays.asList(noticeIds)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java new file mode 100644 index 0000000..27c2f32 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.util.ArrayUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ip.AddressUtils; +import org.dromara.common.log.event.OperLogEvent; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysOperLog; +import org.dromara.system.domain.bo.SysOperLogBo; +import org.dromara.system.domain.vo.SysOperLogVo; +import org.dromara.system.mapper.SysOperLogMapper; +import org.dromara.system.service.ISysOperLogService; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 操作日志 服务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysOperLogServiceImpl implements ISysOperLogService { + + private final SysOperLogMapper baseMapper; + + /** + * 操作日志记录 + * + * @param operLogEvent 操作日志事件 + */ + @Async + @EventListener + public void recordOper(OperLogEvent operLogEvent) { + SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class); + // 远程查询操作地点 + operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); + insertOperlog(operLog); + } + + @Override + public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(operLog); + if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { + lqw.orderByDesc(SysOperLog::getOperId); + } + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(page); + } + + private LambdaQueryWrapper buildQueryWrapper(SysOperLogBo operLog) { + Map params = operLog.getParams(); + return new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) + .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) + .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, + SysOperLog::getBusinessType, operLog.getBusinessType()) + .func(f -> { + if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { + f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + } + }) + .eq(operLog.getStatus() != null, + SysOperLog::getStatus, operLog.getStatus()) + .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) + .between(params.get("beginTime") != null && params.get("endTime") != null, + SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); + } + + /** + * 新增操作日志 + * + * @param bo 操作日志对象 + */ + @Override + public void insertOperlog(SysOperLogBo bo) { + SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); + operLog.setOperTime(new Date()); + baseMapper.insert(operLog); + } + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + @Override + public List selectOperLogList(SysOperLogBo operLog) { + LambdaQueryWrapper lqw = buildQueryWrapper(operLog); + return baseMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId)); + } + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + @Override + public int deleteOperLogByIds(Long[] operIds) { + return baseMapper.deleteByIds(Arrays.asList(operIds)); + } + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + @Override + public SysOperLogVo selectOperLogById(Long operId) { + return baseMapper.selectVoById(operId); + } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog() { + baseMapper.delete(new LambdaQueryWrapper<>()); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java new file mode 100644 index 0000000..a67b04e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java @@ -0,0 +1,177 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.ObjectUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.oss.constant.OssConstant; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.system.domain.SysOssConfig; +import org.dromara.system.domain.bo.SysOssConfigBo; +import org.dromara.system.domain.vo.SysOssConfigVo; +import org.dromara.system.mapper.SysOssConfigMapper; +import org.dromara.system.service.ISysOssConfigService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * 对象存储配置Service业务层处理 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SysOssConfigServiceImpl implements ISysOssConfigService { + + private final SysOssConfigMapper baseMapper; + + /** + * 项目启动时,初始化参数到缓存,加载配置类 + */ + @Override + public void init() { + List list = baseMapper.selectList(); + // 加载OSS初始化配置 + for (SysOssConfig config : list) { + String configKey = config.getConfigKey(); + if ("0".equals(config.getStatus())) { + RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey); + } + CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); + } + } + + @Override + public SysOssConfigVo queryById(Long ossConfigId) { + return baseMapper.selectVoById(ossConfigId); + } + + @Override + public TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + + private LambdaQueryWrapper buildQueryWrapper(SysOssConfigBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey()); + lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus()); + lqw.orderByAsc(SysOssConfig::getOssConfigId); + return lqw; + } + + @Override + public Boolean insertByBo(SysOssConfigBo bo) { + SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); + validEntityBeforeSave(config); + boolean flag = baseMapper.insert(config) > 0; + if (flag) { + // 从数据库查询完整的数据做缓存 + config = baseMapper.selectById(config.getOssConfigId()); + CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); + } + return flag; + } + + @Override + public Boolean updateByBo(SysOssConfigBo bo) { + SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); + validEntityBeforeSave(config); + LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); + luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); + luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, ""); + luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, ""); + luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, ""); + luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId()); + boolean flag = baseMapper.update(config, luw) > 0; + if (flag) { + // 从数据库查询完整的数据做缓存 + config = baseMapper.selectById(config.getOssConfigId()); + CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); + } + return flag; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysOssConfig entity) { + if (StringUtils.isNotEmpty(entity.getConfigKey()) + && !checkConfigKeyUnique(entity)) { + throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); + } + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) { + throw new ServiceException("系统内置, 不可删除!"); + } + } + List list = CollUtil.newArrayList(); + for (Long configId : ids) { + SysOssConfig config = baseMapper.selectById(configId); + list.add(config); + } + boolean flag = baseMapper.deleteByIds(ids) > 0; + if (flag) { + list.forEach(sysOssConfig -> + CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey())); + } + return flag; + } + + /** + * 判断configKey是否唯一 + */ + private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) { + long ossConfigId = ObjectUtils.notNull(sysOssConfig.getOssConfigId(), -1L); + SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) + .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())); + if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { + return false; + } + return true; + } + + /** + * 启用禁用状态 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateOssConfigStatus(SysOssConfigBo bo) { + SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class); + int row = baseMapper.update(null, new LambdaUpdateWrapper() + .set(SysOssConfig::getStatus, "1")); + row += baseMapper.updateById(sysOssConfig); + if (row > 0) { + RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey()); + } + return row; + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java new file mode 100644 index 0000000..c2eb08c --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -0,0 +1,269 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.domain.dto.OssDTO; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.OssService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.file.FileUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.oss.core.OssClient; +import org.dromara.common.oss.entity.UploadResult; +import org.dromara.common.oss.enumd.AccessPolicyType; +import org.dromara.common.oss.factory.OssFactory; +import org.dromara.system.domain.SysOss; +import org.dromara.system.domain.bo.SysOssBo; +import org.dromara.system.domain.vo.SysOssVo; +import org.dromara.system.mapper.SysOssMapper; +import org.dromara.system.service.ISysOssService; +import org.jetbrains.annotations.NotNull; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 文件上传 服务层实现 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysOssServiceImpl implements ISysOssService, OssService { + + private final SysOssMapper baseMapper; + + /** + * 查询OSS对象存储列表 + * + * @param bo OSS对象存储分页查询对象 + * @param pageQuery 分页查询实体类 + * @return 结果 + */ + @Override + public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); + result.setRecords(filterResult); + return TableDataInfo.build(result); + } + + /** + * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * + * @param ossIds 一组文件在数据库中的唯一标识集合 + * @return 包含 SysOssVo 对象的列表 + */ + @Override + public List listByIds(Collection ossIds) { + List list = new ArrayList<>(); + SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); + for (Long id : ossIds) { + SysOssVo vo = ossService.getById(id); + if (ObjectUtil.isNotNull(vo)) { + try { + list.add(this.matchingUrl(vo)); + } catch (Exception ignored) { + // 如果oss异常无法连接则将数据直接返回 + list.add(vo); + } + } + } + return list; + } + + /** + * 根据一组 ossIds 获取对应文件的 URL 列表 + * + * @param ossIds 以逗号分隔的 ossId 字符串 + * @return 以逗号分隔的文件 URL 字符串 + */ + @Override + public String selectUrlByIds(String ossIds) { + List list = new ArrayList<>(); + SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); + for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { + SysOssVo vo = ossService.getById(id); + if (ObjectUtil.isNotNull(vo)) { + try { + list.add(this.matchingUrl(vo).getUrl()); + } catch (Exception ignored) { + // 如果oss异常无法连接则将数据直接返回 + list.add(vo.getUrl()); + } + } + } + return String.join(StringUtils.SEPARATOR, list); + } + + @Override + public List selectByIds(String ossIds) { + List list = new ArrayList<>(); + for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { + SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); + if (ObjectUtil.isNotNull(vo)) { + try { + vo.setUrl(this.matchingUrl(vo).getUrl()); + list.add(BeanUtil.toBean(vo, OssDTO.class)); + } catch (Exception ignored) { + // 如果oss异常无法连接则将数据直接返回 + list.add(BeanUtil.toBean(vo, OssDTO.class)); + } + } + } + return list; + } + + private LambdaQueryWrapper buildQueryWrapper(SysOssBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName()); + lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName()); + lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix()); + lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy()); + lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService()); + lqw.orderByAsc(SysOss::getOssId); + return lqw; + } + + /** + * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * + * @param ossId 文件在数据库中的唯一标识 + * @return SysOssVo 对象,包含文件信息 + */ + @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") + @Override + public SysOssVo getById(Long ossId) { + return baseMapper.selectVoById(ossId); + } + + + /** + * 文件下载方法,支持一次性下载完整文件 + * + * @param ossId OSS对象ID + * @param response HttpServletResponse对象,用于设置响应头和向客户端发送文件内容 + */ + @Override + public void download(Long ossId, HttpServletResponse response) throws IOException { + SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); + if (ObjectUtil.isNull(sysOss)) { + throw new ServiceException("文件数据不存在!"); + } + FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); + OssClient storage = OssFactory.instance(sysOss.getService()); + storage.download(sysOss.getFileName(), response.getOutputStream(), response::setContentLengthLong); + } + + /** + * 上传 MultipartFile 到对象存储服务,并保存文件信息到数据库 + * + * @param file 要上传的 MultipartFile 对象 + * @return 上传成功后的 SysOssVo 对象,包含文件信息 + * @throws ServiceException 如果上传过程中发生异常,则抛出 ServiceException 异常 + */ + @Override + public SysOssVo upload(MultipartFile file) { + String originalfileName = file.getOriginalFilename(); + String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); + OssClient storage = OssFactory.instance(); + UploadResult uploadResult; + try { + uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType()); + } catch (IOException e) { + throw new ServiceException(e.getMessage()); + } + // 保存文件信息 + return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); + } + + /** + * 上传文件到对象存储服务,并保存文件信息到数据库 + * + * @param file 要上传的文件对象 + * @return 上传成功后的 SysOssVo 对象,包含文件信息 + */ + @Override + public SysOssVo upload(File file) { + String originalfileName = file.getName(); + String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); + OssClient storage = OssFactory.instance(); + UploadResult uploadResult = storage.uploadSuffix(file, suffix); + // 保存文件信息 + return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult); + } + + @NotNull + private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { + SysOss oss = new SysOss(); + oss.setUrl(uploadResult.getUrl()); + oss.setFileSuffix(suffix); + oss.setFileName(uploadResult.getFilename()); + oss.setOriginalName(originalfileName); + oss.setService(configKey); + baseMapper.insert(oss); + SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class); + return this.matchingUrl(sysOssVo); + } + + /** + * 删除OSS对象存储 + * + * @param ids OSS对象ID串 + * @param isValid 判断是否需要校验 + * @return 结果 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + // 做一些业务上的校验,判断是否需要校验 + } + List list = baseMapper.selectByIds(ids); + for (SysOss sysOss : list) { + OssClient storage = OssFactory.instance(sysOss.getService()); + storage.delete(sysOss.getUrl()); + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 桶类型为 private 的URL 修改为临时URL时长为120s + * + * @param oss OSS对象 + * @return oss 匹配Url的OSS对象 + */ + private SysOssVo matchingUrl(SysOssVo oss) { + OssClient storage = OssFactory.instance(oss.getService()); + // 仅修改桶类型为 private 的URL,临时URL时长为120s + if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { + oss.setUrl(storage.getPrivateUrl(oss.getFileName(), Duration.ofSeconds(120))); + } + return oss; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java new file mode 100644 index 0000000..7ccae4b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java @@ -0,0 +1,61 @@ +package org.dromara.system.service.impl; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.service.ISysMenuService; +import org.dromara.system.service.ISysPermissionService; +import org.dromara.system.service.ISysRoleService; +import org.springframework.stereotype.Service; + +import java.util.HashSet; +import java.util.Set; + +/** + * 用户权限处理 + * + * @author ruoyi + */ +@RequiredArgsConstructor +@Service +public class SysPermissionServiceImpl implements ISysPermissionService { + + private final ISysRoleService roleService; + private final ISysMenuService menuService; + + /** + * 获取角色数据权限 + * + * @param userId 用户id + * @return 角色权限信息 + */ + @Override + public Set getRolePermission(Long userId) { + Set roles = new HashSet<>(); + // 管理员拥有所有权限 + if (LoginHelper.isSuperAdmin(userId)) { + roles.add(TenantConstants.SUPER_ADMIN_ROLE_KEY); + } else { + roles.addAll(roleService.selectRolePermissionByUserId(userId)); + } + return roles; + } + + /** + * 获取菜单数据权限 + * + * @param userId 用户id + * @return 菜单权限信息 + */ + @Override + public Set getMenuPermission(Long userId) { + Set perms = new HashSet<>(); + // 管理员拥有所有权限 + if (LoginHelper.isSuperAdmin(userId)) { + perms.add("*:*:*"); + } else { + perms.addAll(menuService.selectMenuPermsByUserId(userId)); + } + return perms; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java new file mode 100644 index 0000000..894f6ac --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -0,0 +1,250 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.PostService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.SysPost; +import org.dromara.system.domain.SysUserPost; +import org.dromara.system.domain.bo.SysPostBo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.mapper.SysDeptMapper; +import org.dromara.system.mapper.SysPostMapper; +import org.dromara.system.mapper.SysUserPostMapper; +import org.dromara.system.service.ISysPostService; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * 岗位信息 服务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysPostServiceImpl implements ISysPostService, PostService { + + private final SysPostMapper baseMapper; + private final SysDeptMapper deptMapper; + private final SysUserPostMapper userPostMapper; + + @Override + public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { + Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); + return TableDataInfo.build(page); + } + + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位信息集合 + */ + @Override + public List selectPostList(SysPostBo post) { + return baseMapper.selectVoList(buildQueryWrapper(post)); + } + + /** + * 查询用户所属岗位组 + * + * @param userId 用户ID + * @return 岗位ID + */ + @Override + public List selectPostsByUserId(Long userId) { + return baseMapper.selectPostsByUserId(userId); + } + + /** + * 根据查询条件构建查询包装器 + * + * @param bo 查询条件对象 + * @return 构建好的查询包装器 + */ + private LambdaQueryWrapper buildQueryWrapper(SysPostBo bo) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), SysPost::getPostCode, bo.getPostCode()) + .like(StringUtils.isNotBlank(bo.getPostCategory()), SysPost::getPostCategory, bo.getPostCategory()) + .like(StringUtils.isNotBlank(bo.getPostName()), SysPost::getPostName, bo.getPostName()) + .eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus()) + .orderByAsc(SysPost::getPostSort); + if (ObjectUtil.isNotNull(bo.getDeptId())) { + //优先单部门搜索 + wrapper.eq(SysPost::getDeptId, bo.getDeptId()); + } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { + //部门树搜索 + wrapper.and(x -> { + List deptList = deptMapper.selectListByParentId(bo.getBelongDeptId()); + List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId); + deptIds.add(bo.getBelongDeptId()); + x.in(SysPost::getDeptId, deptIds); + }); + } + return wrapper; + } + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + @Override + public List selectPostAll() { + return baseMapper.selectVoList(new QueryWrapper<>()); + } + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + @Override + public SysPostVo selectPostById(Long postId) { + return baseMapper.selectVoById(postId); + } + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + @Override + public List selectPostListByUserId(Long userId) { + List list = baseMapper.selectPostsByUserId(userId); + return StreamUtils.toList(list, SysPostVo::getPostId); + } + + /** + * 通过岗位ID串查询岗位 + * + * @param postIds 岗位id串 + * @return 岗位列表信息 + */ + @Override + public List selectPostByIds(List postIds) { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode) + .eq(SysPost::getStatus, SystemConstants.NORMAL) + .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds)); + } + + /** + * 校验岗位名称是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostNameUnique(SysPostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysPost::getPostName, post.getPostName()) + .eq(SysPost::getDeptId, post.getDeptId()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); + return !exist; + } + + /** + * 校验岗位编码是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostCodeUnique(SysPostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysPost::getPostCode, post.getPostCode()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); + return !exist; + } + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public long countUserPostById(Long postId) { + return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysUserPost::getPostId, postId)); + } + + /** + * 通过部门ID查询岗位使用数量 + * + * @param deptId 部门id + * @return 结果 + */ + @Override + public long countPostByDeptId(Long deptId) { + return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysPost::getDeptId, deptId)); + } + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int deletePostById(Long postId) { + return baseMapper.deleteById(postId); + } + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + @Override + public int deletePostByIds(Long[] postIds) { + for (Long postId : postIds) { + SysPost post = baseMapper.selectById(postId); + if (countUserPostById(postId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除!", post.getPostName())); + } + } + return baseMapper.deleteByIds(Arrays.asList(postIds)); + } + + /** + * 新增保存岗位信息 + * + * @param bo 岗位信息 + * @return 结果 + */ + @Override + public int insertPost(SysPostBo bo) { + SysPost post = MapstructUtils.convert(bo, SysPost.class); + return baseMapper.insert(post); + } + + /** + * 修改保存岗位信息 + * + * @param bo 岗位信息 + * @return 结果 + */ + @Override + public int updatePost(SysPostBo bo) { + SysPost post = MapstructUtils.convert(bo, SysPost.class); + return baseMapper.updateById(post); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..0a2e485 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,552 @@ +package org.dromara.system.service.impl; + +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.RoleService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysRoleDept; +import org.dromara.system.domain.SysRoleMenu; +import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.bo.SysRoleBo; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.mapper.SysRoleDeptMapper; +import org.dromara.system.mapper.SysRoleMapper; +import org.dromara.system.mapper.SysRoleMenuMapper; +import org.dromara.system.mapper.SysUserRoleMapper; +import org.dromara.system.service.ISysRoleService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * 角色 业务层处理 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysRoleServiceImpl implements ISysRoleService, RoleService { + + private final SysRoleMapper baseMapper; + private final SysRoleMenuMapper roleMenuMapper; + private final SysUserRoleMapper userRoleMapper; + private final SysRoleDeptMapper roleDeptMapper; + + @Override + public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { + Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); + return TableDataInfo.build(page); + } + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + @Override + public List selectRoleList(SysRoleBo role) { + return baseMapper.selectRoleList(this.buildQueryWrapper(role)); + } + + private Wrapper buildQueryWrapper(SysRoleBo bo) { + Map params = bo.getParams(); + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("r.del_flag", SystemConstants.NORMAL) + .eq(ObjectUtil.isNotNull(bo.getRoleId()), "r.role_id", bo.getRoleId()) + .like(StringUtils.isNotBlank(bo.getRoleName()), "r.role_name", bo.getRoleName()) + .eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus()) + .like(StringUtils.isNotBlank(bo.getRoleKey()), "r.role_key", bo.getRoleKey()) + .between(params.get("beginTime") != null && params.get("endTime") != null, + "r.create_time", params.get("beginTime"), params.get("endTime")) + .orderByAsc("r.role_sort").orderByAsc("r.create_time"); + return wrapper; + } + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesByUserId(Long userId) { + return baseMapper.selectRolesByUserId(userId); + } + + /** + * 根据用户ID查询角色列表(包含被授权状态) + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesAuthByUserId(Long userId) { + List userRoles = baseMapper.selectRolesByUserId(userId); + List roles = selectRoleAll(); + // 使用HashSet提高查找效率 + Set userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId); + for (SysRoleVo role : roles) { + if (userRoleIds.contains(role.getRoleId())) { + role.setFlag(true); + } + } + return roles; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectRolePermissionByUserId(Long userId) { + List perms = baseMapper.selectRolesByUserId(userId); + Set permsSet = new HashSet<>(); + for (SysRoleVo perm : perms) { + if (ObjectUtil.isNotNull(perm)) { + permsSet.addAll(StringUtils.splitList(perm.getRoleKey().trim())); + } + } + return permsSet; + } + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + @Override + public List selectRoleAll() { + return this.selectRoleList(new SysRoleBo()); + } + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + @Override + public List selectRoleListByUserId(Long userId) { + List list = baseMapper.selectRolesByUserId(userId); + return StreamUtils.toList(list, SysRoleVo::getRoleId); + } + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + @Override + public SysRoleVo selectRoleById(Long roleId) { + return baseMapper.selectRoleById(roleId); + } + + /** + * 通过角色ID串查询角色 + * + * @param roleIds 角色ID串 + * @return 角色列表信息 + */ + @Override + public List selectRoleByIds(List roleIds) { + return baseMapper.selectRoleList(new QueryWrapper() + .eq("r.status", SystemConstants.NORMAL) + .in(CollUtil.isNotEmpty(roleIds), "r.role_id", roleIds)); + } + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleNameUnique(SysRoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysRole::getRoleName, role.getRoleName()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); + return !exist; + } + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleKeyUnique(SysRoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysRole::getRoleKey, role.getRoleKey()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); + return !exist; + } + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + @Override + public void checkRoleAllowed(SysRoleBo role) { + if (ObjectUtil.isNotNull(role.getRoleId()) && LoginHelper.isSuperAdmin(role.getRoleId())) { + throw new ServiceException("不允许操作超级管理员角色"); + } + String[] keys = new String[]{TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY}; + // 新增不允许使用 管理员标识符 + if (ObjectUtil.isNull(role.getRoleId()) + && StringUtils.equalsAny(role.getRoleKey(), keys)) { + throw new ServiceException("不允许使用系统内置管理员角色标识符!"); + } + // 修改不允许修改 管理员标识符 + if (ObjectUtil.isNotNull(role.getRoleId())) { + SysRole sysRole = baseMapper.selectById(role.getRoleId()); + // 如果标识符不相等 判断为修改了管理员标识符 + if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) { + if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) { + throw new ServiceException("不允许修改系统内置管理员角色标识符!"); + } else if (StringUtils.equalsAny(role.getRoleKey(), keys)) { + throw new ServiceException("不允许使用系统内置管理员角色标识符!"); + } + } + } + } + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + @Override + public void checkRoleDataScope(Long roleId) { + if (ObjectUtil.isNull(roleId)) { + return; + } + if (LoginHelper.isSuperAdmin()) { + return; + } + List roles = this.selectRoleList(new SysRoleBo(roleId)); + if (CollUtil.isEmpty(roles)) { + throw new ServiceException("没有权限访问角色数据!"); + } + + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public long countUserRoleByRoleId(Long roleId) { + return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + } + + /** + * 新增保存角色信息 + * + * @param bo 角色信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertRole(SysRoleBo bo) { + SysRole role = MapstructUtils.convert(bo, SysRole.class); + // 新增角色信息 + baseMapper.insert(role); + bo.setRoleId(role.getRoleId()); + return insertRoleMenu(bo); + } + + /** + * 修改保存角色信息 + * + * @param bo 角色信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateRole(SysRoleBo bo) { + SysRole role = MapstructUtils.convert(bo, SysRole.class); + + if (SystemConstants.DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) { + throw new ServiceException("角色已分配,不能禁用!"); + } + // 修改角色信息 + baseMapper.updateById(role); + // 删除角色与菜单关联 + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, role.getRoleId())); + return insertRoleMenu(bo); + } + + /** + * 修改角色状态 + * + * @param roleId 角色ID + * @param status 角色状态 + * @return 结果 + */ + @Override + public int updateRoleStatus(Long roleId, String status) { + if (SystemConstants.DISABLE.equals(status) && this.countUserRoleByRoleId(roleId) > 0) { + throw new ServiceException("角色已分配,不能禁用!"); + } + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysRole::getStatus, status) + .eq(SysRole::getRoleId, roleId)); + } + + /** + * 修改数据权限信息 + * + * @param bo 角色信息 + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#bo.roleId") + @Override + @Transactional(rollbackFor = Exception.class) + public int authDataScope(SysRoleBo bo) { + SysRole role = MapstructUtils.convert(bo, SysRole.class); + // 修改角色信息 + baseMapper.updateById(role); + // 删除角色与部门关联 + roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, role.getRoleId())); + // 新增角色和部门信息(数据权限) + return insertRoleDept(bo); + } + + /** + * 新增角色菜单信息 + * + * @param role 角色对象 + */ + private int insertRoleMenu(SysRoleBo role) { + int rows = 1; + // 新增用户与角色管理 + List list = new ArrayList<>(); + for (Long menuId : role.getMenuIds()) { + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(role.getRoleId()); + rm.setMenuId(menuId); + list.add(rm); + } + if (list.size() > 0) { + rows = roleMenuMapper.insertBatch(list) ? list.size() : 0; + } + return rows; + } + + /** + * 新增角色部门信息(数据权限) + * + * @param role 角色对象 + */ + private int insertRoleDept(SysRoleBo role) { + int rows = 1; + // 新增角色与部门(数据权限)管理 + List list = new ArrayList<>(); + for (Long deptId : role.getDeptIds()) { + SysRoleDept rd = new SysRoleDept(); + rd.setRoleId(role.getRoleId()); + rd.setDeptId(deptId); + list.add(rd); + } + if (list.size() > 0) { + rows = roleDeptMapper.insertBatch(list) ? list.size() : 0; + } + return rows; + } + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId") + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteRoleById(Long roleId) { + // 删除角色与菜单关联 + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, roleId)); + // 删除角色与部门关联 + roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, roleId)); + return baseMapper.deleteById(roleId); + } + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, allEntries = true) + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteRoleByIds(Long[] roleIds) { + for (Long roleId : roleIds) { + SysRole role = baseMapper.selectById(roleId); + checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class)); + checkRoleDataScope(roleId); + if (countUserRoleByRoleId(roleId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除!", role.getRoleName())); + } + } + List ids = Arrays.asList(roleIds); + // 删除角色与菜单关联 + roleMenuMapper.delete(new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, ids)); + // 删除角色与部门关联 + roleDeptMapper.delete(new LambdaQueryWrapper().in(SysRoleDept::getRoleId, ids)); + return baseMapper.deleteByIds(ids); + } + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + @Override + public int deleteAuthUser(SysUserRole userRole) { + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysUserRole::getRoleId, userRole.getRoleId()) + .eq(SysUserRole::getUserId, userRole.getUserId())); + if (rows > 0) { + cleanOnlineUser(List.of(userRole.getUserId())); + } + return rows; + } + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + @Override + public int deleteAuthUsers(Long roleId, Long[] userIds) { + List ids = List.of(userIds); + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysUserRole::getRoleId, roleId) + .in(SysUserRole::getUserId, ids)); + if (rows > 0) { + cleanOnlineUser(ids); + } + return rows; + } + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要授权的用户数据ID + * @return 结果 + */ + @Override + public int insertAuthUsers(Long roleId, Long[] userIds) { + // 新增用户与角色管理 + int rows = 1; + List ids = List.of(userIds); + List list = StreamUtils.toList(ids, userId -> { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + return ur; + }); + if (CollUtil.isNotEmpty(list)) { + rows = userRoleMapper.insertBatch(list) ? list.size() : 0; + } + if (rows > 0) { + cleanOnlineUser(ids); + } + return rows; + } + + @Override + public void cleanOnlineUserByRole(Long roleId) { + // 如果角色未绑定用户 直接返回 + Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + if (num == 0) { + return; + } + List keys = StpUtil.searchTokenValue("", 0, -1, false); + if (CollUtil.isEmpty(keys)) { + return; + } + // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作 + keys.parallelStream().forEach(key -> { + String token = StringUtils.substringAfterLast(key, ":"); + // 如果已经过期则跳过 + if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { + return; + } + LoginUser loginUser = LoginHelper.getLoginUser(token); + if (ObjectUtil.isNull(loginUser) || CollUtil.isEmpty(loginUser.getRoles())) { + return; + } + if (loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) { + try { + StpUtil.logoutByTokenValue(token); + } catch (NotLoginException ignored) { + } + } + }); + } + + @Override + public void cleanOnlineUser(List userIds) { + List keys = StpUtil.searchTokenValue("", 0, -1, false); + if (CollUtil.isEmpty(keys)) { + return; + } + // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作 + keys.parallelStream().forEach(key -> { + String token = StringUtils.substringAfterLast(key, ":"); + // 如果已经过期则跳过 + if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) { + return; + } + LoginUser loginUser = LoginHelper.getLoginUser(token); + if (ObjectUtil.isNull(loginUser)) { + return; + } + if (userIds.contains(loginUser.getUserId())) { + try { + StpUtil.logoutByTokenValue(token); + } catch (NotLoginException ignored) { + } + } + }); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java new file mode 100644 index 0000000..8a0d45e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java @@ -0,0 +1,47 @@ +package org.dromara.system.service.impl; + +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ArrayUtil; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.common.sensitive.core.SensitiveService; +import org.dromara.common.tenant.helper.TenantHelper; +import org.springframework.stereotype.Service; + +/** + * 脱敏服务 + * 默认管理员不过滤 + * 需自行根据业务重写实现 + * + * @author Lion Li + * @version 3.6.0 + */ +@Service +public class SysSensitiveServiceImpl implements SensitiveService { + + /** + * 是否脱敏 + */ + @Override + public boolean isSensitive(String[] roleKey, String[] perms) { + if (!LoginHelper.isLogin()) { + return true; + } + boolean roleExist = ArrayUtil.isNotEmpty(roleKey); + boolean permsExist = ArrayUtil.isNotEmpty(perms); + if (roleExist && permsExist) { + if (StpUtil.hasRoleOr(roleKey) && StpUtil.hasPermissionOr(perms)) { + return false; + } + } else if (roleExist && StpUtil.hasRoleOr(roleKey)) { + return false; + } else if (permsExist && StpUtil.hasPermissionOr(perms)) { + return false; + } + + if (TenantHelper.isEnable()) { + return !LoginHelper.isSuperAdmin() && !LoginHelper.isTenantAdmin(); + } + return !LoginHelper.isSuperAdmin(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java new file mode 100644 index 0000000..9c54cbc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java @@ -0,0 +1,112 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.system.domain.SysSocial; +import org.dromara.system.domain.bo.SysSocialBo; +import org.dromara.system.domain.vo.SysSocialVo; +import org.dromara.system.mapper.SysSocialMapper; +import org.dromara.system.service.ISysSocialService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 社会化关系Service业务层处理 + * + * @author thiszhc + * @date 2023-06-12 + */ +@RequiredArgsConstructor +@Service +public class SysSocialServiceImpl implements ISysSocialService { + + private final SysSocialMapper baseMapper; + + + /** + * 查询社会化关系 + */ + @Override + public SysSocialVo queryById(String id) { + return baseMapper.selectVoById(id); + } + + /** + * 授权列表 + */ + @Override + public List queryList(SysSocialBo bo) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId()) + .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId()) + .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource()); + return baseMapper.selectVoList(lqw); + } + + @Override + public List queryListByUserId(Long userId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getUserId, userId)); + } + + + /** + * 新增社会化关系 + */ + @Override + public Boolean insertByBo(SysSocialBo bo) { + SysSocial add = MapstructUtils.convert(bo, SysSocial.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + if (add != null) { + bo.setId(add.getId()); + } else { + return false; + } + } + return flag; + } + + /** + * 更新社会化关系 + */ + @Override + public Boolean updateByBo(SysSocialBo bo) { + SysSocial update = MapstructUtils.convert(bo, SysSocial.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysSocial entity) { + //TODO 做一些数据校验,如唯一约束 + } + + + /** + * 删除社会化关系 + */ + @Override + public Boolean deleteWithValidById(Long id) { + return baseMapper.deleteById(id) > 0; + } + + + /** + * 根据 authId 查询用户信息 + * + * @param authId 认证id + * @return 授权信息 + */ + @Override + public List selectByAuthId(String authId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getAuthId, authId)); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java new file mode 100644 index 0000000..2fbf240 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -0,0 +1,172 @@ +package org.dromara.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.dto.TaskAssigneeDTO; +import org.dromara.common.core.domain.model.TaskAssigneeBody; +import org.dromara.common.core.service.TaskAssigneeService; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.system.domain.SysDept; +import org.dromara.system.domain.SysPost; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysDeptMapper; +import org.dromara.system.mapper.SysPostMapper; +import org.dromara.system.mapper.SysRoleMapper; +import org.dromara.system.mapper.SysUserMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 工作流设计器获取任务执行人 + * + * @author Lion Li + */ +@RequiredArgsConstructor +@Service +public class SysTaskAssigneeServiceImpl implements TaskAssigneeService { + + private final SysPostMapper postMapper; + private final SysDeptMapper deptMapper; + private final SysUserMapper userMapper; + private final SysRoleMapper roleMapper; + + /** + * 查询角色并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + @Override + public TaskAssigneeDTO selectRolesByTaskAssigneeList(TaskAssigneeBody taskQuery) { + PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("r.del_flag", SystemConstants.NORMAL) + .eq("r.status", SystemConstants.NORMAL) + .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "r.role_name", taskQuery.getHandlerCode()) + .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "r.role_key", taskQuery.getHandlerName()) + .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()), + "r.create_time", taskQuery.getBeginTime(), taskQuery.getEndTime()) + .orderByAsc("r.role_sort").orderByAsc("r.create_time"); + Page page = roleMapper.selectPageRoleList(pageQuery.build(), wrapper); + // 使用封装的字段映射方法进行转换 + List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(), + SysRoleVo::getRoleId, SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime); + return new TaskAssigneeDTO(page.getTotal(), handlers); + } + + /** + * 查询岗位并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + @Override + public TaskAssigneeDTO selectPostsByTaskAssigneeList(TaskAssigneeBody taskQuery) { + PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(SysPost::getStatus, SystemConstants.NORMAL) + .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysPost::getPostCategory, taskQuery.getHandlerCode()) + .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysPost::getPostName, taskQuery.getHandlerName()) + .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()), + SysPost::getCreateTime, taskQuery.getBeginTime(), taskQuery.getEndTime()); + if (StringUtils.isNotBlank(taskQuery.getGroupId())) { + Long belongDeptId = Long.valueOf(taskQuery.getGroupId()); + wrapper.and(x -> { + List deptList = deptMapper.selectListByParentId(belongDeptId); + List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId); + deptIds.add(belongDeptId); + x.in(SysPost::getDeptId, deptIds); + }); + } + Page page = postMapper.selectPagePostList(pageQuery.build(), wrapper); + // 使用封装的字段映射方法进行转换 + List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(), + SysPostVo::getPostId, SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getDeptId, SysPostVo::getCreateTime); + return new TaskAssigneeDTO(page.getTotal(), handlers); + } + + /** + * 查询部门并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + @Override + public TaskAssigneeDTO selectDeptsByTaskAssigneeList(TaskAssigneeBody taskQuery) { + PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(SysDept::getDelFlag, SystemConstants.NORMAL) + .eq(SysDept::getStatus, SystemConstants.NORMAL) + .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysDept::getDeptCategory, taskQuery.getHandlerCode()) + .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysDept::getDeptName, taskQuery.getHandlerName()) + .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()), + SysDept::getCreateTime, taskQuery.getBeginTime(), taskQuery.getEndTime()) + .orderByAsc(SysDept::getAncestors) + .orderByAsc(SysDept::getParentId) + .orderByAsc(SysDept::getOrderNum) + .orderByAsc(SysDept::getDeptId); + if (StringUtils.isNotBlank(taskQuery.getGroupId())) { + //部门树搜索 + wrapper.and(x -> { + Long parentId = Long.valueOf(taskQuery.getGroupId()); + List deptList = deptMapper.selectListByParentId(parentId); + List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId); + deptIds.add(parentId); + x.in(SysDept::getDeptId, deptIds); + }); + } + Page page = deptMapper.selectPageDeptList(pageQuery.build(), wrapper); + // 使用封装的字段映射方法进行转换 + List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(), + SysDeptVo::getDeptId, SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, SysDeptVo::getParentId, SysDeptVo::getCreateTime); + return new TaskAssigneeDTO(page.getTotal(), handlers); + } + + + /** + * 查询用户并返回任务指派的列表,支持分页 + * + * @param taskQuery 查询条件 + * @return 办理人 + */ + @Override + public TaskAssigneeDTO selectUsersByTaskAssigneeList(TaskAssigneeBody taskQuery) { + PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum()); + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("u.del_flag", SystemConstants.NORMAL) + .eq("u.status", SystemConstants.NORMAL) + .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "u.user_name", taskQuery.getHandlerCode()) + .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "u.nick_name", taskQuery.getHandlerName()) + .between(taskQuery.getBeginTime() != null && taskQuery.getEndTime() != null, + "u.create_time", taskQuery.getBeginTime(), taskQuery.getEndTime()) + .orderByAsc("u.user_id"); + if (StringUtils.isNotBlank(taskQuery.getGroupId())) { + //部门树搜索 + wrapper.and(x -> { + Long parentId = Long.valueOf(taskQuery.getGroupId()); + List deptList = deptMapper.selectListByParentId(parentId); + List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId); + deptIds.add(parentId); + x.in("u.dept_id", deptIds); + }); + } + Page page = userMapper.selectPageUserList(pageQuery.build(), wrapper); + // 使用封装的字段映射方法进行转换 + List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(), + SysUserVo::getUserId, SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getDeptId, SysUserVo::getCreateTime); + return new TaskAssigneeDTO(page.getTotal(), handlers); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java new file mode 100644 index 0000000..8d69e96 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java @@ -0,0 +1,157 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysTenant; +import org.dromara.system.domain.SysTenantPackage; +import org.dromara.system.domain.bo.SysTenantPackageBo; +import org.dromara.system.domain.vo.SysTenantPackageVo; +import org.dromara.system.mapper.SysTenantMapper; +import org.dromara.system.mapper.SysTenantPackageMapper; +import org.dromara.system.service.ISysTenantPackageService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +/** + * 租户套餐Service业务层处理 + * + * @author Michelle.Chung + */ +@RequiredArgsConstructor +@Service +public class SysTenantPackageServiceImpl implements ISysTenantPackageService { + + private final SysTenantPackageMapper baseMapper; + private final SysTenantMapper tenantMapper; + + /** + * 查询租户套餐 + */ + @Override + public SysTenantPackageVo queryById(Long packageId){ + return baseMapper.selectVoById(packageId); + } + + /** + * 查询租户套餐列表 + */ + @Override + public TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List selectList() { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(SysTenantPackage::getStatus, SystemConstants.NORMAL)); + } + + /** + * 查询租户套餐列表 + */ + @Override + public List queryList(SysTenantPackageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysTenantPackageBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getPackageName()), SysTenantPackage::getPackageName, bo.getPackageName()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenantPackage::getStatus, bo.getStatus()); + lqw.orderByAsc(SysTenantPackage::getPackageId); + return lqw; + } + + /** + * 新增租户套餐 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(SysTenantPackageBo bo) { + SysTenantPackage add = MapstructUtils.convert(bo, SysTenantPackage.class); + // 保存菜单id + List menuIds = Arrays.asList(bo.getMenuIds()); + if (CollUtil.isNotEmpty(menuIds)) { + add.setMenuIds(StringUtils.join(menuIds, ", ")); + } else { + add.setMenuIds(""); + } + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPackageId(add.getPackageId()); + } + return flag; + } + + /** + * 修改租户套餐 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(SysTenantPackageBo bo) { + SysTenantPackage update = MapstructUtils.convert(bo, SysTenantPackage.class); + // 保存菜单id + List menuIds = Arrays.asList(bo.getMenuIds()); + if (CollUtil.isNotEmpty(menuIds)) { + update.setMenuIds(StringUtils.join(menuIds, ", ")); + } else { + update.setMenuIds(""); + } + return baseMapper.updateById(update) > 0; + } + + /** + * 校验套餐名称是否唯一 + */ + @Override + public boolean checkPackageNameUnique(SysTenantPackageBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysTenantPackage::getPackageName, bo.getPackageName()) + .ne(ObjectUtil.isNotNull(bo.getPackageId()), SysTenantPackage::getPackageId, bo.getPackageId())); + return !exist; + } + + /** + * 修改套餐状态 + * + * @param bo 套餐信息 + * @return 结果 + */ + @Override + public int updatePackageStatus(SysTenantPackageBo bo) { + SysTenantPackage tenantPackage = MapstructUtils.convert(bo, SysTenantPackage.class); + return baseMapper.updateById(tenantPackage); + } + + /** + * 批量删除租户套餐 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysTenant::getPackageId, ids)); + if (exists) { + throw new ServiceException("租户套餐已被使用"); + } + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java new file mode 100644 index 0000000..f7c05db --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -0,0 +1,570 @@ +package org.dromara.system.service.impl; + +import cn.dev33.satoken.secure.BCrypt; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.Constants; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.constant.TenantConstants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.WorkflowService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.redis.utils.CacheUtils; +import org.dromara.common.tenant.core.TenantEntity; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.system.domain.*; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantSumVo; +import org.dromara.system.domain.vo.SysTenantVo; +import org.dromara.system.mapper.*; +import org.dromara.system.service.ISysTenantService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; + +/** + * 租户Service业务层处理 + * + * @author Michelle.Chung + */ +@RequiredArgsConstructor +@Service +public class SysTenantServiceImpl implements ISysTenantService { + + private final SysTenantMapper baseMapper; + private final SysTenantPackageMapper tenantPackageMapper; + private final SysUserMapper userMapper; + private final SysDeptMapper deptMapper; + private final SysRoleMapper roleMapper; + private final SysRoleMenuMapper roleMenuMapper; + private final SysRoleDeptMapper roleDeptMapper; + private final SysUserRoleMapper userRoleMapper; + private final SysDictTypeMapper dictTypeMapper; + private final SysDictDataMapper dictDataMapper; + private final SysConfigMapper configMapper; + + /** + * 查询租户 + */ + @Override + public SysTenantVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 基于租户ID查询租户 + */ + @Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId") + @Override + public SysTenantVo queryByTenantId(String tenantId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantId)); + } + + /** + * 基于租户编码查询租户 + * @param tenantCode + * @return + */ + @Override + public SysTenantVo queryByTenantCode(String tenantCode) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysTenant::getTenantCode, tenantCode)); + } + + /** + * 基于租户编码查询租户 + * + * @param tenantCode + */ + @Override + public SysTenant queryByCode(String tenantCode) { + return baseMapper.selectOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantCode)); + } + + /** + * 查询租户列表 + */ + @Override + public TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询租户统计信息 + * + * @param bo + */ + @Override + public SysTenantSumVo querySum(SysTenantBo bo) { + SysTenantSumVo sumVo = new SysTenantSumVo(); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + // 查询用户总数 + sumVo.setTotalNum(baseMapper.selectCount(lqw)); + + // 查询总余额 + BigDecimal totalBalance = baseMapper.selectList(lqw) + .stream() + .map(SysTenant::getBalance) + .reduce(BigDecimal.ZERO, BigDecimal::add); + sumVo.setTotalBalance(totalBalance); + + return sumVo; + } + + /** + * 查询租户列表 + */ + @Override + public List queryList(SysTenantBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + /** + * 根据tenantId获取租户信息 + * + * @param tenantId + * @return + */ + @Override + public SysTenantVo getTenantById(String tenantId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantId)); + } + + /** + * @param tenantId + * @return + */ + @Override + public SysTenant getTenantByTenantId(String tenantId) { + return baseMapper.selectOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantId)); + } + + private LambdaQueryWrapper buildQueryWrapper(SysTenantBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), SysTenant::getContactUserName, bo.getContactUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), SysTenant::getContactPhone, bo.getContactPhone()); + lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysTenant::getCompanyName, bo.getCompanyName()); + lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysTenant::getLicenseNumber, bo.getLicenseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysTenant::getAddress, bo.getAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysTenant::getIntro, bo.getIntro()); + lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysTenant::getDomain, bo.getDomain()); + lqw.eq(bo.getPackageId() != null, SysTenant::getPackageId, bo.getPackageId()); + lqw.eq(bo.getExpireTime() != null, SysTenant::getExpireTime, bo.getExpireTime()); + lqw.eq(bo.getAccountCount() != null, SysTenant::getAccountCount, bo.getAccountCount()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenant::getStatus, bo.getStatus()); + lqw.like(StringUtils.isNotBlank(bo.getRemark()), SysTenant::getRemark, bo.getRemark()); + lqw.orderByAsc(SysTenant::getId); + return lqw; + } + + /** + * 新增租户 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(SysTenantBo bo) { + boolean exists = baseMapper.exists(new LambdaQueryWrapper().eq(SysTenant::getTenantCode, bo.getTenantCode())); + + if(exists){ + throw new ServiceException("商家编号已存在"); + } + + SysTenant add = MapstructUtils.convert(bo, SysTenant.class); + // 获取所有租户编号 + List tenantIds = baseMapper.selectObjs( + new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> { + return Convert.toStr(x); + }); + String tenantId = generateTenantId(tenantIds); + add.setTenantId(tenantId); + boolean flag = baseMapper.insert(add) > 0; + if (!flag) { + throw new ServiceException("创建租户失败"); + } + bo.setId(add.getId()); + + // 根据套餐创建角色 + Long roleId = createTenantRole(tenantId, bo.getPackageId()); + + // 创建部门: 公司名是部门名称 + SysDept dept = new SysDept(); + dept.setTenantId(tenantId); + dept.setDeptName(bo.getCompanyName()); + dept.setParentId(Constants.TOP_PARENT_ID); + dept.setAncestors(Constants.TOP_PARENT_ID.toString()); + deptMapper.insert(dept); + Long deptId = dept.getDeptId(); + + // 角色和部门关联表 + SysRoleDept roleDept = new SysRoleDept(); + roleDept.setRoleId(roleId); + roleDept.setDeptId(deptId); + roleDeptMapper.insert(roleDept); + + // 创建系统用户 + SysUser user = new SysUser(); + user.setTenantId(tenantId); + user.setUserType("zh_user"); + user.setUserName(bo.getUsername()); + user.setNickName(bo.getCompanyName()); + user.setPassword(BCrypt.hashpw(bo.getPassword())); + user.setDeptId(deptId); + userMapper.insert(user); + //新增系统用户后,默认当前用户为部门的负责人 + SysDept sd = new SysDept(); + sd.setLeader(user.getUserId()); + sd.setDeptId(deptId); + deptMapper.updateById(sd); + + // 用户和角色关联表 + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(user.getUserId()); + userRole.setRoleId(roleId); + userRoleMapper.insert(userRole); + + String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; + List dictTypeList = dictTypeMapper.selectList( + new LambdaQueryWrapper().eq(SysDictType::getTenantId, defaultTenantId)); + List dictDataList = dictDataMapper.selectList( + new LambdaQueryWrapper().eq(SysDictData::getTenantId, defaultTenantId)); + for (SysDictType dictType : dictTypeList) { + dictType.setDictId(null); + dictType.setTenantId(tenantId); + dictType.setCreateDept(null); + dictType.setCreateBy(null); + dictType.setCreateTime(null); + dictType.setUpdateBy(null); + dictType.setUpdateTime(null); + } + for (SysDictData dictData : dictDataList) { + dictData.setDictCode(null); + dictData.setTenantId(tenantId); + dictData.setCreateDept(null); + dictData.setCreateBy(null); + dictData.setCreateTime(null); + dictData.setUpdateBy(null); + dictData.setUpdateTime(null); + } + dictTypeMapper.insertBatch(dictTypeList); + dictDataMapper.insertBatch(dictDataList); + + List sysConfigList = configMapper.selectList( + new LambdaQueryWrapper().eq(SysConfig::getTenantId, defaultTenantId)); + for (SysConfig config : sysConfigList) { + config.setConfigId(null); + config.setTenantId(tenantId); + config.setCreateDept(null); + config.setCreateBy(null); + config.setCreateTime(null); + config.setUpdateBy(null); + config.setUpdateTime(null); + } + configMapper.insertBatch(sysConfigList); + + // 未开启工作流不执行下方操作 + if (SpringUtils.getProperty("warm-flow.enabled", Boolean.class, false)) { + WorkflowService workflowService = SpringUtils.getBean(WorkflowService.class); + // 新增租户流程定义 + workflowService.syncDef(tenantId); + } + return true; + } + + /** + * 生成租户id + * + * @param tenantIds 已有租户id列表 + * @return 租户id + */ + private String generateTenantId(List tenantIds) { + // 随机生成6位 + String numbers = RandomUtil.randomNumbers(6); + // 判断是否存在,如果存在则重新生成 + if (tenantIds.contains(numbers)) { + return generateTenantId(tenantIds); + } + return numbers; + } + + /** + * 根据租户菜单创建租户角色 + * + * @param tenantId 租户编号 + * @param packageId 租户套餐id + * @return 角色id + */ + private Long createTenantRole(String tenantId, Long packageId) { + // 获取租户套餐 + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + if (ObjectUtil.isNull(tenantPackage)) { + throw new ServiceException("套餐不存在"); + } + // 获取套餐菜单id + List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); + + // 创建角色 + SysRole role = new SysRole(); + role.setTenantId(tenantId); + role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); + role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); + role.setRoleSort(1); + role.setStatus(SystemConstants.NORMAL); + roleMapper.insert(role); + Long roleId = role.getRoleId(); + + // 创建角色菜单 + List roleMenus = new ArrayList<>(menuIds.size()); + menuIds.forEach(menuId -> { + SysRoleMenu roleMenu = new SysRoleMenu(); + roleMenu.setRoleId(roleId); + roleMenu.setMenuId(menuId); + roleMenus.add(roleMenu); + }); + roleMenuMapper.insertBatch(roleMenus); + + return roleId; + } + + /** + * 修改租户 + */ + @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") + @Override + public Boolean updateByBo(SysTenantBo bo) { + SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); + tenant.setTenantId(null); + tenant.setPackageId(null); + return baseMapper.updateById(tenant) > 0; + } + + /** + * 修改租户状态 + * + * @param bo 租户信息 + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") + @Override + public int updateTenantStatus(SysTenantBo bo) { + SysTenant tenant = new SysTenant(); + tenant.setId(bo.getId()); + tenant.setStatus(bo.getStatus()); + return baseMapper.updateById(tenant); + } + + /** + * 校验租户是否允许操作 + * + * @param tenantId 租户ID + */ + @Override + public void checkTenantAllowed(String tenantId) { + if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { + throw new ServiceException("不允许操作管理租户"); + } + } + + /** + * 批量删除租户 + */ + @CacheEvict(cacheNames = CacheNames.SYS_TENANT, allEntries = true) + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + // 做一些业务上的校验,判断是否需要校验 + if (ids.contains(TenantConstants.SUPER_ADMIN_ID)) { + throw new ServiceException("超管租户不能删除"); + } + } + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 校验企业名称是否唯一 + */ + @Override + public boolean checkCompanyNameUnique(SysTenantBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysTenant::getCompanyName, bo.getCompanyName()) + .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId())); + return !exist; + } + + /** + * 校验账号余额 + */ + @Override + public boolean checkAccountBalance(String tenantId) { + SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + // 如果余额为-1代表不限制 + if (tenant.getAccountCount() == -1) { + return true; + } + Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>()); + // 如果余额大于0代表还有可用名额 + return tenant.getAccountCount() - userNumber > 0; + } + + /** + * 校验有效期 + */ + @Override + public boolean checkExpireTime(String tenantId) { + SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + // 如果未设置过期时间代表不限制 + if (ObjectUtil.isNull(tenant.getExpireTime())) { + return true; + } + // 如果当前时间在过期时间之前则通过 + return new Date().before(tenant.getExpireTime()); + } + + /** + * 同步租户套餐 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean syncTenantPackage(String tenantId, Long packageId) { + SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + List roles = roleMapper.selectList( + new LambdaQueryWrapper().eq(SysRole::getTenantId, tenantId)); + List roleIds = new ArrayList<>(roles.size() - 1); + List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); + roles.forEach(item -> { + if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) { + List roleMenus = new ArrayList<>(menuIds.size()); + menuIds.forEach(menuId -> { + SysRoleMenu roleMenu = new SysRoleMenu(); + roleMenu.setRoleId(item.getRoleId()); + roleMenu.setMenuId(menuId); + roleMenus.add(roleMenu); + }); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, item.getRoleId())); + roleMenuMapper.insertBatch(roleMenus); + } else { + roleIds.add(item.getRoleId()); + } + }); + if (!roleIds.isEmpty()) { + roleMenuMapper.delete( + new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysRoleMenu::getMenuId, menuIds)); + } + return true; + } + + + /** + * 同步租户字典 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void syncTenantDict() { + // 查询超管 所有字典数据 + List dictTypeList = new ArrayList<>(); + List dictDataList = new ArrayList<>(); + TenantHelper.ignore(() -> { + dictTypeList.addAll(dictTypeMapper.selectList()); + dictDataList.addAll(dictDataMapper.selectList()); + }); + Map> typeMap = StreamUtils.groupByKey(dictTypeList, TenantEntity::getTenantId); + Map>> typeDataMap = StreamUtils.groupBy2Key( + dictDataList, TenantEntity::getTenantId, SysDictData::getDictType); + // 管理租户字典数据 + List defaultTypeMap = typeMap.get(TenantConstants.DEFAULT_TENANT_ID); + Map> defaultTypeDataMap = typeDataMap.get(TenantConstants.DEFAULT_TENANT_ID); + + // 获取所有租户编号 + List tenantIds = baseMapper.selectObjs( + new LambdaQueryWrapper().select(SysTenant::getTenantId) + .eq(SysTenant::getStatus, SystemConstants.NORMAL), x -> { + return Convert.toStr(x); + }); + List saveTypeList = new ArrayList<>(); + List saveDataList = new ArrayList<>(); + Set set = new HashSet<>(); + for (String tenantId : tenantIds) { + if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { + continue; + } + for (SysDictType dictType : defaultTypeMap) { + List typeList = StreamUtils.toList(typeMap.get(tenantId), SysDictType::getDictType); + List dataList = defaultTypeDataMap.get(dictType.getDictType()); + if (typeList.contains(dictType.getDictType())) { + List dataListTenant = typeDataMap.get(tenantId).get(dictType.getDictType()); + Map map = StreamUtils.toIdentityMap(dataListTenant, SysDictData::getDictValue); + for (SysDictData dictData : dataList) { + if (!map.containsKey(dictData.getDictValue())) { + SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); + // 设置字典编码为 null + data.setDictCode(null); + data.setTenantId(tenantId); + data.setCreateTime(null); + data.setUpdateTime(null); + data.setCreateDept(null); + data.setCreateBy(null); + data.setUpdateBy(null); + set.add(tenantId); + saveDataList.add(data); + } + } + } else { + SysDictType type = BeanUtil.toBean(dictType, SysDictType.class); + type.setDictId(null); + type.setTenantId(tenantId); + type.setCreateTime(null); + type.setUpdateTime(null); + set.add(tenantId); + saveTypeList.add(type); + if (CollUtil.isNotEmpty(dataList)) { + // 筛选出 dictType 对应的 data + for (SysDictData dictData : dataList) { + SysDictData data = BeanUtil.toBean(dictData, SysDictData.class); + // 设置字典编码为 null + data.setDictCode(null); + data.setTenantId(tenantId); + data.setCreateTime(null); + data.setUpdateTime(null); + data.setCreateDept(null); + data.setCreateBy(null); + data.setUpdateBy(null); + set.add(tenantId); + saveDataList.add(data); + } + } + } + } + } + TenantHelper.ignore(() -> { + if (CollUtil.isNotEmpty(saveTypeList)) { + dictTypeMapper.insertBatch(saveTypeList); + } + if (CollUtil.isNotEmpty(saveDataList)) { + dictDataMapper.insertBatch(saveDataList); + } + }); + for (String tenantId : set) { + TenantHelper.dynamic(tenantId, () -> CacheUtils.clear(CacheNames.SYS_DICT)); + } + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..51bd5cc --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -0,0 +1,724 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.constant.CacheNames; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.UserService; +import org.dromara.common.core.utils.*; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.domain.*; +import org.dromara.system.domain.bo.SysUserBo; +import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.domain.vo.SysUserExportVo; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.*; +import org.dromara.system.service.ISysUserService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * 用户 业务层处理 + * + * @author Lion Li + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SysUserServiceImpl implements ISysUserService, UserService { + + private final SysUserMapper baseMapper; + private final SysDeptMapper deptMapper; + private final SysRoleMapper roleMapper; + private final SysPostMapper postMapper; + private final SysUserRoleMapper userRoleMapper; + private final SysUserPostMapper userPostMapper; + + @Override + public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { + Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); + return TableDataInfo.build(page); + } + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUserExportList(SysUserBo user) { + return baseMapper.selectUserExportList(this.buildQueryWrapper(user)); + } + + private Wrapper buildQueryWrapper(SysUserBo user) { + Map params = user.getParams(); + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("u.del_flag", SystemConstants.NORMAL) + .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId()) + .eq(ObjectUtil.isNotNull(user.getTenantId()), "u.tenant_id", user.getTenantId()) + .eq(ObjectUtil.isNotNull(user.getUserType()), "u.user_type", user.getUserType()) + .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) + .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) + .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) + .between(params.get("beginTime") != null && params.get("endTime") != null, + "u.create_time", params.get("beginTime"), params.get("endTime")) + .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { + List deptList = deptMapper.selectListByParentId(user.getDeptId()); + List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + ids.add(user.getDeptId()); + w.in("u.dept_id", ids); + }).orderByAsc("u.user_id"); + if (StringUtils.isNotBlank(user.getExcludeUserIds())) { + wrapper.notIn("u.user_id", StringUtils.splitTo(user.getExcludeUserIds(), Convert::toLong)); + } + return wrapper; + } + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery) { + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("u.del_flag", SystemConstants.NORMAL) + .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) + .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) + .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) + .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) + .orderByAsc("u.user_id"); + Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); + return TableDataInfo.build(page); + } + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { + List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); + QueryWrapper wrapper = Wrappers.query(); + wrapper.eq("u.del_flag", SystemConstants.NORMAL) + .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id")) + .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds) + .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) + .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) + .orderByAsc("u.user_id"); + Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); + return TableDataInfo.build(page); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUserVo selectUserByUserName(String userName) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, userName)); + } + + /** + * 通过手机号查询用户 + * + * @param phonenumber 手机号 + * @return 用户对象信息 + */ + @Override + public SysUserVo selectUserByPhonenumber(String phonenumber) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhonenumber, phonenumber)); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUserVo selectUserById(Long userId) { + SysUserVo user = baseMapper.selectVoById(userId); + if (ObjectUtil.isNull(user)) { + return user; + } + user.setRoles(roleMapper.selectRolesByUserId(user.getUserId())); + return user; + } + + /** + * 通过用户ID串查询用户 + * + * @param userIds 用户ID串 + * @param deptId 部门id + * @return 用户列表信息 + */ + @Override + public List selectUserByIds(List userIds, Long deptId) { + return baseMapper.selectUserList(new LambdaQueryWrapper() + .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName) + .eq(SysUser::getStatus, SystemConstants.NORMAL) + .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) + .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds)); + } + + /** + * 查询用户所属角色组 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public String selectUserRoleGroup(Long userId) { + List list = roleMapper.selectRolesByUserId(userId); + if (CollUtil.isEmpty(list)) { + return StringUtils.EMPTY; + } + return StreamUtils.join(list, SysRoleVo::getRoleName); + } + + /** + * 查询用户所属岗位组 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + public String selectUserPostGroup(Long userId) { + List list = postMapper.selectPostsByUserId(userId); + if (CollUtil.isEmpty(list)) { + return StringUtils.EMPTY; + } + return StreamUtils.join(list, SysPostVo::getPostName); + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean checkUserNameUnique(SysUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysUser::getUserName, user.getUserName()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + return !exist; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + */ + @Override + public boolean checkPhoneUnique(SysUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysUser::getPhonenumber, user.getPhonenumber()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + return !exist; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + */ + @Override + public boolean checkEmailUnique(SysUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysUser::getEmail, user.getEmail()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + return !exist; + } + + /** + * 校验用户是否允许操作 + * + * @param userId 用户ID + */ + @Override + public void checkUserAllowed(Long userId) { + if (ObjectUtil.isNotNull(userId) && LoginHelper.isSuperAdmin(userId)) { + throw new ServiceException("不允许操作超级管理员用户"); + } + } + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + @Override + public void checkUserDataScope(Long userId) { + if (ObjectUtil.isNull(userId)) { + return; + } + if (LoginHelper.isSuperAdmin()) { + return; + } + if (baseMapper.countUserById(userId) == 0) { + throw new ServiceException("没有权限访问用户数据!"); + } + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertUser(SysUserBo user) { + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); + // 新增用户信息 + int rows = baseMapper.insert(sysUser); + user.setUserId(sysUser.getUserId()); + // 新增用户岗位关联 + insertUserPost(user, false); + // 新增用户与角色管理 + insertUserRole(user, false); + return rows; + } + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean registerUser(SysUserBo user, String tenantId) { + user.setCreateBy(0L); + user.setUpdateBy(0L); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); + sysUser.setTenantId(tenantId); + return baseMapper.insert(sysUser) > 0; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") + @Transactional(rollbackFor = Exception.class) + public int updateUser(SysUserBo user) { + // 新增用户与角色管理 + insertUserRole(user, true); + // 新增用户与岗位管理 + insertUserPost(user, true); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); + // 防止错误更新后导致的数据误删除 + int flag = baseMapper.updateById(sysUser); + if (flag < 1) { + throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); + } + return flag; + } + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void insertUserAuth(Long userId, Long[] roleIds) { + insertUserRole(userId, roleIds, true); + } + + /** + * 修改用户状态 + * + * @param userId 用户ID + * @param status 帐号状态 + * @return 结果 + */ + @Override + public int updateUserStatus(Long userId, String status) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysUser::getStatus, status) + .eq(SysUser::getUserId, userId)); + } + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") + @Override + public int updateUserProfile(SysUserBo user) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName()) + .set(SysUser::getPhonenumber, user.getPhonenumber()) + .set(SysUser::getEmail, user.getEmail()) + .set(SysUser::getSex, user.getSex()) + .eq(SysUser::getUserId, user.getUserId())); + } + + /** + * 修改用户头像 + * + * @param userId 用户ID + * @param avatar 头像地址 + * @return 结果 + */ + @Override + public boolean updateUserAvatar(Long userId, Long avatar) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysUser::getAvatar, avatar) + .eq(SysUser::getUserId, userId)) > 0; + } + + /** + * 重置用户密码 + * + * @param userId 用户ID + * @param password 密码 + * @return 结果 + */ + @Override + public int resetUserPwd(Long userId, String password) { + return baseMapper.update(null, + new LambdaUpdateWrapper() + .set(SysUser::getPassword, password) + .eq(SysUser::getUserId, userId)); + } + + /** + * 新增用户角色信息 + * + * @param user 用户对象 + * @param clear 清除已存在的关联数据 + */ + private void insertUserRole(SysUserBo user, boolean clear) { + this.insertUserRole(user.getUserId(), user.getRoleIds(), clear); + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + * @param clear 清除已存在的关联数据 + */ + private void insertUserPost(SysUserBo user, boolean clear) { + Long[] posts = user.getPostIds(); + if (ArrayUtil.isNotEmpty(posts)) { + if (clear) { + // 删除用户与岗位关联 + userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, user.getUserId())); + } + // 新增用户与岗位管理 + List list = StreamUtils.toList(List.of(posts), postId -> { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + return up; + }); + userPostMapper.insertBatch(list); + } + } + + /** + * 新增用户角色信息 + * + * @param userId 用户ID + * @param roleIds 角色组 + * @param clear 清除已存在的关联数据 + */ + private void insertUserRole(Long userId, Long[] roleIds, boolean clear) { + if (ArrayUtil.isNotEmpty(roleIds)) { + List roleList = new ArrayList<>(List.of(roleIds)); + if (!LoginHelper.isSuperAdmin(userId)) { + roleList.remove(SystemConstants.SUPER_ADMIN_ID); + } + // 判断是否具有此角色的操作权限 + List roles = roleMapper.selectRoleList( + new QueryWrapper().in("r.role_id", roleList)); + if (CollUtil.isEmpty(roles)) { + throw new ServiceException("没有权限访问角色的数据"); + } + if (clear) { + // 删除用户与角色关联 + userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + } + // 新增用户与角色管理 + List list = StreamUtils.toList(roleList, roleId -> { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + return ur; + }); + userRoleMapper.insertBatch(list); + } + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserById(Long userId) { + // 删除用户与角色关联 + userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + // 删除用户与岗位表 + userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); + // 防止更新失败导致的数据删除 + int flag = baseMapper.deleteById(userId); + if (flag < 1) { + throw new ServiceException("删除用户失败!"); + } + return flag; + } + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteUserByIds(Long[] userIds) { + for (Long userId : userIds) { + checkUserAllowed(userId); + checkUserDataScope(userId); + } + List ids = List.of(userIds); + // 删除用户与角色关联 + userRoleMapper.delete(new LambdaQueryWrapper().in(SysUserRole::getUserId, ids)); + // 删除用户与岗位表 + userPostMapper.delete(new LambdaQueryWrapper().in(SysUserPost::getUserId, ids)); + // 防止更新失败导致的数据删除 + int flag = baseMapper.deleteByIds(ids); + if (flag < 1) { + throw new ServiceException("删除用户失败!"); + } + return flag; + } + + /** + * 通过部门id查询当前部门所有用户 + * + * @param deptId 部门ID + * @return 用户信息集合信息 + */ + @Override + public List selectUserListByDept(Long deptId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysUser::getDeptId, deptId); + lqw.orderByAsc(SysUser::getUserId); + return baseMapper.selectVoList(lqw); + } + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ + @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") + @Override + public String selectUserNameById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getUserName).eq(SysUser::getUserId, userId)); + return ObjectUtils.notNullGetter(sysUser, SysUser::getUserName); + } + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ + @Override + @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") + public String selectNicknameById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getNickName).eq(SysUser::getUserId, userId)); + return ObjectUtils.notNullGetter(sysUser, SysUser::getNickName); + } + + /** + * 通过用户ID查询用户账户 + * + * @param userIds 用户ID 多个用逗号隔开 + * @return 用户账户 + */ + @Override + public String selectNicknameByIds(String userIds) { + List list = new ArrayList<>(); + for (Long id : StringUtils.splitTo(userIds, Convert::toLong)) { + String nickname = SpringUtils.getAopProxy(this).selectNicknameById(id); + if (StringUtils.isNotBlank(nickname)) { + list.add(nickname); + } + } + return String.join(StringUtils.SEPARATOR, list); + } + + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + @Override + public String selectPhonenumberById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId)); + return ObjectUtils.notNullGetter(sysUser, SysUser::getPhonenumber); + } + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + @Override + public String selectEmailById(Long userId) { + SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); + return ObjectUtils.notNullGetter(sysUser, SysUser::getEmail); + } + + /** + * 通过用户ID查询用户列表 + * + * @param userIds 用户ids + * @return 用户列表 + */ + @Override + public List selectListByIds(List userIds) { + if (CollUtil.isEmpty(userIds)) { + return List.of(); + } + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) + .eq(SysUser::getStatus, SystemConstants.NORMAL) + .in(SysUser::getUserId, userIds)); + return BeanUtil.copyToList(list, UserDTO.class); + } + + /** + * 通过角色ID查询用户ID + * + * @param roleIds 角色ids + * @return 用户ids + */ + @Override + public List selectUserIdsByRoleIds(List roleIds) { + if (CollUtil.isEmpty(roleIds)) { + return List.of(); + } + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); + return StreamUtils.toList(userRoles, SysUserRole::getUserId); + } + + /** + * 通过角色ID查询用户 + * + * @param roleIds 角色ids + * @return 用户 + */ + @Override + public List selectUsersByRoleIds(List roleIds) { + if (CollUtil.isEmpty(roleIds)) { + return List.of(); + } + + // 通过角色ID获取用户角色信息 + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); + + // 获取用户ID列表 + Set userIds = StreamUtils.toSet(userRoles, SysUserRole::getUserId); + + return selectListByIds(new ArrayList<>(userIds)); + } + + /** + * 通过部门ID查询用户 + * + * @param deptIds 部门ids + * @return 用户 + */ + @Override + public List selectUsersByDeptIds(List deptIds) { + if (CollUtil.isEmpty(deptIds)) { + return List.of(); + } + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) + .eq(SysUser::getStatus, SystemConstants.NORMAL) + .in(SysUser::getDeptId, deptIds)); + return BeanUtil.copyToList(list, UserDTO.class); + } + + /** + * 通过岗位ID查询用户 + * + * @param postIds 岗位ids + * @return 用户 + */ + @Override + public List selectUsersByPostIds(List postIds) { + if (CollUtil.isEmpty(postIds)) { + return List.of(); + } + + // 通过岗位ID获取用户岗位信息 + List userPosts = userPostMapper.selectList( + new LambdaQueryWrapper().in(SysUserPost::getPostId, postIds)); + + // 获取用户ID列表 + Set userIds = StreamUtils.toSet(userPosts, SysUserPost::getUserId); + + return selectListByIds(new ArrayList<>(userIds)); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml new file mode 100644 index 0000000..fd150ad --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..e542a10 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..9057a0e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..6bcce51 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..6975da4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml new file mode 100644 index 0000000..c64b551 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..9dd3f2e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..43f494d --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..5ef14ee --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml new file mode 100644 index 0000000..8c2c080 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml new file mode 100644 index 0000000..d9b25bd --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..322403f --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..1705bb2 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..4ef7b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + select distinct r.role_id, + r.role_name, + r.role_key, + r.role_sort, + r.data_scope, + r.menu_check_strictly, + r.dept_check_strictly, + r.status, + r.del_flag, + r.create_time, + r.remark + from sys_role r + left join sys_user_role sur on sur.role_id = r.role_id + left join sys_user u on u.user_id = sur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..f01dc5e --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml new file mode 100644 index 0000000..baa4b59 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml new file mode 100644 index 0000000..0d96e13 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml new file mode 100644 index 0000000..79cf4c5 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..0122d26 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..e9f2496 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..bc52d1a --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml new file mode 100644 index 0000000..d195faf --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/pom.xml @@ -0,0 +1,84 @@ + + + + org.dromara + ruoyi-modules + ${revision} + ../pom.xml + + 4.0.0 + jar + ruoyi-workflow + + + 工作流模块 + + + + + + org.dromara + ruoyi-common-sse + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-common-sms + + + + org.dromara + ruoyi-common-mybatis + + + org.dromara + ruoyi-common-web + + + org.dromara + ruoyi-common-log + + + org.dromara + ruoyi-common-idempotent + + + org.dromara + ruoyi-common-excel + + + org.dromara + ruoyi-common-translation + + + org.dromara + ruoyi-common-tenant + + + org.dromara + ruoyi-common-security + + + org.dromara.warm + warm-flow-mybatis-plus-sb3-starter + + + org.dromara.warm + warm-flow-plugin-ui-sb-web + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java new file mode 100644 index 0000000..5d24b35 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java @@ -0,0 +1,14 @@ +package org.dromara.workflow.common; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target({ ElementType.TYPE, ElementType.METHOD }) +@ConditionalOnProperty(value = "warm-flow.enabled", havingValue = "true") +public @interface ConditionalOnEnable { +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java new file mode 100644 index 0000000..1b10eb8 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java @@ -0,0 +1,66 @@ +package org.dromara.workflow.common.constant; + + +/** + * 工作流常量 + * + * @author may + */ +public interface FlowConstant { + + /** + * 流程发起人 + */ + String INITIATOR = "initiator"; + + /** + * 流程实例id + */ + String PROCESS_INSTANCE_ID = "processInstanceId"; + + /** + * 业务id + */ + String BUSINESS_ID = "businessId"; + + /** + * 任务id + */ + String TASK_ID = "taskId"; + + /** + * 委托 + */ + String DELEGATE_TASK = "delegateTask"; + + /** + * 转办 + */ + String TRANSFER_TASK = "transferTask"; + + /** + * 加签 + */ + String ADD_SIGNATURE = "addSignature"; + + /** + * 减签 + */ + String REDUCTION_SIGNATURE = "reductionSignature"; + + /** + * 流程分类Id转名称 + */ + String CATEGORY_ID_TO_NAME = "category_id_to_name"; + + /** + * 流程分类名称 + */ + String FLOW_CATEGORY_NAME = "flow_category_name#30d"; + + /** + * 默认租户OA申请分类id + */ + Long FLOW_CATEGORY_ID = 100L; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java new file mode 100644 index 0000000..0fe5cfe --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java @@ -0,0 +1,53 @@ +package org.dromara.workflow.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 消息类型枚举 + * + * @author may + */ +@Getter +@AllArgsConstructor +public enum MessageTypeEnum { + + /** + * 站内信 + */ + SYSTEM_MESSAGE("1", "站内信"), + + /** + * 邮箱 + */ + EMAIL_MESSAGE("2", "邮箱"), + + /** + * 短信 + */ + SMS_MESSAGE("3", "短信"); + + private final String code; + + private final String desc; + + private static final Map MESSAGE_TYPE_ENUM_MAP = Arrays.stream(values()) + .collect(Collectors.toConcurrentMap(MessageTypeEnum::getCode, Function.identity())); + + /** + * 根据消息类型 code 获取 MessageTypeEnum + * + * @param code 消息类型code + * @return MessageTypeEnum + */ + public static MessageTypeEnum getByCode(String code) { + return MESSAGE_TYPE_ENUM_MAP.getOrDefault(code, null); + } + +} + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java new file mode 100644 index 0000000..60be92f --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java @@ -0,0 +1,109 @@ +package org.dromara.workflow.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.dromara.common.core.exception.ServiceException; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +/** + * 任务分配人枚举 + * + * @author AprilWind + */ +@Getter +@AllArgsConstructor +public enum TaskAssigneeEnum { + + /** + * 用户 + */ + USER("用户", ""), + + /** + * 角色 + */ + ROLE("角色", "role:"), + + /** + * 部门 + */ + DEPT("部门", "dept:"), + + /** + * 岗位 + */ + POST("岗位", "post:"); + + private final String desc; + private final String code; + + /** + * 根据描述获取对应的枚举类型 + *

+ * 通过传入描述,查找并返回匹配的枚举项。如果未找到匹配项,会抛出 {@link ServiceException}。 + *

+ * + * @param desc 描述,用于匹配对应的枚举项 + * @return TaskAssigneeEnum 返回对应的枚举类型 + * @throws ServiceException 如果未找到匹配的枚举项 + */ + public static TaskAssigneeEnum fromDesc(String desc) { + for (TaskAssigneeEnum type : values()) { + if (type.getDesc().equals(desc)) { + return type; + } + } + throw new ServiceException("未知的办理人类型: " + desc); + } + + /** + * 根据代码获取对应的枚举类型 + *

+ * 通过传入代码,查找并返回匹配的枚举项。如果未找到匹配项,会抛出 {@link ServiceException}。 + *

+ * + * @param code 代码,用于匹配对应的枚举项 + * @return TaskAssigneeEnum 返回对应的枚举类型 + * @throws IllegalArgumentException 如果未找到匹配的枚举项 + */ + public static TaskAssigneeEnum fromCode(String code) { + for (TaskAssigneeEnum type : values()) { + if (type.getCode().equals(code)) { + return type; + } + } + throw new ServiceException("未知的办理人类型代码: " + code); + } + + /** + * 获取所有办理人类型的描述列表 + *

+ * 获取当前枚举类所有项的描述字段列表,通常用于展示选择项。 + *

+ * + * @return List 返回所有办理人类型的描述列表 + */ + public static List getAssigneeTypeList() { + return Arrays.stream(values()) + .map(TaskAssigneeEnum::getDesc) + .collect(Collectors.toList()); + } + + /** + * 获取所有办理人类型的代码列表 + *

+ * 获取当前枚举类所有项的代码字段列表,通常用于程序内部逻辑的判断。 + *

+ * + * @return List 返回所有办理人类型的代码列表 + */ + public static List getAssigneeCodeList() { + return Arrays.stream(values()) + .map(TaskAssigneeEnum::getCode) + .collect(Collectors.toList()); + } +} + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java new file mode 100644 index 0000000..eed1b91 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java @@ -0,0 +1,49 @@ +package org.dromara.workflow.common.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 人员类型 + * + * @author AprilWind + */ +@Getter +@AllArgsConstructor +public enum TaskAssigneeType { + + /** + * 待办任务的审批人权限 + *

该权限表示用户是待办任务的审批人,负责审核任务的执行情况。

+ */ + APPROVER("1", "待办任务的审批人权限"), + + /** + * 待办任务的转办人权限 + *

该权限表示用户是待办任务的转办人,负责将任务分配给其他人员。

+ */ + TRANSFER("2", "待办任务的转办人权限"), + + /** + * 待办任务的委托人权限 + *

该权限表示用户是待办任务的委托人,能够委托其他人代为处理任务。

+ */ + DELEGATE("3", "待办任务的委托人权限"), + + /** + * 待办任务的抄送人权限 + *

该权限表示用户是待办任务的抄送人,仅接收任务信息的通知,不参与任务的审批或处理。

+ */ + COPY("4", "待办任务的抄送人权限"); + + /** + * 类型 + */ + private final String code; + + /** + * 描述 + */ + private final String description; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java new file mode 100644 index 0000000..d18ebb0 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java @@ -0,0 +1,104 @@ +package org.dromara.workflow.common.enums; + +import cn.hutool.core.util.StrUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 任务状态枚举 + * + * @author may + */ +@Getter +@AllArgsConstructor +public enum TaskStatusEnum { + + /** + * 撤销 + */ + CANCEL("cancel", "撤销"), + + /** + * 通过 + */ + PASS("pass", "通过"), + + /** + * 待审核 + */ + WAITING("waiting", "待审核"), + + /** + * 作废 + */ + INVALID("invalid", "作废"), + + /** + * 退回 + */ + BACK("back", "退回"), + + /** + * 终止 + */ + TERMINATION("termination", "终止"), + + /** + * 转办 + */ + TRANSFER("transfer", "转办"), + + /** + * 委托 + */ + DEPUTE("depute", "委托"), + + /** + * 抄送 + */ + COPY("copy", "抄送"), + + /** + * 加签 + */ + SIGN("sign", "加签"), + + /** + * 减签 + */ + SIGN_OFF("sign_off", "减签"), + + /** + * 超时 + */ + TIMEOUT("timeout", "超时"); + + /** + * 状态 + */ + private final String status; + + /** + * 描述 + */ + private final String desc; + + private static final Map STATUS_DESC_MAP = Arrays.stream(values()) + .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc)); + + /** + * 任务业务状态 + * + * @param status 状态 + */ + public static String findByStatus(String status) { + // 从缓存中直接获取描述 + return STATUS_DESC_MAP.getOrDefault(status, StrUtil.EMPTY); + } + +} + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java new file mode 100644 index 0000000..08f1808 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java @@ -0,0 +1,16 @@ +package org.dromara.workflow.config; + +import org.dromara.workflow.common.ConditionalOnEnable; +import org.springframework.context.annotation.Configuration; + +/** + * warmFlow配置 + * + * @author may + */ +@ConditionalOnEnable +@Configuration +public class WarmFlowConfig { + +} + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java new file mode 100644 index 0000000..37d414f --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -0,0 +1,132 @@ +package org.dromara.workflow.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.lang.tree.Tree; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.web.core.BaseController; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.bo.FlowCategoryBo; +import org.dromara.workflow.domain.vo.FlowCategoryVo; +import org.dromara.workflow.service.IFlwCategoryService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 流程分类 + * + * @author may + */ +@ConditionalOnEnable +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/category") +public class FlwCategoryController extends BaseController { + + private final IFlwCategoryService flwCategoryService; + + /** + * 查询流程分类列表 + */ + @SaCheckPermission("workflow:category:list") + @GetMapping("/list") + public R> list(FlowCategoryBo bo) { + List list = flwCategoryService.queryList(bo); + return R.ok(list); + } + + /** + * 导出流程分类列表 + */ + @SaCheckPermission("workflow:category:export") + @Log(title = "流程分类", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(FlowCategoryBo bo, HttpServletResponse response) { + List list = flwCategoryService.queryList(bo); + ExcelUtil.exportExcel(list, "流程分类", FlowCategoryVo.class, response); + } + + /** + * 获取流程分类详细信息 + * + * @param categoryId 主键 + */ + @SaCheckPermission("workflow:category:query") + @GetMapping("/{categoryId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long categoryId) { + flwCategoryService.checkCategoryDataScope(categoryId); + return R.ok(flwCategoryService.queryById(categoryId)); + } + + /** + * 新增流程分类 + */ + @SaCheckPermission("workflow:category:add") + @Log(title = "流程分类", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo category) { + if (!flwCategoryService.checkCategoryNameUnique(category)) { + return R.fail("新增流程分类'" + category.getCategoryName() + "'失败,流程分类名称已存在"); + } + return toAjax(flwCategoryService.insertByBo(category)); + } + + /** + * 修改流程分类 + */ + @SaCheckPermission("workflow:category:edit") + @Log(title = "流程分类", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo category) { + Long categoryId = category.getCategoryId(); + flwCategoryService.checkCategoryDataScope(categoryId); + if (!flwCategoryService.checkCategoryNameUnique(category)) { + return R.fail("修改流程分类'" + category.getCategoryName() + "'失败,流程分类名称已存在"); + } else if (category.getParentId().equals(categoryId)) { + return R.fail("修改流程分类'" + category.getCategoryName() + "'失败,上级流程分类不能是自己"); + } + return toAjax(flwCategoryService.updateByBo(category)); + } + + /** + * 删除流程分类 + * + * @param categoryId 主键 + */ + @SaCheckPermission("workflow:category:remove") + @Log(title = "流程分类", businessType = BusinessType.DELETE) + @DeleteMapping("/{categoryId}") + public R remove(@PathVariable Long categoryId) { + if (flwCategoryService.hasChildByCategoryId(categoryId)) { + return R.warn("存在下级流程分类,不允许删除"); + } + if (flwCategoryService.checkCategoryExistDefinition(categoryId)) { + return R.warn("流程分类存在流程定义,不允许删除"); + } + return toAjax(flwCategoryService.deleteWithValidById(categoryId)); + } + + /** + * 获取流程分类树列表 + * + * @param categoryBo 流程分类 + */ + @GetMapping("/categoryTree") + public R>> categoryTree(FlowCategoryBo categoryBo) { + return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo)); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java new file mode 100644 index 0000000..10d9de8 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -0,0 +1,194 @@ +package org.dromara.workflow.controller; + +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.warm.flow.core.entity.Definition; +import org.dromara.warm.flow.core.service.DefService; +import org.dromara.warm.flow.orm.entity.FlowDefinition; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.vo.FlowDefinitionVo; +import org.dromara.workflow.service.IFlwDefinitionService; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * 流程定义管理 控制层 + * + * @author may + */ +@ConditionalOnEnable +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/definition") +public class FlwDefinitionController extends BaseController { + + private final DefService defService; + private final IFlwDefinitionService flwDefinitionService; + + /** + * 查询流程定义列表 + * + * @param flowDefinition 参数 + * @param pageQuery 分页 + */ + @GetMapping("/list") + public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { + return flwDefinitionService.queryList(flowDefinition, pageQuery); + } + + /** + * 查询未发布的流程定义列表 + * + * @param flowDefinition 参数 + * @param pageQuery 分页 + */ + @GetMapping("/unPublishList") + public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + return flwDefinitionService.unPublishList(flowDefinition, pageQuery); + } + + /** + * 获取流程定义详细信息 + * + * @param id 流程定义id + */ + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable Long id) { + return R.ok(defService.getById(id)); + } + + /** + * 新增流程定义 + * + * @param flowDefinition 参数 + */ + @Log(title = "流程定义", businessType = BusinessType.INSERT) + @PostMapping + @RepeatSubmit() + @Transactional(rollbackFor = Exception.class) + public R add(@RequestBody FlowDefinition flowDefinition) { + return R.ok(defService.checkAndSave(flowDefinition)); + } + + /** + * 修改流程定义 + * + * @param flowDefinition 参数 + */ + @Log(title = "流程定义", businessType = BusinessType.UPDATE) + @PutMapping + @RepeatSubmit() + @Transactional(rollbackFor = Exception.class) + public R edit(@RequestBody FlowDefinition flowDefinition) { + return R.ok(defService.updateById(flowDefinition)); + } + + /** + * 发布流程定义 + * + * @param id 流程定义id + */ + @Log(title = "流程定义", businessType = BusinessType.INSERT) + @PutMapping("/publish/{id}") + @RepeatSubmit() + public R publish(@PathVariable Long id) { + return R.ok(flwDefinitionService.publish(id)); + } + + /** + * 取消发布流程定义 + * + * @param id 流程定义id + */ + @Log(title = "流程定义", businessType = BusinessType.INSERT) + @PutMapping("/unPublish/{id}") + @RepeatSubmit() + @Transactional(rollbackFor = Exception.class) + public R unPublish(@PathVariable Long id) { + return R.ok(defService.unPublish(id)); + } + + /** + * 删除流程定义 + */ + @Log(title = "流程定义", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@PathVariable List ids) { + return toAjax(flwDefinitionService.removeDef(ids)); + } + + /** + * 复制流程定义 + * + * @param id 流程定义id + */ + @Log(title = "流程定义", businessType = BusinessType.INSERT) + @PostMapping("/copy/{id}") + @RepeatSubmit() + @Transactional(rollbackFor = Exception.class) + public R copy(@PathVariable Long id) { + return R.ok(defService.copyDef(id)); + } + + /** + * 导入流程定义 + * + * @param file 文件 + * @param category 分类 + */ + @Log(title = "流程定义", businessType = BusinessType.IMPORT) + @PostMapping("/importDef") + public R importDef(MultipartFile file, String category) { + return R.ok(flwDefinitionService.importJson(file, category)); + } + + /** + * 导出流程定义 + * + * @param id 流程定义id + * @param response 响应 + * @throws IOException 异常 + */ + @Log(title = "流程定义", businessType = BusinessType.EXPORT) + @PostMapping("/exportDef/{id}") + public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException { + flwDefinitionService.exportDef(id, response); + } + + /** + * 获取流程定义JSON字符串 + * + * @param id 流程定义id + */ + @GetMapping("/xmlString/{id}") + public R xmlString(@PathVariable Long id) { + return R.ok("操作成功", defService.exportJson(id)); + } + + /** + * 激活/挂起流程定义 + * + * @param id 流程定义id + * @param active 激活/挂起 + */ + @RepeatSubmit() + @PutMapping("/active/{id}") + @Transactional(rollbackFor = Exception.class) + public R active(@PathVariable Long id, @RequestParam boolean active) { + return R.ok(active ? defService.active(id) : defService.unActive(id)); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java new file mode 100644 index 0000000..ae99c16 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -0,0 +1,157 @@ +package org.dromara.workflow.controller; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.warm.flow.core.service.InsService; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.bo.FlowCancelBo; +import org.dromara.workflow.domain.bo.FlowInstanceBo; +import org.dromara.workflow.domain.bo.FlowInvalidBo; +import org.dromara.workflow.domain.vo.FlowInstanceVo; +import org.dromara.workflow.service.IFlwInstanceService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 流程实例管理 控制层 + * + * @author may + */ +@ConditionalOnEnable +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/instance") +public class FlwInstanceController extends BaseController { + + private final InsService insService; + private final IFlwInstanceService flwInstanceService; + + /** + * 查询正在运行的流程实例列表 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + */ + @GetMapping("/pageByRunning") + public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery); + } + + /** + * 查询已结束的流程实例列表 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + */ + @GetMapping("/pageByFinish") + public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery); + } + + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + */ + @GetMapping("/getInfo/{businessId}") + public R getInfo(@PathVariable Long businessId) { + return R.ok(flwInstanceService.queryByBusinessId(businessId)); + } + + /** + * 按照业务id删除流程实例 + * + * @param businessIds 业务id + */ + @DeleteMapping("/deleteByBusinessIds/{businessIds}") + public R deleteByBusinessIds(@PathVariable List businessIds) { + return toAjax(flwInstanceService.deleteByBusinessIds(businessIds)); + } + + /** + * 按照实例id删除流程实例 + * + * @param instanceIds 实例id + */ + @DeleteMapping("/deleteByInstanceIds/{instanceIds}") + public R deleteByInstanceIds(@PathVariable List instanceIds) { + return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds)); + } + + /** + * 撤销流程 + * + * @param bo 参数 + */ + @RepeatSubmit() + @PutMapping("/cancelProcessApply") + public R cancelProcessApply(@RequestBody FlowCancelBo bo) { + return toAjax(flwInstanceService.cancelProcessApply(bo)); + } + + /** + * 激活/挂起流程实例 + * + * @param id 流程实例id + * @param active 激活/挂起 + */ + @RepeatSubmit() + @PutMapping("/active/{id}") + public R active(@PathVariable Long id, @RequestParam boolean active) { + return R.ok(active ? insService.active(id) : insService.unActive(id)); + } + + /** + * 获取当前登陆人发起的流程实例 + * + * @param flowInstanceBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/pageByCurrent") + public TableDataInfo selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery); + } + + /** + * 获取流程图,流程记录 + * + * @param businessId 业务id + */ + @GetMapping("/flowImage/{businessId}") + public R> flowImage(@PathVariable String businessId) { + return R.ok(flwInstanceService.flowImage(businessId)); + } + + /** + * 获取流程变量 + * + * @param instanceId 流程实例id + */ + @GetMapping("/instanceVariable/{instanceId}") + public R> instanceVariable(@PathVariable Long instanceId) { + return R.ok(flwInstanceService.instanceVariable(instanceId)); + } + + /** + * 作废流程 + * + * @param bo 参数 + */ + @Log(title = "流程实例管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/invalid") + public R invalid(@Validated @RequestBody FlowInvalidBo bo) { + return R.ok(flwInstanceService.processInvalid(bo)); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java new file mode 100644 index 0000000..463916b --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -0,0 +1,201 @@ +package org.dromara.workflow.controller; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.warm.flow.core.entity.Node; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.bo.*; +import org.dromara.workflow.domain.vo.FlowHisTaskVo; +import org.dromara.workflow.domain.vo.FlowTaskVo; +import org.dromara.workflow.service.IFlwTaskService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 任务管理 控制层 + * + * @author may + */ +@ConditionalOnEnable +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/task") +public class FlwTaskController extends BaseController { + + private final IFlwTaskService flwTaskService; + + /** + * 启动任务 + * + * @param startProcessBo 启动流程参数 + */ + @Log(title = "任务管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/startWorkFlow") + public R startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) { + StartProcessReturnDTO startProcessReturn = flwTaskService.startWorkFlow(startProcessBo); + return R.ok("提交成功", startProcessReturn); + } + + /** + * 办理任务 + * + * @param completeTaskBo 办理任务参数 + */ + @Log(title = "任务管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/completeTask") + public R completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) { + return toAjax(flwTaskService.completeTask(completeTaskBo)); + } + + /** + * 查询当前用户的待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/pageByTaskWait") + public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery); + } + + /** + * 查询当前用户的已办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + + @GetMapping("/pageByTaskFinish") + public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery); + } + + /** + * 查询待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/pageByAllTaskWait") + public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery); + } + + /** + * 查询已办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/pageByAllTaskFinish") + public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery); + } + + /** + * 查询当前用户的抄送 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @GetMapping("/pageByTaskCopy") + public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery); + } + + /** + * 根据taskId查询代表任务 + * + * @param taskId 任务id + */ + @GetMapping("/getTask/{taskId}") + public R getTask(@PathVariable Long taskId) { + return R.ok(flwTaskService.selectById(taskId)); + } + + /** + * 终止任务 + * + * @param bo 参数 + */ + @Log(title = "任务管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/terminationTask") + public R terminationTask(@RequestBody FlowTerminationBo bo) { + return R.ok(flwTaskService.terminationTask(bo)); + } + + /** + * 任务操作 + * + * @param bo 参数 + * @param taskOperation 操作类型,委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature + */ + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @RepeatSubmit + @PostMapping("/taskOperation/{taskOperation}") + public R taskOperation(@Validated @RequestBody TaskOperationBo bo, @PathVariable String taskOperation) { + return toAjax(flwTaskService.taskOperation(bo, taskOperation)); + } + + /** + * 修改任务办理人 + * + * @param taskIdList 任务id + * @param userId 办理人id + */ + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/updateAssignee/{userId}") + public R updateAssignee(@RequestBody List taskIdList, @PathVariable String userId) { + return toAjax(flwTaskService.updateAssignee(taskIdList, userId)); + } + + /** + * 驳回审批 + * + * @param bo 参数 + */ + @Log(title = "任务管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/backProcess") + public R backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo bo) { + return toAjax(flwTaskService.backProcess(bo)); + } + + /** + * 获取可驳回的前置节点 + * + * @param definitionId 流程定义id + * @param nowNodeCode 当前节点 + */ + @GetMapping("/getBackTaskNode/{definitionId}/{nowNodeCode}") + public R> getBackTaskNode(@PathVariable Long definitionId, @PathVariable String nowNodeCode) { + return R.ok(flwTaskService.getBackTaskNode(definitionId, nowNodeCode)); + } + + /** + * 获取当前任务的所有办理人 + * + * @param taskId 任务id + */ + @GetMapping("/currentTaskAllUser/{taskId}") + public R> currentTaskAllUser(@PathVariable Long taskId) { + return R.ok(flwTaskService.currentTaskAllUser(taskId)); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TActivityController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TActivityController.java new file mode 100644 index 0000000..6f5e455 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TActivityController.java @@ -0,0 +1,106 @@ +package org.dromara.workflow.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.workflow.domain.bo.TActivityBo; +import org.dromara.workflow.domain.vo.TActivityVo; +import org.dromara.workflow.service.ITActivityService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 活动 + * + * @author Lion Li + * @date 2024-07-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/activity") +public class TActivityController extends BaseController { + + private final ITActivityService tActivityService; + + /** + * 查询活动列表 + */ + @SaCheckPermission("workflow:activity:list") + @GetMapping("/list") + public TableDataInfo list(TActivityBo bo, PageQuery pageQuery) { + return tActivityService.queryPageList(bo, pageQuery); + } + + /** + * 导出活动列表 + */ + @SaCheckPermission("workflow:activity:export") + @Log(title = "活动", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TActivityBo bo, HttpServletResponse response) { + List list = tActivityService.queryList(bo); + ExcelUtil.exportExcel(list, "活动", TActivityVo.class, response); + } + + /** + * 获取活动详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("workflow:activity:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tActivityService.queryById(id)); + } + + /** + * 新增活动 + */ + @SaCheckPermission("workflow:activity:add") + @Log(title = "活动", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TActivityBo bo) { + return toAjax(tActivityService.insertByBo(bo)); + } + + /** + * 修改活动 + */ + @SaCheckPermission("workflow:activity:edit") + @Log(title = "活动", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TActivityBo bo) { + return toAjax(tActivityService.updateByBo(bo)); + } + + /** + * 删除活动 + * + * @param ids 主键串 + */ + @SaCheckPermission("workflow:activity:remove") + @Log(title = "活动", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tActivityService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java new file mode 100644 index 0000000..98825d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -0,0 +1,108 @@ +package org.dromara.workflow.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.service.ITestLeaveService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 请假 + * + * @author may + * @date 2023-07-21 + */ +@ConditionalOnEnable +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/workflow/leave") +public class TestLeaveController extends BaseController { + + private final ITestLeaveService testLeaveService; + + /** + * 查询请假列表 + */ + @SaCheckPermission("workflow:leave:list") + @GetMapping("/list") + public TableDataInfo list(TestLeaveBo bo, PageQuery pageQuery) { + return testLeaveService.queryPageList(bo, pageQuery); + } + + /** + * 导出请假列表 + */ + @SaCheckPermission("workflow:leave:export") + @Log(title = "请假", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TestLeaveBo bo, HttpServletResponse response) { + List list = testLeaveService.queryList(bo); + ExcelUtil.exportExcel(list, "请假", TestLeaveVo.class, response); + } + + /** + * 获取请假详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("workflow:leave:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(testLeaveService.queryById(id)); + } + + /** + * 新增请假 + */ + @SaCheckPermission("workflow:leave:add") + @Log(title = "请假", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) { + return R.ok(testLeaveService.insertByBo(bo)); + } + + /** + * 修改请假 + */ + @SaCheckPermission("workflow:leave:edit") + @Log(title = "请假", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) { + return R.ok(testLeaveService.updateByBo(bo)); + } + + /** + * 删除请假 + * + * @param ids 主键串 + */ + @SaCheckPermission("workflow:leave:remove") + @Log(title = "请假", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids))); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java new file mode 100644 index 0000000..86ac1ac --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java @@ -0,0 +1,58 @@ +package org.dromara.workflow.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 流程分类对象 wf_category + * + * @author may + * @date 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("flow_category") +public class FlowCategory extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流程分类ID + */ + @TableId(value = "category_id") + private Long categoryId; + + /** + * 父流程分类id + */ + private Long parentId; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 流程分类名称 + */ + private String categoryName; + + /** + * 显示顺序 + */ + private Long orderNum; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TActivity.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TActivity.java new file mode 100644 index 0000000..9e01b3c --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TActivity.java @@ -0,0 +1,80 @@ +package org.dromara.workflow.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 活动对象 t_activity + * + * @author Lion Li + * @date 2024-07-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("t_activity") +public class TActivity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @TableId(value = "id") + private Long id; + + /** + * 删除标志;1 正常 2 删除 3 禁用 + */ + @TableLogic + private Integer delFlag; + + /** + * 标题 + */ + private String title; + + /** + * 图片 + */ + private String image; + + /** + * 排序 + */ + private Long sort; + + /** + * 开始时间 + */ + private Date startTime; + + /** + * 结束时间 + */ + private Date endTime; + + /** + * 浏览量 + */ + private Long browseNum; + + /** + * 内容(富文本) + */ + private String content; + + /** + * 点赞数 + */ + private Long likeNum; + + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java new file mode 100644 index 0000000..7d42a9b --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java @@ -0,0 +1,63 @@ +package org.dromara.workflow.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 请假对象 test_leave + * + * @author may + * @date 2023-07-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("test_leave") +public class TestLeave extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 请假类型 + */ + private String leaveType; + + /** + * 开始时间 + */ + private Date startDate; + + /** + * 结束时间 + */ + private Date endDate; + + /** + * 请假天数 + */ + private Integer leaveDays; + + /** + * 请假原因 + */ + private String remark; + + /** + * 状态 + */ + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java new file mode 100644 index 0000000..3117a33 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java @@ -0,0 +1,71 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + + +/** + * 驳回参数请求 + * + * @author may + */ +@Data +public class BackProcessBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @NotNull(message = "任务ID不能为空", groups = AddGroup.class) + private Long taskId; + + /** + * 附件id + */ + private String fileId; + + /** + * 消息类型 + */ + private List messageType; + + /** + * 驳回的节点id(目前未使用,直接驳回到申请人) + */ + @NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class) + private String nodeCode; + + /** + * 办理意见 + */ + private String message; + + /** + * 通知 + */ + private String notice; + + /** + * 流程变量 + */ + private Map variables; + + public Map getVariables() { + if (variables == null) { + return new HashMap<>(16); + } + variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); + return variables; + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java new file mode 100644 index 0000000..9fdf484 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java @@ -0,0 +1,75 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + * 办理任务请求对象 + * + * @author may + */ +@Data +public class CompleteTaskBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务id + */ + @NotNull(message = "任务id不能为空", groups = {AddGroup.class}) + private Long taskId; + + /** + * 附件id + */ + private String fileId; + + /** + * 抄送人员 + */ + private List flowCopyList; + + /** + * 消息类型 + */ + private List messageType; + + /** + * 办理意见 + */ + private String message; + + /** + * 消息通知 + */ + private String notice; + + /** + * 流程变量 + */ + private Map variables; + + /** + * 扩展变量(此处为逗号分隔的ossId) + * @return + */ + private String ext; + + public Map getVariables() { + if (variables == null) { + return new HashMap<>(16); + } + variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); + return variables; + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java new file mode 100644 index 0000000..31742ea --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java @@ -0,0 +1,31 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 撤销任务请求对象 + * + * @author may + */ +@Data +public class FlowCancelBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务ID + */ + @NotBlank(message = "业务ID不能为空", groups = AddGroup.class) + private String businessId; + + /** + * 办理意见 + */ + private String message; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java new file mode 100644 index 0000000..fd626eb --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java @@ -0,0 +1,47 @@ +package org.dromara.workflow.domain.bo; + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.workflow.domain.FlowCategory; + +/** + * 流程分类业务对象 wf_category + * + * @author may + * @date 2023-06-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = FlowCategory.class, reverseConvertGenerate = false) +public class FlowCategoryBo extends BaseEntity { + + /** + * 流程分类ID + */ + @NotNull(message = "流程分类ID不能为空", groups = { EditGroup.class }) + private Long categoryId; + + /** + * 父流程分类id + */ + @NotNull(message = "父流程分类id不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long parentId; + + /** + * 流程分类名称 + */ + @NotBlank(message = "流程分类名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String categoryName; + + /** + * 显示顺序 + */ + private Long orderNum; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java new file mode 100644 index 0000000..a45e521 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java @@ -0,0 +1,30 @@ +package org.dromara.workflow.domain.bo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 抄送 + * + * @author may + */ +@Data +public class FlowCopyBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户id + */ + private Long userId; + + /** + * 用户名称 + */ + private String userName; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java new file mode 100644 index 0000000..fb1fe61 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java @@ -0,0 +1,55 @@ +package org.dromara.workflow.domain.bo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 流程实例请求对象 + * + * @author may + */ +@Data +public class FlowInstanceBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 任务发起人 + */ + private String startUserId; + + /** + * 业务id + */ + private String businessId; + + /** + * 流程分类id + */ + private String category; + + /** + * 任务名称 + */ + private String nodeName; + + /** + * 申请人Ids + */ + private List createByIds; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java new file mode 100644 index 0000000..297bd00 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java @@ -0,0 +1,31 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 作废请求对象 + * + * @author may + */ +@Data +public class FlowInvalidBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流程实例id + */ + @NotNull(message = "流程实例id为空", groups = AddGroup.class) + private Long id; + + /** + * 审批意见 + */ + private String comment; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java new file mode 100644 index 0000000..64dd082 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java @@ -0,0 +1,55 @@ +package org.dromara.workflow.domain.bo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * 任务请求对象 + * + * @author may + */ +@Data +public class FlowTaskBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务名称 + */ + private String nodeName; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程分类id + */ + private String category; + + /** + * 流程实例id + */ + private Long instanceId; + + /** + * 权限列表 + */ + private List permissionList; + + /** + * 申请人Ids + */ + private List createByIds; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java new file mode 100644 index 0000000..897fc21 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java @@ -0,0 +1,31 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 终止任务请求对象 + * + * @author may + */ +@Data +public class FlowTerminationBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 任务id + */ + @NotNull(message = "任务id为空", groups = AddGroup.class) + private Long taskId; + + /** + * 审批意见 + */ + private String comment; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java new file mode 100644 index 0000000..ea21a81 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java @@ -0,0 +1,49 @@ +package org.dromara.workflow.domain.bo; + + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; + +import java.io.Serial; +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * 启动流程对象 + * + * @author may + */ +@Data +public class StartProcessBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 业务唯一值id + */ + @NotBlank(message = "业务ID不能为空", groups = {AddGroup.class}) + private String businessId; + + /** + * 流程定义编码 + */ + @NotBlank(message = "流程定义编码不能为空", groups = {AddGroup.class}) + private String flowCode; + + /** + * 流程变量,前端会提交一个元素{'entity': {业务详情数据对象}} + */ + private Map variables; + + public Map getVariables() { + if (variables == null) { + return new HashMap<>(16); + } + variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); + return variables; + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TActivityBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TActivityBo.java new file mode 100644 index 0000000..62ffdfc --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TActivityBo.java @@ -0,0 +1,82 @@ +package org.dromara.workflow.domain.bo; + + +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.workflow.domain.TActivity; + +import java.util.Date; + +/** + * 活动业务对象 t_activity + * + * @author Lion Li + * @date 2024-07-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TActivity.class, reverseConvertGenerate = false) +public class TActivityBo extends BaseEntity { + + /** + * 租户号 + */ + @NotNull(message = "租户号不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 标题 + */ + @NotBlank(message = "标题不能为空", groups = { AddGroup.class, EditGroup.class }) + private String title; + + /** + * 图片 + */ + @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class }) + private String image; + + /** + * 排序 + */ + @NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long sort; + + /** + * 开始时间 + */ + @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date startTime; + + /** + * 结束时间 + */ + @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date endTime; + + /** + * 浏览量 + */ + @NotNull(message = "浏览量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long browseNum; + + /** + * 内容(富文本) + */ + @NotBlank(message = "内容(富文本)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String content; + + /** + * 点赞数 + */ + @NotNull(message = "点赞数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long likeNum; + + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java new file mode 100644 index 0000000..4348e31 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java @@ -0,0 +1,48 @@ +package org.dromara.workflow.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + + +/** + * 任务操作业务对象,用于描述任务委派、转办、加签等操作的必要参数 + * 包含了用户ID、任务ID、任务相关的消息、以及加签/减签的用户ID + * + * @author AprilWind + */ +@Data +public class TaskOperationBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 委派/转办人的用户ID(必填,准对委派/转办人操作) + */ + @NotNull(message = "委派/转办人id不能为空", groups = {AddGroup.class}) + private String userId; + + /** + * 加签/减签人的用户ID列表(必填,针对加签/减签操作) + */ + @NotNull(message = "加签/减签id不能为空", groups = {EditGroup.class}) + private List userIds; + + /** + * 任务ID(必填) + */ + @NotNull(message = "任务id不能为空") + private Long taskId; + + /** + * 意见或备注信息(可选) + */ + private String message; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java new file mode 100644 index 0000000..a1a4b59 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java @@ -0,0 +1,79 @@ +package org.dromara.workflow.domain.bo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.workflow.domain.TestLeave; + +import java.util.Date; + +/** + * 请假业务对象 test_leave + * + * @author may + * @date 2023-07-21 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestLeave.class, reverseConvertGenerate = false) +public class TestLeaveBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long id; + + /** + * 请假类型 + */ + @NotBlank(message = "请假类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String leaveType; + + /** + * 开始时间 + */ + @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startDate; + + /** + * 结束时间 + */ + @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endDate; + + /** + * 请假天数 + */ + private Integer leaveDays; + + /** + * 开始时间 + */ + private Integer startLeaveDays; + + /** + * 结束时间 + */ + private Integer endLeaveDays; + + /** + * 请假原因 + */ + private String remark; + + /** + * 状态 + */ + private String status; + + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java new file mode 100644 index 0000000..c5d2785 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java @@ -0,0 +1,67 @@ +package org.dromara.workflow.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.workflow.domain.FlowCategory; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 流程分类视图对象 wf_category + * + * @author may + * @date 2023-06-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = FlowCategory.class) +public class FlowCategoryVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流程分类ID + */ + @ExcelProperty(value = "流程分类ID") + private Long categoryId; + + /** + * 父级id + */ + private Long parentId; + + /** + * 父类别名称 + */ + private String parentName; + + /** + * 祖级列表 + */ + private String ancestors; + + /** + * 流程分类名称 + */ + @ExcelProperty(value = "流程分类名称") + private String categoryName; + + /** + * 显示顺序 + */ + @ExcelProperty(value = "显示顺序") + private Long orderNum; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java new file mode 100644 index 0000000..aef7573 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java @@ -0,0 +1,104 @@ +package org.dromara.workflow.domain.vo; + +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.workflow.common.constant.FlowConstant; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + +/** + * 流程定义视图 + * + * @author may + */ +@Data +public class FlowDefinitionVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 流程分类id + */ + private String category; + + /** + * 流程分类名称 + */ + @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category") + private String categoryName; + + /** + * 流程版本 + */ + private String version; + + /** + * 是否发布(0未发布 1已发布 9失效) + */ + private Integer isPublish; + + /** + * 审批表单是否自定义(Y是 N否) + */ + private String formCustom; + + /** + * 审批表单路径 + */ + private String formPath; + + /** + * 流程激活状态(0挂起 1激活) + */ + private Integer activityStatus; + + /** + * 监听器类型 + */ + private String listenerType; + + /** + * 监听器路径 + */ + private String listenerPath; + + /** + * 扩展字段,预留给业务系统使用 + */ + private String ext; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java new file mode 100644 index 0000000..8776a76 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java @@ -0,0 +1,244 @@ +package org.dromara.workflow.domain.vo; + +import lombok.Data; +import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.warm.flow.core.enums.CooperateType; +import org.dromara.workflow.common.constant.FlowConstant; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 历史任务视图 + * + * @author may + */ +@Data +public class FlowHisTaskVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 对应flow_definition表的id + */ + private Long definitionId; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 流程实例表id + */ + private Long instanceId; + + /** + * 任务表id + */ + private Long taskId; + + /** + * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签) + */ + private Integer cooperateType; + + /** + * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签) + */ + private String cooperateTypeName; + + /** + * 业务id + */ + private String businessId; + + /** + * 开始节点编码 + */ + private String nodeCode; + + /** + * 开始节点名称 + */ + private String nodeName; + + /** + * 开始节点类型(0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关) + */ + private Integer nodeType; + + /** + * 目标节点编码 + */ + private String targetNodeCode; + + /** + * 结束节点名称 + */ + private String targetNodeName; + + /** + * 审批者 + */ + private String approver; + + /** + * 审批者 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "approver") + private String approveName; + + /** + * 协作人(只有转办、会签、票签、委派) + */ + private String collaborator; + + /** + * 权限标识 permissionFlag的list形式 + */ + private List permissionList; + + /** + * 跳转类型(PASS通过 REJECT退回 NONE无动作) + */ + private String skipType; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 任务状态 + */ + private String flowTaskStatus; + + /** + * 流程状态 + */ + private String flowStatusName; + + /** + * 审批意见 + */ + private String message; + + /** + * 业务详情 存业务类的json + */ + private String ext; + + /** + * 创建者 + */ + private String createBy; + + /** + * 申请人 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") + private String createByName; + + /** + * 流程分类id + */ + private String category; + + /** + * 流程分类名称 + */ + @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category") + private String categoryName; + + /** + * 审批表单是否自定义(Y是 N否) + */ + private String formCustom; + + /** + * 审批表单路径 + */ + private String formPath; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程版本号 + */ + private String version; + + /** + * 运行时长 + */ + private String runDuration; + + /** + * 设置创建时间并计算任务运行时长 + * + * @param createTime 创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + updateRunDuration(); + } + + /** + * 设置更新时间并计算任务运行时长 + * + * @param updateTime 更新时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + updateRunDuration(); + } + + /** + * 更新运行时长 + */ + private void updateRunDuration() { + // 如果创建时间和更新时间均不为空,计算它们之间的时长 + if (this.updateTime != null && this.createTime != null) { + this.runDuration = DateUtils.getTimeDifference(this.updateTime, this.createTime); + } + } + + /** + * 设置协作方式,并通过协作方式获取名称 + */ + public void setCooperateType(Integer cooperateType) { + this.cooperateType = cooperateType; + this.cooperateTypeName = CooperateType.getValueByKey(cooperateType); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java new file mode 100644 index 0000000..75543f4 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java @@ -0,0 +1,137 @@ +package org.dromara.workflow.domain.vo; + +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.workflow.common.constant.FlowConstant; + +import java.util.Date; + +/** + * 流程实例视图 + * + * @author may + */ +@Data +public class FlowInstanceVo { + + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 对应flow_definition表的id + */ + private Long definitionId; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 业务id + */ + private String businessId; + + /** + * 节点类型(0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关) + */ + private Integer nodeType; + + /** + * 流程节点编码 每个流程的nodeCode是唯一的,即definitionId+nodeCode唯一,在数据库层面做了控制 + */ + private String nodeCode; + + /** + * 流程节点名称 + */ + private String nodeName; + + /** + * 流程变量 + */ + private String variable; + + /** + * 流程状态(0待提交 1审批中 2 审批通过 3自动通过 8已完成 9已退回 10失效) + */ + private String flowStatus; + + /** + * 流程状态 + */ + private String flowStatusName; + + /** + * 流程激活状态(0挂起 1激活) + */ + private Integer activityStatus; + + /** + * 审批表单是否自定义(Y是 N否) + */ + private String formCustom; + + /** + * 审批表单路径 + */ + private String formPath; + + /** + * 扩展字段,预留给业务系统使用 + */ + private String ext; + + /** + * 流程定义版本 + */ + private String version; + + /** + * 创建者 + */ + private String createBy; + + /** + * 申请人 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") + private String createByName; + + /** + * 流程分类id + */ + private String category; + + /** + * 流程分类名称 + */ + @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category") + private String categoryName; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java new file mode 100644 index 0000000..3fb08d9 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java @@ -0,0 +1,176 @@ +package org.dromara.workflow.domain.vo; + +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.warm.flow.core.entity.User; +import org.dromara.workflow.common.constant.FlowConstant; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 任务视图 + * + * @author may + */ +@Data +public class FlowTaskVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 删除标记 + */ + private String delFlag; + + /** + * 对应flow_definition表的id + */ + private Long definitionId; + + /** + * 流程实例表id + */ + private Long instanceId; + + /** + * 流程定义名称 + */ + private String flowName; + + /** + * 业务id + */ + private String businessId; + + /** + * 节点编码 + */ + private String nodeCode; + + /** + * 节点名称 + */ + private String nodeName; + + /** + * 节点类型(0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关) + */ + private Integer nodeType; + + /** + * 权限标识 permissionFlag的list形式 + */ + private List permissionList; + + /** + * 流程用户列表 + */ + private List userList; + + /** + * 审批表单是否自定义(Y是 N否) + */ + private String formCustom; + + /** + * 审批表单 + */ + private String formPath; + + /** + * 流程定义编码 + */ + private String flowCode; + + /** + * 流程版本号 + */ + private String version; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 流程分类id + */ + private String category; + + /** + * 流程分类名称 + */ + @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category") + private String categoryName; + + /** + * 流程状态 + */ + @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status") + private String flowStatusName; + + /** + * 办理人类型 + */ + private String type; + + /** + * 办理人ids + */ + private String assigneeIds; + + /** + * 办理人名称 + */ + private String assigneeNames; + + /** + * 抄送人id + */ + private String processedBy; + + /** + * 抄送人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "processedBy") + private String processedByName; + + /** + * 流程签署比例值 大于0为票签,会签 + */ + private BigDecimal nodeRatio; + + /** + * 申请人id + */ + private String createBy; + + /** + * 申请人名称 + */ + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") + private String createByName; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java new file mode 100644 index 0000000..b4de76e --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java @@ -0,0 +1,28 @@ +package org.dromara.workflow.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 流程变量 + * + * @author may + */ +@Data +public class FlowVariableVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 变量key + */ + private String key; + + /** + * 变量值 + */ + private String value; +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TActivityVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TActivityVo.java new file mode 100644 index 0000000..e923116 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TActivityVo.java @@ -0,0 +1,84 @@ +package org.dromara.workflow.domain.vo; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.workflow.domain.TActivity; + +import java.io.Serial; +import java.io.Serializable; + + + +/** + * 活动视图对象 t_activity + * + * @author Lion Li + * @date 2024-07-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TActivity.class) +public class TActivityVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ExcelProperty(value = "租户号") + private Long id; + + /** + * 标题 + */ + @ExcelProperty(value = "标题") + private String title; + + /** + * 图片 + */ + @ExcelProperty(value = "图片") + private String image; + + /** + * 排序 + */ + @ExcelProperty(value = "排序") + private Long sort; + + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + private Date startTime; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + private Date endTime; + + /** + * 浏览量 + */ + @ExcelProperty(value = "浏览量") + private Long browseNum; + + /** + * 内容(富文本) + */ + @ExcelProperty(value = "内容(富文本)") + private String content; + + /** + * 点赞数 + */ + @ExcelProperty(value = "点赞数") + private Long likeNum; + + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java new file mode 100644 index 0000000..47886d7 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java @@ -0,0 +1,70 @@ +package org.dromara.workflow.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.workflow.domain.TestLeave; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + +/** + * 请假视图对象 test_leave + * + * @author may + * @date 2023-07-21 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TestLeave.class) +public class TestLeaveVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 请假类型 + */ + @ExcelProperty(value = "请假类型") + private String leaveType; + + /** + * 开始时间 + */ + @ExcelProperty(value = "开始时间") + private Date startDate; + + /** + * 结束时间 + */ + @ExcelProperty(value = "结束时间") + private Date endDate; + + /** + * 请假天数 + */ + @ExcelProperty(value = "请假天数") + private Integer leaveDays; + + /** + * 备注 + */ + @ExcelProperty(value = "请假原因") + private String remark; + + /** + * 状态 + */ + @ExcelProperty(value = "状态") + private String status; + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java new file mode 100644 index 0000000..3efc52d --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java @@ -0,0 +1,82 @@ +package org.dromara.workflow.handler; + +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.event.ProcessCreateTaskEvent; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.tenant.helper.TenantHelper; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.springframework.stereotype.Component; + +import java.util.Map; + +/** + * 流程监听服务 + * + * @author may + * @date 2024-06-02 + */ +@ConditionalOnEnable +@Slf4j +@Component +public class FlowProcessEventHandler { + + /** + * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) + * + * @param flowCode 流程定义编码 + * @param businessId 业务id + * @param status 状态 + * @param submit 当为true时为申请人节点办理 + */ + public void processHandler(String flowCode, String businessId, String status, Map params, boolean submit) { + String tenantId = TenantHelper.getTenantId(); + log.info("发布流程事件,租户ID: {}, 流程状态: {}, 流程编码: {}, 业务ID: {}, 是否申请人节点办理: {}", tenantId, status, flowCode, businessId, submit); + ProcessEvent processEvent = new ProcessEvent(); + processEvent.setTenantId(tenantId); + processEvent.setFlowCode(flowCode); + processEvent.setBusinessId(businessId); + processEvent.setStatus(status); + processEvent.setParams(params); + processEvent.setSubmit(submit); + SpringUtils.context().publishEvent(processEvent); + } + + /** + * 执行创建任务监听 + * + * @param flowCode 流程定义编码 + * @param nodeCode 审批节点编码 + * @param taskId 任务id + * @param businessId 业务id + */ + public void processCreateTaskHandler(String flowCode, String nodeCode, Long taskId, String businessId) { + String tenantId = TenantHelper.getTenantId(); + log.info("发布流程任务事件, 租户ID: {}, 流程编码: {}, 节点编码: {}, 任务ID: {}, 业务ID: {}", tenantId, flowCode, nodeCode, taskId, businessId); + ProcessCreateTaskEvent processCreateTaskEvent = new ProcessCreateTaskEvent(); + processCreateTaskEvent.setTenantId(tenantId); + processCreateTaskEvent.setFlowCode(flowCode); + processCreateTaskEvent.setNodeCode(nodeCode); + processCreateTaskEvent.setTaskId(taskId); + processCreateTaskEvent.setBusinessId(businessId); + SpringUtils.context().publishEvent(processCreateTaskEvent); + } + + /** + * 删除流程监听 + * + * @param flowCode 流程定义编码 + * @param businessId 业务ID + */ + public void processDeleteHandler(String flowCode, String businessId) { + String tenantId = TenantHelper.getTenantId(); + log.info("发布删除流程事件, 租户ID: {}, 流程编码: {}, 业务ID: {}", tenantId, flowCode, businessId); + ProcessDeleteEvent processDeleteEvent = new ProcessDeleteEvent(); + processDeleteEvent.setTenantId(tenantId); + processDeleteEvent.setFlowCode(flowCode); + processDeleteEvent.setBusinessId(businessId); + SpringUtils.context().publishEvent(processDeleteEvent); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java new file mode 100644 index 0000000..e659cc9 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java @@ -0,0 +1,73 @@ +package org.dromara.workflow.handler; + +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.handler.PermissionHandler; +import org.dromara.warm.flow.core.service.impl.TaskServiceImpl; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.enums.TaskAssigneeEnum; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 办理人权限处理器 + * + * @author AprilWind + */ +@ConditionalOnEnable +@RequiredArgsConstructor +@Component +@Slf4j +public class WorkflowPermissionHandler implements PermissionHandler { + + /** + * 审批前获取当前办理人,办理时会校验的该权限集合 + * 后续在{@link TaskServiceImpl#checkAuth(Task, FlowParams)} 中调用 + * 返回当前用户权限集合 + */ + @Override + public List permissions() { + LoginUser loginUser = LoginHelper.getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + return new ArrayList<>(); + } + // 使用一个流来构建权限列表 + return Stream.of( + // 角色权限前缀 + loginUser.getRoles().stream() + .map(role -> TaskAssigneeEnum.ROLE.getCode() + role.getRoleId()), + + // 岗位权限前缀 + Stream.ofNullable(loginUser.getPosts()) + .flatMap(Collection::stream) + .map(post -> TaskAssigneeEnum.POST.getCode() + post.getPostId()), + + // 用户和部门权限 + Stream.of(String.valueOf(loginUser.getUserId()), + TaskAssigneeEnum.DEPT.getCode() + loginUser.getDeptId() + ) + ) + .flatMap(stream -> stream) + .collect(Collectors.toList()); + } + + /** + * 获取当前办理人 + * + * @return 当前办理人 + */ + @Override + public String getHandler() { + return LoginHelper.getUserIdStr(); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java new file mode 100644 index 0000000..272f9de --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -0,0 +1,130 @@ +package org.dromara.workflow.listener; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.entity.Definition; +import org.dromara.warm.flow.core.entity.Instance; +import org.dromara.warm.flow.core.entity.Task; +import org.dromara.warm.flow.core.listener.GlobalListener; +import org.dromara.warm.flow.core.listener.ListenerVariable; +import org.dromara.warm.flow.orm.entity.FlowTask; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.handler.FlowProcessEventHandler; +import org.dromara.workflow.service.IFlwInstanceService; +import org.dromara.workflow.service.IFlwTaskService; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 全局任务办理监听 + * + * @author may + */ +@ConditionalOnEnable +@Component +@Slf4j +@RequiredArgsConstructor +public class WorkflowGlobalListener implements GlobalListener { + + private final IFlwTaskService taskService; + private final IFlwInstanceService instanceService; + private final FlowProcessEventHandler flowProcessEventHandler; + + /** + * 创建监听器,任务创建时执行 + * + * @param listenerVariable 监听器变量 + */ + @Override + public void create(ListenerVariable listenerVariable) { + Instance instance = listenerVariable.getInstance(); + Definition definition = listenerVariable.getDefinition(); + String businessId = instance.getBusinessId(); + String flowStatus = instance.getFlowStatus(); + Task task = listenerVariable.getTask(); + if (task != null && BusinessStatusEnum.WAITING.getStatus().equals(flowStatus)) { + // 判断流程状态(发布审批中事件) + flowProcessEventHandler.processCreateTaskHandler(definition.getFlowCode(), task.getNodeCode(), task.getId(), businessId); + } + } + + /** + * 开始监听器,任务开始办理时执行 + * + * @param listenerVariable 监听器变量 + */ + @Override + public void start(ListenerVariable listenerVariable) { + } + + /** + * 分派监听器,动态修改代办任务信息 + * + * @param listenerVariable 监听器变量 + */ + @Override + public void assignment(ListenerVariable listenerVariable) { + } + + /** + * 完成监听器,当前任务完成后执行 + * + * @param listenerVariable 监听器变量 + */ + @Override + public void finish(ListenerVariable listenerVariable) { + Instance instance = listenerVariable.getInstance(); + Definition definition = listenerVariable.getDefinition(); + String businessId = instance.getBusinessId(); + String flowStatus = instance.getFlowStatus(); + Map params = new HashMap<>(); + FlowParams flowParams = listenerVariable.getFlowParams(); + if (ObjectUtil.isNotNull(flowParams)) { + // 历史任务扩展(通常为附件) + params.put("hisTaskExt", flowParams.getHisTaskExt()); + // 办理人 + params.put("handler", flowParams.getHandler()); + // 办理意见 + params.put("message", flowParams.getMessage()); + } + // 判断流程状态(发布:撤销,退回,作废,终止,已完成事件) + String status = determineFlowStatus(instance, flowStatus); + if (StringUtils.isNotBlank(status)) { + flowProcessEventHandler.processHandler(definition.getFlowCode(), businessId, status, params, false); + } + } + + /** + * 根据流程实例和当前流程状态确定最终状态 + * + * @param instance 流程实例 + * @param flowStatus 流程实例当前状态 + * @return 流程最终状态 + */ + private String determineFlowStatus(Instance instance, String flowStatus) { + if (StringUtils.isNotBlank(flowStatus) && BusinessStatusEnum.initialState(flowStatus)) { + log.info("流程实例当前状态: {}", flowStatus); + return flowStatus; + } else { + Long instanceId = instance.getId(); + List flowTasks = taskService.selectByInstId(instanceId); + if (CollUtil.isEmpty(flowTasks)) { + String status = BusinessStatusEnum.FINISH.getStatus(); + // 更新流程状态为已完成 + instanceService.updateStatus(instanceId, status); + log.info("流程已结束,状态更新为: {}", status); + return status; + } + return null; + } + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java new file mode 100644 index 0000000..d2c0b3a --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java @@ -0,0 +1,60 @@ +package org.dromara.workflow.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.workflow.domain.FlowCategory; +import org.dromara.workflow.domain.vo.FlowCategoryVo; + +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 流程分类Mapper接口 + * + * @author may + * @date 2023-06-27 + */ +public interface FlwCategoryMapper extends BaseMapperPlus { + + /** + * 统计指定流程分类ID的分类数量 + * + * @param categoryId 流程分类ID + * @return 该流程分类ID的分类数量 + */ + @DataPermission({ + @DataColumn(key = "deptName", value = "createDept") + }) + long countCategoryById(Long categoryId); + + /** + * 根据父流程分类ID查询其所有子流程分类的列表 + * + * @param parentId 父流程分类ID + * @return 包含子流程分类的列表 + */ + default List selectListByParentId(Long parentId) { + return this.selectList(new LambdaQueryWrapper() + .select(FlowCategory::getCategoryId) + .apply(DataBaseHelper.findInSet(parentId, "ancestors"))); + } + + /** + * 根据父流程分类ID查询包括父ID及其所有子流程分类ID的列表 + * + * @param parentId 父流程分类ID + * @return 包含父ID和子流程分类ID的列表 + */ + default List selectCategoryIdsByParentId(Long parentId) { + return Stream.concat( + this.selectListByParentId(parentId).stream() + .map(FlowCategory::getCategoryId), + Stream.of(parentId) + ).collect(Collectors.toList()); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java new file mode 100644 index 0000000..92809c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java @@ -0,0 +1,27 @@ +package org.dromara.workflow.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.workflow.domain.bo.FlowInstanceBo; +import org.dromara.workflow.domain.vo.FlowInstanceVo; + +/** + * 实例信息Mapper接口 + * + * @author may + * @date 2024-03-02 + */ +public interface FlwInstanceMapper { + + /** + * 流程实例信息 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 结果 + */ + Page selectInstanceList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java new file mode 100644 index 0000000..fd86c82 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java @@ -0,0 +1,57 @@ +package org.dromara.workflow.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.workflow.domain.bo.FlowTaskBo; +import org.dromara.workflow.domain.vo.FlowHisTaskVo; +import org.dromara.workflow.domain.vo.FlowTaskVo; + +import java.util.List; + + +/** + * 任务信息Mapper接口 + * + * @author may + * @date 2024-03-02 + */ +public interface FlwTaskMapper { + + /** + * 获取待办信息 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 结果 + */ + Page getListRunTask(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 获取待办信息 + * + * @param queryWrapper 条件 + * @return 结果 + */ + List getListRunTask(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 获取已办 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 结果 + */ + Page getListFinishTask(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + + /** + * 查询当前用户的抄送 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 结果 + */ + Page getTaskCopyByPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TActivityMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TActivityMapper.java new file mode 100644 index 0000000..36a12c5 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TActivityMapper.java @@ -0,0 +1,16 @@ +package org.dromara.workflow.mapper; + + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.workflow.domain.TActivity; +import org.dromara.workflow.domain.vo.TActivityVo; + +/** + * 活动Mapper接口 + * + * @author Lion Li + * @date 2024-07-19 + */ +public interface TActivityMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java new file mode 100644 index 0000000..cd1edba --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java @@ -0,0 +1,15 @@ +package org.dromara.workflow.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.domain.vo.TestLeaveVo; + +/** + * 请假Mapper接口 + * + * @author may + * @date 2023-07-21 + */ +public interface TestLeaveMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java new file mode 100644 index 0000000..91f173d --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java @@ -0,0 +1,102 @@ +package org.dromara.workflow.service; + +import cn.hutool.core.lang.tree.Tree; +import org.dromara.workflow.domain.bo.FlowCategoryBo; +import org.dromara.workflow.domain.vo.FlowCategoryVo; + +import java.util.List; + +/** + * 流程分类Service接口 + * + * @author may + */ +public interface IFlwCategoryService { + + /** + * 查询流程分类 + * + * @param categoryId 主键 + * @return 流程分类 + */ + FlowCategoryVo queryById(Long categoryId); + + /** + * 根据流程分类ID查询流程分类名称 + * + * @param categoryId 流程分类ID + * @return 流程分类名称 + */ + String selectCategoryNameById(Long categoryId); + + /** + * 查询符合条件的流程分类列表 + * + * @param bo 查询条件 + * @return 流程分类列表 + */ + List queryList(FlowCategoryBo bo); + + /** + * 查询流程分类树结构信息 + * + * @param category 流程分类信息 + * @return 流程分类树信息集合 + */ + List> selectCategoryTreeList(FlowCategoryBo category); + + /** + * 校验流程分类是否有数据权限 + * + * @param categoryId 流程分类ID + */ + void checkCategoryDataScope(Long categoryId); + + /** + * 校验流程分类名称是否唯一 + * + * @param category 流程分类信息 + * @return 结果 + */ + boolean checkCategoryNameUnique(FlowCategoryBo category); + + /** + * 查询流程分类是否存在流程定义 + * + * @param categoryId 流程分类ID + * @return 结果 true 存在 false 不存在 + */ + boolean checkCategoryExistDefinition(Long categoryId); + + /** + * 是否存在流程分类子节点 + * + * @param categoryId 流程分类ID + * @return 结果 + */ + boolean hasChildByCategoryId(Long categoryId); + + /** + * 新增流程分类 + * + * @param bo 流程分类 + * @return 是否新增成功 + */ + int insertByBo(FlowCategoryBo bo); + + /** + * 修改流程分类 + * + * @param bo 流程分类 + * @return 是否修改成功 + */ + int updateByBo(FlowCategoryBo bo); + + /** + * 删除流程分类信息 + * + * @param categoryId 主键 + * @return 是否删除成功 + */ + int deleteWithValidById(Long categoryId); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java new file mode 100644 index 0000000..1a2d29f --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -0,0 +1,79 @@ +package org.dromara.workflow.service; + +import jakarta.servlet.http.HttpServletResponse; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.warm.flow.orm.entity.FlowDefinition; +import org.dromara.workflow.domain.vo.FlowDefinitionVo; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; + +/** + * 流程定义 服务层 + * + * @author may + */ +public interface IFlwDefinitionService { + + /** + * 查询流程定义列表 + * + * @param flowDefinition 参数 + * @param pageQuery 分页 + * @return 返回分页列表 + */ + TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery); + + /** + * 查询未发布的流程定义列表 + * + * @param flowDefinition 参数 + * @param pageQuery 分页 + * @return 返回分页列表 + */ + TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery); + + + /** + * 发布流程定义 + * + * @param id 流程定义id + * @return 结果 + */ + boolean publish(Long id); + + /** + * 导出流程定义 + * + * @param id 流程定义id + * @param response 响应 + * @throws IOException 异常 + */ + void exportDef(Long id, HttpServletResponse response) throws IOException; + + /** + * 导入流程定义 + * + * @param file 文件 + * @param category 分类 + * @return 结果 + */ + boolean importJson(MultipartFile file, String category); + + /** + * 删除流程定义 + * + * @param ids 流程定义id + * @return 结果 + */ + boolean removeDef(List ids); + + /** + * 新增租户流程定义 + * + * @param tenantId 租户id + */ + void syncDef(String tenantId); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java new file mode 100644 index 0000000..99729c2 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -0,0 +1,159 @@ +package org.dromara.workflow.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.warm.flow.orm.entity.FlowInstance; +import org.dromara.workflow.domain.bo.FlowCancelBo; +import org.dromara.workflow.domain.bo.FlowInstanceBo; +import org.dromara.workflow.domain.bo.FlowInvalidBo; +import org.dromara.workflow.domain.vo.FlowInstanceVo; + +import java.util.List; +import java.util.Map; + +/** + * 流程实例 服务层 + * + * @author may + */ +public interface IFlwInstanceService { + + /** + * 分页查询正在运行的流程实例 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); + + /** + * 分页查询已结束的流程实例 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery); + + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + * @return 结果 + */ + FlowInstanceVo queryByBusinessId(Long businessId); + + /** + * 按照业务id查询流程实例 + * + * @param businessId 业务id + * @return 结果 + */ + FlowInstance selectInstByBusinessId(String businessId); + + /** + * 按照实例id查询流程实例 + * + * @param instanceId 实例id + * @return 结果 + */ + FlowInstance selectInstById(Long instanceId); + + /** + * 按照实例id查询流程实例 + * + * @param instanceIds 实例id + * @return 结果 + */ + List selectInstListByIdList(List instanceIds); + + /** + * 按照业务id删除流程实例 + * + * @param businessIds 业务id + * @return 结果 + */ + boolean deleteByBusinessIds(List businessIds); + + /** + * 按照实例id删除流程实例 + * + * @param instanceIds 实例id + * @return 结果 + */ + boolean deleteByInstanceIds(List instanceIds); + + /** + * 撤销流程 + * + * @param bo 参数 + * @return 结果 + */ + boolean cancelProcessApply(FlowCancelBo bo); + + /** + * 获取当前登陆人发起的流程实例 + * + * @param instanceBo 流程实例 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery); + + /** + * 获取流程图,流程记录 + * + * @param businessId 业务id + * @return 结果 + */ + Map flowImage(String businessId); + + /** + * 按照实例id更新状态 + * + * @param instanceId 实例id + * @param status 状态 + */ + void updateStatus(Long instanceId, String status); + + /** + * 获取流程变量 + * + * @param instanceId 实例id + * @return 结果 + */ + Map instanceVariable(Long instanceId); + + /** + * 设置流程变量 + * + * @param instanceId 实例id + * @param variable 流程变量 + */ + void setVariable(Long instanceId, Map variable); + + /** + * 按任务id查询实例 + * + * @param taskId 任务id + * @return 结果 + */ + FlowInstance selectByTaskId(Long taskId); + + /** + * 按任务id查询实例 + * + * @param taskIdList 任务id + * @return 结果 + */ + List selectByTaskIdList(List taskIdList); + + /** + * 作废流程 + * + * @param bo 流程实例 + * @return 结果 + */ + boolean processInvalid(FlowInvalidBo bo); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java new file mode 100644 index 0000000..116cb74 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java @@ -0,0 +1,22 @@ +package org.dromara.workflow.service; + +import org.dromara.common.core.domain.dto.UserDTO; + +import java.util.List; + +/** + * 流程设计器-获取办理人 + * + * @author AprilWind + */ +public interface IFlwTaskAssigneeService { + + /** + * 根据存储标识符(storageId)解析分配类型和ID,并获取对应的用户列表 + * + * @param storageId 包含分配类型和ID的字符串(例如 "user:123" 或 "role:456") + * @return 与分配类型和ID匹配的用户列表,如果格式无效则返回空列表 + */ + List fetchUsersByStorageId(String storageId); + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java new file mode 100644 index 0000000..11034e7 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -0,0 +1,191 @@ +package org.dromara.workflow.service; + +import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.warm.flow.core.entity.Node; +import org.dromara.warm.flow.orm.entity.FlowHisTask; +import org.dromara.warm.flow.orm.entity.FlowTask; +import org.dromara.workflow.domain.bo.*; +import org.dromara.workflow.domain.vo.FlowHisTaskVo; +import org.dromara.workflow.domain.vo.FlowTaskVo; + +import java.util.List; +import java.util.Map; + +/** + * 任务 服务层 + * + * @author may + */ +public interface IFlwTaskService { + + /** + * 启动任务 + * + * @param startProcessBo 启动流程参数 + * @return 结果 + */ + StartProcessReturnDTO startWorkFlow(StartProcessBo startProcessBo); + + /** + * 办理任务 + * + * @param completeTaskBo 办理任务参数 + * @return 结果 + */ + boolean completeTask(CompleteTaskBo completeTaskBo); + + /** + * 查询当前用户的待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + + /** + * 查询当前租户所有待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + + /** + * 查询待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery); + + /** + * 查询已办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery); + + /** + * 查询当前用户的抄送 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + * @return 结果 + */ + TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery); + + /** + * 修改任务办理人 + * + * @param taskIdList 任务id + * @param userId 用户id + * @return 结果 + */ + boolean updateAssignee(List taskIdList, String userId); + + /** + * 驳回审批 + * + * @param bo 参数 + * @return 结果 + */ + boolean backProcess(BackProcessBo bo); + + /** + * 获取可驳回的前置节点 + * + * @param definitionId 流程定义id + * @param nowNodeCode 当前节点 + * @return 结果 + */ + List getBackTaskNode(Long definitionId, String nowNodeCode); + + /** + * 终止任务 + * + * @param bo 参数 + * @return 结果 + */ + boolean terminationTask(FlowTerminationBo bo); + + /** + * 按照任务id查询任务 + * + * @param taskIdList 任务id + * @return 结果 + */ + List selectByIdList(List taskIdList); + + /** + * 按照任务id查询任务 + * + * @param taskId 任务id + * @return 结果 + */ + FlowTaskVo selectById(Long taskId); + + /** + * 按照任务id查询任务 + * + * @param taskIdList 任务id + * @return 结果 + */ + List selectHisTaskByIdList(List taskIdList); + + /** + * 按照任务id查询任务 + * + * @param taskId 任务id + * @return 结果 + */ + FlowHisTask selectHisTaskById(Long taskId); + + /** + * 按照实例id查询任务 + * + * @param instanceIdList 流程实例id + * @return 结果 + */ + List selectByInstIdList(List instanceIdList); + + /** + * 按照实例id查询任务 + * + * @param instanceId 流程实例id + * @return 结果 + */ + List selectByInstId(Long instanceId); + + /** + * 任务操作 + * + * @param bo 参数 + * @param taskOperation 操作类型,委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature + * @return 结果 + */ + boolean taskOperation(TaskOperationBo bo, String taskOperation); + + /** + * 获取任务所有办理人 + * + * @param taskIdList 任务id + * @return 结果 + */ + Map> currentTaskAllUser(List taskIdList); + + /** + * 获取当前任务的所有办理人 + * + * @param taskId 任务id + * @return 结果 + */ + List currentTaskAllUser(Long taskId); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITActivityService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITActivityService.java new file mode 100644 index 0000000..b7696b6 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITActivityService.java @@ -0,0 +1,68 @@ +package org.dromara.workflow.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.workflow.domain.bo.TActivityBo; +import org.dromara.workflow.domain.vo.TActivityVo; + +import java.util.Collection; +import java.util.List; + +/** + * 活动Service接口 + * + * @author Lion Li + * @date 2024-07-19 + */ +public interface ITActivityService { + + /** + * 查询活动 + * + * @param id 主键 + * @return 活动 + */ + TActivityVo queryById(Long id); + + /** + * 分页查询活动列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 活动分页列表 + */ + TableDataInfo queryPageList(TActivityBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的活动列表 + * + * @param bo 查询条件 + * @return 活动列表 + */ + List queryList(TActivityBo bo); + + /** + * 新增活动 + * + * @param bo 活动 + * @return 是否新增成功 + */ + Boolean insertByBo(TActivityBo bo); + + /** + * 修改活动 + * + * @param bo 活动 + * @return 是否修改成功 + */ + Boolean updateByBo(TActivityBo bo); + + /** + * 校验并批量删除活动信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java new file mode 100644 index 0000000..67b50ba --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -0,0 +1,47 @@ +package org.dromara.workflow.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.workflow.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.vo.TestLeaveVo; + +import java.util.List; + +/** + * 请假Service接口 + * + * @author may + * @date 2023-07-21 + */ +public interface ITestLeaveService { + + /** + * 查询请假 + */ + TestLeaveVo queryById(Long id); + + /** + * 查询请假列表 + */ + TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery); + + /** + * 查询请假列表 + */ + List queryList(TestLeaveBo bo); + + /** + * 新增请假 + */ + TestLeaveVo insertByBo(TestLeaveBo bo); + + /** + * 修改请假 + */ + TestLeaveVo updateByBo(TestLeaveBo bo); + + /** + * 校验并批量删除请假信息 + */ + Boolean deleteWithValidByIds(List ids); +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java new file mode 100644 index 0000000..8c73b59 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java @@ -0,0 +1,37 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.convert.Convert; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.translation.annotation.TranslationType; +import org.dromara.common.translation.core.TranslationInterface; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.constant.FlowConstant; +import org.dromara.workflow.service.IFlwCategoryService; +import org.springframework.stereotype.Service; + +/** + * 流程分类名称翻译实现 + * + * @author AprilWind + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +@TranslationType(type = FlowConstant.CATEGORY_ID_TO_NAME) +public class CategoryNameTranslationImpl implements TranslationInterface { + + private final IFlwCategoryService flwCategoryService; + + @Override + public String translation(Object key, String other) { + Long id = null; + if (key instanceof String categoryId) { + id = Convert.toLong(categoryId); + } else if (key instanceof Long categoryId) { + id = categoryId; + } + return flwCategoryService.selectCategoryNameById(id); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java new file mode 100644 index 0000000..db1b7b7 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java @@ -0,0 +1,269 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.tree.Tree; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.SystemConstants; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.*; +import org.dromara.common.mybatis.helper.DataBaseHelper; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.warm.flow.core.service.DefService; +import org.dromara.warm.flow.orm.entity.FlowDefinition; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.constant.FlowConstant; +import org.dromara.workflow.domain.FlowCategory; +import org.dromara.workflow.domain.bo.FlowCategoryBo; +import org.dromara.workflow.domain.vo.FlowCategoryVo; +import org.dromara.workflow.mapper.FlwCategoryMapper; +import org.dromara.workflow.service.IFlwCategoryService; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * 流程分类Service业务层处理 + * + * @author may + */ +@ConditionalOnEnable +@RequiredArgsConstructor +@Service +public class FlwCategoryServiceImpl implements IFlwCategoryService { + + private final DefService defService; + private final FlwCategoryMapper baseMapper; + + /** + * 查询流程分类 + * + * @param categoryId 主键 + * @return 流程分类 + */ + @Override + public FlowCategoryVo queryById(Long categoryId) { + FlowCategoryVo category = baseMapper.selectVoById(categoryId); + if (ObjectUtil.isNull(category)) { + return null; + } + FlowCategoryVo parentCategory = baseMapper.selectVoOne(new LambdaQueryWrapper() + .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, category.getParentId())); + category.setParentName(ObjectUtils.notNullGetter(parentCategory, FlowCategoryVo::getCategoryName)); + return category; + } + + /** + * 根据流程分类ID查询流程分类名称 + * + * @param categoryId 流程分类ID + * @return 流程分类名称 + */ + @Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") + @Override + public String selectCategoryNameById(Long categoryId) { + if (ObjectUtil.isNull(categoryId)) { + return null; + } + FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper() + .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId)); + return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName); + } + + /** + * 查询符合条件的流程分类列表 + * + * @param bo 查询条件 + * @return 流程分类列表 + */ + @Override + public List queryList(FlowCategoryBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + /** + * 查询流程分类树结构信息 + * + * @param category 流程分类信息 + * @return 流程分类树信息集合 + */ + @Override + public List> selectCategoryTreeList(FlowCategoryBo category) { + LambdaQueryWrapper lqw = buildQueryWrapper(category); + List categorys = baseMapper.selectVoList(lqw); + if (CollUtil.isEmpty(categorys)) { + return CollUtil.newArrayList(); + } + // 获取当前列表中每一个节点的parentId,然后在列表中查找是否有id与其parentId对应,若无对应,则表明此时节点列表中,该节点在当前列表中属于顶级节点 + List> treeList = CollUtil.newArrayList(); + for (FlowCategoryVo d : categorys) { + String parentId = d.getParentId().toString(); + FlowCategoryVo categoryVo = StreamUtils.findFirst(categorys, it -> it.getCategoryId().toString().equals(parentId)); + if (ObjectUtil.isNull(categoryVo)) { + List> trees = TreeBuildUtils.build(categorys, parentId, (dept, tree) -> + tree.setId(dept.getCategoryId().toString()) + .setParentId(dept.getParentId().toString()) + .setName(dept.getCategoryName()) + .setWeight(dept.getOrderNum())); + Tree tree = StreamUtils.findFirst(trees, it -> it.getId().equals(d.getCategoryId().toString())); + treeList.add(tree); + } + } + return treeList; + } + + /** + * 校验流程分类是否有数据权限 + * + * @param categoryId 流程分类ID + */ + @Override + public void checkCategoryDataScope(Long categoryId) { + if (ObjectUtil.isNull(categoryId)) { + return; + } + if (LoginHelper.isSuperAdmin()) { + return; + } + if (baseMapper.countCategoryById(categoryId) == 0) { + throw new ServiceException("没有权限访问流程分类数据!"); + } + } + + /** + * 校验流程分类名称是否唯一 + * + * @param category 流程分类信息 + * @return 结果 + */ + @Override + public boolean checkCategoryNameUnique(FlowCategoryBo category) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(FlowCategory::getCategoryName, category.getCategoryName()) + .eq(FlowCategory::getParentId, category.getParentId()) + .ne(ObjectUtil.isNotNull(category.getCategoryId()), FlowCategory::getCategoryId, category.getCategoryId())); + return !exist; + } + + /** + * 查询流程分类是否存在流程定义 + * + * @param categoryId 流程分类ID + * @return 结果 true 存在 false 不存在 + */ + @Override + public boolean checkCategoryExistDefinition(Long categoryId) { + FlowDefinition definition = new FlowDefinition(); + definition.setCategory(categoryId.toString()); + return defService.exists(definition); + } + + /** + * 是否存在流程分类子节点 + * + * @param categoryId 流程分类ID + * @return 结果 + */ + @Override + public boolean hasChildByCategoryId(Long categoryId) { + return baseMapper.exists(new LambdaQueryWrapper() + .eq(FlowCategory::getParentId, categoryId)); + } + + private LambdaQueryWrapper buildQueryWrapper(FlowCategoryBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(FlowCategory::getDelFlag, SystemConstants.NORMAL); + lqw.eq(ObjectUtil.isNotNull(bo.getCategoryId()), FlowCategory::getCategoryId, bo.getCategoryId()); + lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), FlowCategory::getParentId, bo.getParentId()); + lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), FlowCategory::getCategoryName, bo.getCategoryName()); + lqw.orderByAsc(FlowCategory::getAncestors); + lqw.orderByAsc(FlowCategory::getParentId); + lqw.orderByAsc(FlowCategory::getOrderNum); + lqw.orderByAsc(FlowCategory::getCategoryId); + return lqw; + } + + /** + * 新增流程分类 + * + * @param bo 流程分类 + * @return 是否新增成功 + */ + @Override + public int insertByBo(FlowCategoryBo bo) { + FlowCategory info = baseMapper.selectById(bo.getParentId()); + FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class); + category.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + category.getParentId()); + return baseMapper.insert(category); + } + + /** + * 修改流程分类 + * + * @param bo 流程分类 + * @return 是否修改成功 + */ + @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#bo.categoryId") + @Override + public int updateByBo(FlowCategoryBo bo) { + FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class); + FlowCategory oldCategory = baseMapper.selectById(category.getCategoryId()); + if (ObjectUtil.isNull(oldCategory)) { + throw new ServiceException("流程分类不存在,无法修改"); + } + if (!oldCategory.getParentId().equals(category.getParentId())) { + // 如果是新父流程分类 则校验是否具有新父流程分类权限 避免越权 + this.checkCategoryDataScope(category.getParentId()); + FlowCategory newParentCategory = baseMapper.selectById(category.getParentId()); + if (ObjectUtil.isNotNull(newParentCategory)) { + String newAncestors = newParentCategory.getAncestors() + StringUtils.SEPARATOR + newParentCategory.getCategoryId(); + String oldAncestors = oldCategory.getAncestors(); + category.setAncestors(newAncestors); + updateCategoryChildren(category.getCategoryId(), newAncestors, oldAncestors); + } + } else { + category.setAncestors(oldCategory.getAncestors()); + } + return baseMapper.updateById(category); + } + + /** + * 修改子元素关系 + * + * @param categoryId 被修改的流程分类ID + * @param newAncestors 新的父ID集合 + * @param oldAncestors 旧的父ID集合 + */ + private void updateCategoryChildren(Long categoryId, String newAncestors, String oldAncestors) { + List children = baseMapper.selectList(new LambdaQueryWrapper() + .apply(DataBaseHelper.findInSet(categoryId, "ancestors"))); + List list = new ArrayList<>(); + for (FlowCategory child : children) { + FlowCategory category = new FlowCategory(); + category.setCategoryId(child.getCategoryId()); + category.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); + list.add(category); + } + if (CollUtil.isNotEmpty(list)) { + baseMapper.updateBatchById(list); + } + } + + /** + * 删除流程分类信息 + * + * @param categoryId 主键 + * @return 是否删除成功 + */ + @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") + @Override + public int deleteWithValidById(Long categoryId) { + return baseMapper.deleteById(categoryId); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java new file mode 100644 index 0000000..b4ebcdf --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -0,0 +1,271 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.io.IoUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.warm.flow.core.dto.DefJson; +import org.dromara.warm.flow.core.enums.NodeType; +import org.dromara.warm.flow.core.enums.PublishStatus; +import org.dromara.warm.flow.core.service.DefService; +import org.dromara.warm.flow.orm.entity.FlowDefinition; +import org.dromara.warm.flow.orm.entity.FlowHisTask; +import org.dromara.warm.flow.orm.entity.FlowNode; +import org.dromara.warm.flow.orm.entity.FlowSkip; +import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper; +import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; +import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; +import org.dromara.warm.flow.orm.mapper.FlowSkipMapper; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.constant.FlowConstant; +import org.dromara.workflow.domain.FlowCategory; +import org.dromara.workflow.domain.vo.FlowDefinitionVo; +import org.dromara.workflow.mapper.FlwCategoryMapper; +import org.dromara.workflow.service.IFlwDefinitionService; +import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.dromara.common.core.constant.TenantConstants.DEFAULT_TENANT_ID; + +/** + * 流程定义 服务层实现 + * + * @author may + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +public class FlwDefinitionServiceImpl implements IFlwDefinitionService { + + private final DefService defService; + private final FlowDefinitionMapper flowDefinitionMapper; + private final FlowHisTaskMapper flowHisTaskMapper; + private final FlowNodeMapper flowNodeMapper; + private final FlowSkipMapper flowSkipMapper; + private final FlwCategoryMapper flwCategoryMapper; + + /** + * 查询流程定义列表 + * + * @param flowDefinition 流程定义信息 + * @param pageQuery 分页 + * @return 返回分页列表 + */ + @Override + public TableDataInfo queryList(FlowDefinition flowDefinition, PageQuery pageQuery) { + LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); + wrapper.eq(FlowDefinition::getIsPublish, PublishStatus.PUBLISHED.getKey()); + Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); + TableDataInfo build = TableDataInfo.build(); + build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); + build.setTotal(page.getTotal()); + return build; + } + + /** + * 查询未发布的流程定义列表 + * + * @param flowDefinition 流程定义信息 + * @param pageQuery 分页 + * @return 返回分页列表 + */ + @Override + public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition); + wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey())); + Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper); + TableDataInfo build = TableDataInfo.build(); + build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class)); + build.setTotal(page.getTotal()); + return build; + } + + private LambdaQueryWrapper buildQueryWrapper(FlowDefinition flowDefinition) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), FlowDefinition::getFlowCode, flowDefinition.getFlowCode()); + wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), FlowDefinition::getFlowName, flowDefinition.getFlowName()); + if (StringUtils.isNotBlank(flowDefinition.getCategory())) { + List categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowDefinition.getCategory())); + wrapper.in(FlowDefinition::getCategory, StreamUtils.toList(categoryIds, Convert::toStr)); + } + wrapper.orderByDesc(FlowDefinition::getCreateTime); + return wrapper; + } + + /** + * 发布流程定义 + * + * @param id 流程定义id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean publish(Long id) { + List flowNodes = flowNodeMapper.selectList(new LambdaQueryWrapper().eq(FlowNode::getDefinitionId, id)); + List errorMsg = new ArrayList<>(); + if (CollUtil.isNotEmpty(flowNodes)) { + for (FlowNode flowNode : flowNodes) { + String applyNodeCode = WorkflowUtils.applyNodeCode(id); + if (StringUtils.isBlank(flowNode.getPermissionFlag()) && !applyNodeCode.equals(flowNode.getNodeCode()) && NodeType.BETWEEN.getKey().equals(flowNode.getNodeType())) { + errorMsg.add(flowNode.getNodeName()); + } + } + if (CollUtil.isNotEmpty(errorMsg)) { + throw new ServiceException("节点【" + StringUtils.join(errorMsg, ",") + "】未配置办理人!"); + } + } + return defService.publish(id); + } + + /** + * 导入流程定义 + * + * @param file 文件 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean importJson(MultipartFile file, String category) { + try { + DefJson defJson = JsonUtils.parseObject(file.getBytes(), DefJson.class); + defJson.setCategory(category); + defService.importDef(defJson); + } catch (IOException e) { + log.error("读取文件流错误: {}", e.getMessage(), e); + throw new IllegalStateException("文件读取失败,请检查文件内容", e); + } + return true; + } + + /** + * 导出流程定义 + * + * @param id 流程定义id + * @param response 响应 + * @throws IOException 异常 + */ + @Override + public void exportDef(Long id, HttpServletResponse response) throws IOException { + byte[] data = defService.exportJson(id).getBytes(StandardCharsets.UTF_8); + // 设置响应头和内容类型 + response.reset(); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + response.setContentType("application/text"); + response.setHeader("Content-Disposition", "attachment;"); + response.addHeader("Content-Length", "" + data.length); + IoUtil.write(response.getOutputStream(), false, data); + } + + /** + * 删除流程定义 + * + * @param ids 流程定义id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean removeDef(List ids) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.in(FlowHisTask::getDefinitionId, ids); + List flowHisTasks = flowHisTaskMapper.selectList(wrapper); + if (CollUtil.isNotEmpty(flowHisTasks)) { + List flowDefinitions = flowDefinitionMapper.selectByIds(StreamUtils.toList(flowHisTasks, FlowHisTask::getDefinitionId)); + if (CollUtil.isNotEmpty(flowDefinitions)) { + String join = StreamUtils.join(flowDefinitions, FlowDefinition::getFlowCode); + log.error("流程定义【{}】已被使用不可被删除!", join); + throw new ServiceException("流程定义【" + join + "】已被使用不可被删除!"); + } + } + try { + defService.removeDef(ids); + } catch (Exception e) { + log.error("Error removing flow definitions: {}", e.getMessage(), e); + throw new RuntimeException("Failed to remove flow definitions", e); + } + return true; + } + + /** + * 新增租户流程定义 + * + * @param tenantId 租户id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void syncDef(String tenantId) { + List flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper().eq(FlowDefinition::getTenantId, DEFAULT_TENANT_ID)); + if (CollUtil.isEmpty(flowDefinitions)) { + return; + } + FlowCategory flowCategory = flwCategoryMapper.selectOne(new LambdaQueryWrapper() + .eq(FlowCategory::getTenantId, DEFAULT_TENANT_ID).eq(FlowCategory::getCategoryId, FlowConstant.FLOW_CATEGORY_ID)); + flowCategory.setCategoryId(null); + flowCategory.setTenantId(tenantId); + flowCategory.setCreateDept(null); + flowCategory.setCreateBy(null); + flowCategory.setCreateTime(null); + flowCategory.setUpdateBy(null); + flowCategory.setUpdateTime(null); + flwCategoryMapper.insert(flowCategory); + List defIds = StreamUtils.toList(flowDefinitions, FlowDefinition::getId); + List flowNodes = flowNodeMapper.selectList(new LambdaQueryWrapper().in(FlowNode::getDefinitionId, defIds)); + List flowSkips = flowSkipMapper.selectList(new LambdaQueryWrapper().in(FlowSkip::getDefinitionId, defIds)); + for (FlowDefinition definition : flowDefinitions) { + FlowDefinition flowDefinition = BeanUtil.toBean(definition, FlowDefinition.class); + flowDefinition.setId(null); + flowDefinition.setTenantId(tenantId); + flowDefinition.setIsPublish(0); + flowDefinition.setCategory(String.valueOf(flowCategory.getCategoryId())); + int insert = flowDefinitionMapper.insert(flowDefinition); + if (insert <= 0) { + log.info("同步流程定义【{}】失败!", definition.getFlowCode()); + continue; + } + log.info("同步流程定义【{}】成功!", definition.getFlowCode()); + Long definitionId = flowDefinition.getId(); + if (CollUtil.isNotEmpty(flowNodes)) { + List nodes = StreamUtils.filter(flowNodes, node -> node.getDefinitionId().equals(definition.getId())); + if (CollUtil.isNotEmpty(nodes)) { + List flowNodeList = BeanUtil.copyToList(nodes, FlowNode.class); + flowNodeList.forEach(e -> { + e.setId(null); + e.setDefinitionId(definitionId); + e.setTenantId(tenantId); + e.setPermissionFlag(null); + }); + flowNodeMapper.insertOrUpdate(flowNodeList); + } + } + if (CollUtil.isNotEmpty(flowSkips)) { + List skips = StreamUtils.filter(flowSkips, skip -> skip.getDefinitionId().equals(definition.getId())); + if (CollUtil.isNotEmpty(skips)) { + List flowSkipList = BeanUtil.copyToList(skips, FlowSkip.class); + flowSkipList.forEach(e -> { + e.setId(null); + e.setDefinitionId(definitionId); + e.setTenantId(tenantId); + }); + flowSkipMapper.insertOrUpdate(flowSkipList); + } + } + } + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java new file mode 100644 index 0000000..db8ab71 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -0,0 +1,451 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.warm.flow.core.FlowEngine; +import org.dromara.warm.flow.core.constant.ExceptionCons; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.entity.Definition; +import org.dromara.warm.flow.core.entity.Instance; +import org.dromara.warm.flow.core.entity.Task; +import org.dromara.warm.flow.core.enums.NodeType; +import org.dromara.warm.flow.core.service.ChartService; +import org.dromara.warm.flow.core.service.DefService; +import org.dromara.warm.flow.core.service.InsService; +import org.dromara.warm.flow.core.service.TaskService; +import org.dromara.warm.flow.orm.entity.FlowHisTask; +import org.dromara.warm.flow.orm.entity.FlowInstance; +import org.dromara.warm.flow.orm.entity.FlowTask; +import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; +import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.enums.TaskStatusEnum; +import org.dromara.workflow.domain.bo.FlowCancelBo; +import org.dromara.workflow.domain.bo.FlowInstanceBo; +import org.dromara.workflow.domain.bo.FlowInvalidBo; +import org.dromara.workflow.domain.vo.FlowHisTaskVo; +import org.dromara.workflow.domain.vo.FlowInstanceVo; +import org.dromara.workflow.domain.vo.FlowVariableVo; +import org.dromara.workflow.handler.FlowProcessEventHandler; +import org.dromara.workflow.mapper.FlwCategoryMapper; +import org.dromara.workflow.mapper.FlwInstanceMapper; +import org.dromara.workflow.service.IFlwInstanceService; +import org.dromara.workflow.service.IFlwTaskService; +import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 流程实例 服务层实现 + * + * @author may + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +public class FlwInstanceServiceImpl implements IFlwInstanceService { + + private final InsService insService; + private final DefService defService; + private final ChartService chartService; + private final TaskService taskService; + private final FlowHisTaskMapper flowHisTaskMapper; + private final FlowInstanceMapper flowInstanceMapper; + private final FlowProcessEventHandler flowProcessEventHandler; + private final IFlwTaskService flwTaskService; + private final FlwInstanceMapper flwInstanceMapper; + private final FlwCategoryMapper flwCategoryMapper; + + /** + * 分页查询正在运行的流程实例 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); + queryWrapper.in("fi.flow_status", BusinessStatusEnum.runningStatus()); + Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 分页查询已结束的流程实例 + * + * @param flowInstanceBo 流程实例 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); + queryWrapper.in("fi.flow_status", BusinessStatusEnum.finishStatus()); + Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 根据业务id查询流程实例详细信息 + * + * @param businessId 业务id + * @return 结果 + */ + @Override + public FlowInstanceVo queryByBusinessId(Long businessId) { + FlowInstance instance = this.selectInstByBusinessId(String.valueOf(businessId)); + FlowInstanceVo instanceVo = BeanUtil.toBean(instance, FlowInstanceVo.class); + Definition definition = defService.getById(instanceVo.getDefinitionId()); + instanceVo.setFlowName(definition.getFlowName()); + instanceVo.setFlowCode(definition.getFlowCode()); + instanceVo.setVersion(definition.getVersion()); + instanceVo.setFormCustom(definition.getFormCustom()); + instanceVo.setFormPath(definition.getFormPath()); + instanceVo.setCategory(definition.getCategory()); + return instanceVo; + } + + /** + * 通用查询条件 + * + * @param flowInstanceBo 查询条件 + * @return 查询条件构造方法 + */ + private QueryWrapper buildQueryWrapper(FlowInstanceBo flowInstanceBo) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNodeName()), "fi.node_name", flowInstanceBo.getNodeName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowName()), "fd.flow_name", flowInstanceBo.getFlowName()); + queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode()); + if (StringUtils.isNotBlank(flowInstanceBo.getCategory())) { + List categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowInstanceBo.getCategory())); + queryWrapper.in("fd.category", StreamUtils.toList(categoryIds, Convert::toStr)); + } + queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getBusinessId()), "fi.business_id", flowInstanceBo.getBusinessId()); + queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds()); + queryWrapper.eq("fi.del_flag", "0"); + queryWrapper.orderByDesc("fi.create_time"); + return queryWrapper; + } + + /** + * 根据业务id查询流程实例 + * + * @param businessId 业务id + */ + @Override + public FlowInstance selectInstByBusinessId(String businessId) { + return flowInstanceMapper.selectOne(new LambdaQueryWrapper().eq(FlowInstance::getBusinessId, businessId)); + } + + /** + * 按照实例id查询流程实例 + * + * @param instanceId 实例id + */ + @Override + public FlowInstance selectInstById(Long instanceId) { + return flowInstanceMapper.selectById(instanceId); + } + + /** + * 按照实例id查询流程实例 + * + * @param instanceIds 实例id + */ + @Override + public List selectInstListByIdList(List instanceIds) { + return flowInstanceMapper.selectByIds(instanceIds); + } + + /** + * 按照业务id删除流程实例 + * + * @param businessIds 业务id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean deleteByBusinessIds(List businessIds) { + List flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper().in(FlowInstance::getBusinessId, businessIds)); + if (CollUtil.isEmpty(flowInstances)) { + log.warn("未找到对应的流程实例信息,无法执行删除操作。"); + return false; + } + return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId)); + } + + /** + * 按照实例id删除流程实例 + * + * @param instanceIds 实例id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean deleteByInstanceIds(List instanceIds) { + // 获取实例信息 + List instances = insService.getByIds(instanceIds); + if (CollUtil.isEmpty(instances)) { + log.warn("未找到对应的流程实例信息,无法执行删除操作。"); + return false; + } + // 获取定义信息 + Map definitionMap = defService.getByIds( + StreamUtils.toList(instances, Instance::getDefinitionId) + ).stream().collect(Collectors.toMap(Definition::getId, definition -> definition)); + + // 逐一触发删除事件 + instances.forEach(instance -> { + Definition definition = definitionMap.get(instance.getDefinitionId()); + if (ObjectUtil.isNull(definition)) { + log.warn("实例 ID: {} 对应的流程定义信息未找到,跳过删除事件触发。", instance.getId()); + return; + } + flowProcessEventHandler.processDeleteHandler(definition.getFlowCode(), instance.getBusinessId()); + }); + + // 删除实例 + return insService.remove(instanceIds); + } + + /** + * 撤销流程 + * + * @param bo 参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean cancelProcessApply(FlowCancelBo bo) { + try { + Instance instance = selectInstByBusinessId(bo.getBusinessId()); + if (instance == null) { + throw new ServiceException(ExceptionCons.NOT_FOUNT_INSTANCE); + } + Definition definition = defService.getById(instance.getDefinitionId()); + if (definition == null) { + throw new ServiceException(ExceptionCons.NOT_FOUNT_DEF); + } + String message = bo.getMessage(); + BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus()); + String applyNodeCode = WorkflowUtils.applyNodeCode(definition.getId()); + //撤销 + WorkflowUtils.backTask(message, instance.getId(), applyNodeCode, BusinessStatusEnum.CANCEL.getStatus(), BusinessStatusEnum.CANCEL.getStatus()); + //判断或签节点是否有多个,只保留一个 + List currentTaskList = taskService.list(FlowEngine.newTask().setInstanceId(instance.getId())); + if (CollUtil.isNotEmpty(currentTaskList)) { + if (currentTaskList.size() > 1) { + currentTaskList.remove(0); + WorkflowUtils.deleteRunTask(StreamUtils.toList(currentTaskList, Task::getId)); + } + } + + } catch (Exception e) { + log.error("撤销失败: {}", e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + return true; + } + + /** + * 获取当前登陆人发起的流程实例 + * + * @param instanceBo 流程实例 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(instanceBo); + queryWrapper.eq("fi.create_by", LoginHelper.getUserIdStr()); + Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 获取流程图,流程记录 + * + * @param businessId 业务id + */ + @Override + public Map flowImage(String businessId) { + FlowInstance flowInstance = this.selectInstByBusinessId(businessId); + if (ObjectUtil.isNull(flowInstance)) { + throw new ServiceException(ExceptionCons.NOT_FOUNT_INSTANCE); + } + Long instanceId = flowInstance.getId(); + //运行中的任务 + List list = new ArrayList<>(); + List flowTaskList = flwTaskService.selectByInstId(instanceId); + if (CollUtil.isNotEmpty(flowTaskList)) { + List flowHisTaskVos = BeanUtil.copyToList(flowTaskList, FlowHisTaskVo.class); + for (FlowHisTaskVo flowHisTaskVo : flowHisTaskVos) { + flowHisTaskVo.setFlowStatus(TaskStatusEnum.WAITING.getStatus()); + flowHisTaskVo.setUpdateTime(null); + flowHisTaskVo.setRunDuration(null); + List allUser = flwTaskService.currentTaskAllUser(flowHisTaskVo.getId()); + if (CollUtil.isNotEmpty(allUser)) { + String join = StreamUtils.join(allUser, e -> String.valueOf(e.getUserId())); + flowHisTaskVo.setApprover(join); + } + if (BusinessStatusEnum.isDraftOrCancelOrBack(flowInstance.getFlowStatus())) { + flowHisTaskVo.setApprover(LoginHelper.getUserIdStr()); + flowHisTaskVo.setApproveName(LoginHelper.getLoginUser().getNickname()); + } + } + list.addAll(flowHisTaskVos); + } + //历史任务 + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(FlowHisTask::getInstanceId, instanceId); + wrapper.eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey()); + wrapper.orderByDesc(FlowHisTask::getCreateTime).orderByDesc(FlowHisTask::getUpdateTime); + List flowHisTasks = flowHisTaskMapper.selectList(wrapper); + if (CollUtil.isNotEmpty(flowHisTasks)) { + list.addAll(BeanUtil.copyToList(flowHisTasks, FlowHisTaskVo.class)); + } + String flowChart = chartService.chartIns(instanceId); + return Map.of("list", list, "image", flowChart); + } + + /** + * 按照实例id更新状态 + * + * @param instanceId 实例id + * @param status 状态 + */ + @Override + public void updateStatus(Long instanceId, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.set(FlowInstance::getFlowStatus, status); + wrapper.eq(FlowInstance::getId, instanceId); + flowInstanceMapper.update(wrapper); + } + + /** + * 获取流程变量 + * + * @param instanceId 实例id + */ + @Override + public Map instanceVariable(Long instanceId) { + Map map = new HashMap<>(); + FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId); + Map variableMap = flowInstance.getVariableMap(); + List list = new ArrayList<>(); + if (CollUtil.isNotEmpty(variableMap)) { + for (Map.Entry entry : variableMap.entrySet()) { + FlowVariableVo flowVariableVo = new FlowVariableVo(); + flowVariableVo.setKey(entry.getKey()); + flowVariableVo.setValue(entry.getValue().toString()); + list.add(flowVariableVo); + } + } + map.put("variableList", list); + map.put("variable", flowInstance.getVariable()); + return map; + } + + /** + * 设置流程变量 + * + * @param instanceId 实例id + * @param variable 流程变量 + */ + @Override + public void setVariable(Long instanceId, Map variable) { + Instance instance = insService.getById(instanceId); + if (instance != null) { + taskService.mergeVariable(instance, variable); + } + } + + /** + * 按任务id查询实例 + * + * @param taskId 任务id + */ + @Override + public FlowInstance selectByTaskId(Long taskId) { + Task task = taskService.getById(taskId); + if (task == null) { + FlowHisTask flowHisTask = flwTaskService.selectHisTaskById(taskId); + if (flowHisTask != null) { + return this.selectInstById(flowHisTask.getInstanceId()); + } + } else { + return this.selectInstById(task.getInstanceId()); + } + return null; + } + + /** + * 按任务id查询实例 + * + * @param taskIdList 任务id + */ + @Override + public List selectByTaskIdList(List taskIdList) { + if (CollUtil.isEmpty(taskIdList)) { + return Collections.emptyList(); + } + Set instanceIds = new HashSet<>(); + List flowTaskList = flwTaskService.selectByIdList(taskIdList); + for (FlowTask flowTask : flowTaskList) { + instanceIds.add(flowTask.getInstanceId()); + } + List flowHisTaskList = flwTaskService.selectHisTaskByIdList(taskIdList); + for (FlowHisTask flowHisTask : flowHisTaskList) { + instanceIds.add(flowHisTask.getInstanceId()); + } + if (!instanceIds.isEmpty()) { + return this.selectInstListByIdList(new ArrayList<>(instanceIds)); + } + return Collections.emptyList(); + } + + /** + * 作废流程 + * + * @param bo 参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean processInvalid(FlowInvalidBo bo) { + try { + Instance instance = insService.getById(bo.getId()); + if (instance != null) { + BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus()); + } + List flowTaskList = flwTaskService.selectByInstId(bo.getId()); + for (FlowTask flowTask : flowTaskList) { + FlowParams flowParams = new FlowParams(); + flowParams.message(bo.getComment()); + flowParams.flowStatus(BusinessStatusEnum.INVALID.getStatus()) + .hisStatus(TaskStatusEnum.INVALID.getStatus()); + flowParams.ignore(true); + taskService.termination(flowTask.getId(), flowParams); + } + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java new file mode 100644 index 0000000..f7e58ed --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.dto.DictTypeDTO; +import org.dromara.common.core.service.DictService; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.warm.flow.ui.service.NodeExtService; +import org.dromara.warm.flow.ui.vo.NodeExt; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 流程设计器-节点扩展属性 + * + * @author AprilWind + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +public class FlwNodeExtServiceImpl implements NodeExtService { + + /** + * 权限页code + */ + private static final String PERMISSION_TAB = "wf_button_tab"; + + /** + * 权限页名称 + */ + private static final String PERMISSION_TAB_NAME = "权限"; + + /** + * 字典类型逗号分隔 + */ + private static final String DICT_TYPES = "wf_button_permission"; + + /** + * 基础设置 + */ + private static final int TYPE_BASE_SETTING = 1; + + /** + * 新页签 + */ + private static final int TYPE_NEW_TAB = 2; + + /** + * 存储不同 dictType 对应的配置信息 + */ + private static final Map> CHILD_NODE_MAP = new HashMap<>(); + + static { + CHILD_NODE_MAP.put("wf_button_permission", Map.of("type", 4, "must", false, "multiple", true)); + } + + private final DictService dictService; + + /** + * 获取节点扩展属性 + * + * @return 结果 + */ + @Override + public List getNodeExt() { + List nodeExtList = new ArrayList<>(); + // 构建按钮权限页面 + nodeExtList.add(buildNodeExt(PERMISSION_TAB, PERMISSION_TAB_NAME, TYPE_NEW_TAB, DICT_TYPES)); + return nodeExtList; + } + + /** + * 构建一个 NodeExt 对象 + * + * @param code 编码,此json中唯一 + * @param name 名称,如果type为新页签时,作为页签名称 + * @param type 节点类型,1:基础设置,2:新页签 + * @param dictTypes 字典类型逗号分隔 + * @return 返回构建好的 NodeExt 对象 + */ + private NodeExt buildNodeExt(String code, String name, int type, String dictTypes) { + NodeExt nodeExt = new NodeExt(); + nodeExt.setCode(code); + nodeExt.setType(type); + nodeExt.setName(name); + nodeExt.setChilds(StringUtils.splitList(dictTypes) + .stream().map(this::buildChildNode).toList() + ); + return nodeExt; + } + + /** + * 构建一个 ChildNode 对象 + * + * @param dictType 字典类型 + * @return 返回构建好的 ChildNode 对象 + */ + private NodeExt.ChildNode buildChildNode(String dictType) { + NodeExt.ChildNode childNode = new NodeExt.ChildNode(); + if (StringUtils.isBlank(dictType)) { + return childNode; + } + DictTypeDTO dictTypeDTO = dictService.getDictTypeDto(dictType); + if (ObjectUtil.isNull(dictTypeDTO)) { + return childNode; + } + // 编码,此json中唯一 + childNode.setCode(dictType); + // label名称 + childNode.setLabel(dictTypeDTO.getDictName()); + // 描述 + childNode.setDesc(dictTypeDTO.getRemark()); + Map map = CHILD_NODE_MAP.get(dictType); + // 1:输入框 2:输入框 3:下拉框 4:选择框 + childNode.setType(Convert.toInt(map.get("type"), 1)); + // 是否必填 + childNode.setMust(Convert.toBool(map.get("must"), false)); + // 是否多选 + childNode.setMultiple(Convert.toBool(map.get("multiple"), true)); + // 字典,下拉框和复选框时用到 + childNode.setDict(dictService.getDictDataDto(dictType) + .stream().map(x -> + new NodeExt.DictItem(x.getDictLabel(), x.getDictValue(), Convert.toBool(x.getIsDefault(), false)) + ).toList()); + return childNode; + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java new file mode 100644 index 0000000..5877bb5 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java @@ -0,0 +1,165 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.dto.DeptDTO; +import org.dromara.common.core.domain.dto.TaskAssigneeDTO; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.domain.model.TaskAssigneeBody; +import org.dromara.common.core.enums.FormatsType; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.DeptService; +import org.dromara.common.core.service.TaskAssigneeService; +import org.dromara.common.core.service.UserService; +import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.warm.flow.ui.dto.HandlerFunDto; +import org.dromara.warm.flow.ui.dto.HandlerQuery; +import org.dromara.warm.flow.ui.dto.TreeFunDto; +import org.dromara.warm.flow.ui.service.HandlerSelectService; +import org.dromara.warm.flow.ui.vo.HandlerSelectVo; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.enums.TaskAssigneeEnum; +import org.dromara.workflow.service.IFlwTaskAssigneeService; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * 流程设计器-获取办理人权限设置列表 + * + * @author AprilWind + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, HandlerSelectService { + + private static final String DEFAULT_GROUP_NAME = "默认分组"; + private final TaskAssigneeService taskAssigneeService; + private final UserService userService; + private final DeptService deptService; + + /** + * 获取办理人权限设置列表tabs页签 + * + * @return tabs页签 + */ + @Override + public List getHandlerType() { + return TaskAssigneeEnum.getAssigneeTypeList(); + } + + /** + * 获取办理列表, 同时构建左侧部门树状结构 + * + * @param query 查询条件 + * @return HandlerSelectVo + */ + @Override + public HandlerSelectVo getHandlerSelect(HandlerQuery query) { + // 获取任务办理类型 + TaskAssigneeEnum type = TaskAssigneeEnum.fromDesc(query.getHandlerType()); + // 转换查询条件为 TaskAssigneeBody + TaskAssigneeBody taskQuery = BeanUtil.toBean(query, TaskAssigneeBody.class); + + // 统一查询并构建业务数据 + TaskAssigneeDTO dto = fetchTaskAssigneeData(type, taskQuery); + List depts = fetchDeptData(type); + + return getHandlerSelectVo(buildHandlerData(dto, type), buildDeptTree(depts)); + } + + /** + * 根据任务办理类型查询对应的数据 + */ + private TaskAssigneeDTO fetchTaskAssigneeData(TaskAssigneeEnum type, TaskAssigneeBody taskQuery) { + return switch (type) { + case USER -> taskAssigneeService.selectUsersByTaskAssigneeList(taskQuery); + case ROLE -> taskAssigneeService.selectRolesByTaskAssigneeList(taskQuery); + case DEPT -> taskAssigneeService.selectDeptsByTaskAssigneeList(taskQuery); + case POST -> taskAssigneeService.selectPostsByTaskAssigneeList(taskQuery); + default -> throw new ServiceException("Unsupported handler type"); + }; + } + + /** + * 根据任务办理类型获取部门数据 + */ + private List fetchDeptData(TaskAssigneeEnum type) { + if (type == TaskAssigneeEnum.USER || type == TaskAssigneeEnum.DEPT || type == TaskAssigneeEnum.POST) { + return deptService.selectDeptsByList(); + } + return new ArrayList<>(); + } + + /** + * 构建部门树状结构 + */ + private TreeFunDto buildDeptTree(List depts) { + return new TreeFunDto<>(depts) + .setId(dept -> String.valueOf(dept.getDeptId())) + .setName(DeptDTO::getDeptName) + .setParentId(dept -> String.valueOf(dept.getParentId())); + } + + /** + * 构建任务办理人数据 + */ + private HandlerFunDto buildHandlerData(TaskAssigneeDTO dto, TaskAssigneeEnum type) { + return new HandlerFunDto<>(dto.getList(), dto.getTotal()) + .setStorageId(assignee -> type.getCode() + assignee.getStorageId()) + .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无")) + .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无")) + .setGroupName(assignee -> StringUtils.defaultIfBlank( + Optional.ofNullable(assignee.getGroupName()) + .map(deptService::selectDeptNameByIds) + .orElse(DEFAULT_GROUP_NAME), DEFAULT_GROUP_NAME)) + .setCreateTime(assignee -> DateUtils.parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, assignee.getCreateTime())); + } + + /** + * 根据存储标识符(storageId)解析分配类型和ID,并获取对应的用户列表 + * + * @param storageId 包含分配类型和ID的字符串(例如 "user:123" 或 "role:456") + * @return 与分配类型和ID匹配的用户列表,如果格式无效则返回空列表 + */ + @Override + public List fetchUsersByStorageId(String storageId) { + List list = new ArrayList<>(); + for (String str : storageId.split(StrUtil.COMMA)) { + String[] parts = str.split(StrUtil.COLON, 2); + if (parts.length < 2) { + list.addAll(getUsersByType(TaskAssigneeEnum.USER, List.of(Long.valueOf(parts[0])))); + } else { + list.addAll(getUsersByType(TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON), List.of(Long.valueOf(parts[1])))); + } + } + return list; + } + + /** + * 根据指定的任务分配类型(TaskAssigneeEnum)和 ID 列表,获取对应的用户信息列表 + * + * @param type 任务分配类型,表示用户、角色、部门或其他(TaskAssigneeEnum 枚举值) + * @param ids 与指定分配类型关联的 ID 列表(例如用户ID、角色ID、部门ID等) + * @return 返回包含用户信息的列表。如果类型为用户(USER),则通过用户ID列表查询; + * 如果类型为角色(ROLE),则通过角色ID列表查询; + * 如果类型为部门(DEPT),则通过部门ID列表查询; + * 如果类型为岗位(POST)或无法识别的类型,则返回空列表 + */ + private List getUsersByType(TaskAssigneeEnum type, List ids) { + return switch (type) { + case USER -> userService.selectListByIds(ids); + case ROLE -> userService.selectUsersByRoleIds(ids); + case DEPT -> userService.selectUsersByDeptIds(ids); + case POST -> userService.selectUsersByPostIds(ids); + }; + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java new file mode 100644 index 0000000..21a54d7 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -0,0 +1,687 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.service.UserService; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.ValidatorUtils; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.entity.*; +import org.dromara.warm.flow.core.enums.NodeType; +import org.dromara.warm.flow.core.enums.SkipType; +import org.dromara.warm.flow.core.service.*; +import org.dromara.warm.flow.orm.entity.*; +import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; +import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; +import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.common.enums.TaskAssigneeType; +import org.dromara.workflow.common.enums.TaskStatusEnum; +import org.dromara.workflow.domain.bo.*; +import org.dromara.workflow.domain.vo.FlowHisTaskVo; +import org.dromara.workflow.domain.vo.FlowTaskVo; +import org.dromara.workflow.handler.FlowProcessEventHandler; +import org.dromara.workflow.handler.WorkflowPermissionHandler; +import org.dromara.workflow.mapper.FlwCategoryMapper; +import org.dromara.workflow.mapper.FlwTaskMapper; +import org.dromara.workflow.service.IFlwTaskService; +import org.dromara.workflow.utils.WorkflowUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +import static org.dromara.workflow.common.constant.FlowConstant.*; + +/** + * 任务 服务层实现 + * + * @author may + */ +@ConditionalOnEnable +@Slf4j +@RequiredArgsConstructor +@Service +public class FlwTaskServiceImpl implements IFlwTaskService { + + private final TaskService taskService; + private final InsService insService; + private final DefService defService; + private final HisTaskService hisTaskService; + private final NodeService nodeService; + private final FlowInstanceMapper flowInstanceMapper; + private final FlowTaskMapper flowTaskMapper; + private final FlowHisTaskMapper flowHisTaskMapper; + private final IdentifierGenerator identifierGenerator; + private final FlowProcessEventHandler flowProcessEventHandler; + private final UserService userService; + private final FlwTaskMapper flwTaskMapper; + private final FlwCategoryMapper flwCategoryMapper; + + /** + * 启动任务 + * + * @param startProcessBo 启动流程参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public StartProcessReturnDTO startWorkFlow(StartProcessBo startProcessBo) { + String businessId = startProcessBo.getBusinessId(); + if (StringUtils.isBlank(businessId)) { + throw new ServiceException("启动工作流时必须包含业务ID"); + } + // 启动流程实例(提交申请) + Map variables = startProcessBo.getVariables(); + // 流程发起人 + variables.put(INITIATOR, LoginHelper.getUserIdStr()); + // 业务id + variables.put(BUSINESS_ID, businessId); + FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class) + .eq(FlowInstance::getBusinessId, businessId)); + if (ObjectUtil.isNotNull(flowInstance)) { + BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus()); + List taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId())); + StartProcessReturnDTO dto = new StartProcessReturnDTO(); + dto.setProcessInstanceId(taskList.get(0).getInstanceId()); + dto.setTaskId(taskList.get(0).getId()); + return dto; + } + FlowParams flowParams = new FlowParams(); + flowParams.flowCode(startProcessBo.getFlowCode()); + flowParams.variable(startProcessBo.getVariables()); + flowParams.flowStatus(BusinessStatusEnum.DRAFT.getStatus()); + Instance instance; + try { + instance = insService.start(businessId, flowParams); + } catch (Exception e) { + throw new ServiceException(e.getMessage()); + } + // 申请人执行流程 + List taskList = taskService.list(new FlowTask().setInstanceId(instance.getId())); + if (taskList.size() > 1) { + throw new ServiceException("请检查流程第一个环节是否为申请人!"); + } + StartProcessReturnDTO dto = new StartProcessReturnDTO(); + dto.setProcessInstanceId(instance.getId()); + dto.setTaskId(taskList.get(0).getId()); + return dto; + } + + /** + * 办理任务 + * + * @param completeTaskBo 办理任务参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean completeTask(CompleteTaskBo completeTaskBo) { + try { + // 获取任务ID并查询对应的流程任务和实例信息 + Long taskId = completeTaskBo.getTaskId(); + List messageType = completeTaskBo.getMessageType(); + String notice = completeTaskBo.getNotice(); + // 获取抄送人 + List flowCopyList = completeTaskBo.getFlowCopyList(); + FlowTask flowTask = flowTaskMapper.selectById(taskId); + if (ObjectUtil.isNull(flowTask)) { + throw new ServiceException("流程任务不存在或任务已审批!"); + } + Instance ins = insService.getById(flowTask.getInstanceId()); + // 获取流程定义信息 + Definition definition = defService.getById(flowTask.getDefinitionId()); + // 检查流程状态是否为草稿、已撤销或已退回状态,若是则执行流程提交监听 + if (BusinessStatusEnum.isDraftOrCancelOrBack(ins.getFlowStatus())) { + flowProcessEventHandler.processHandler(definition.getFlowCode(), ins.getBusinessId(), ins.getFlowStatus(), null, true); + } + // 构建流程参数,包括变量、跳转类型、消息、处理人、权限等信息 + FlowParams flowParams = new FlowParams(); + flowParams.variable(completeTaskBo.getVariables()); + flowParams.skipType(SkipType.PASS.getKey()); + flowParams.message(completeTaskBo.getMessage()); + flowParams.flowStatus(BusinessStatusEnum.WAITING.getStatus()).hisStatus(TaskStatusEnum.PASS.getStatus()); + + flowParams.hisTaskExt(completeTaskBo.getFileId()); + // 执行任务跳转,并根据返回的处理人设置下一步处理人 + Instance instance = taskService.skip(taskId, flowParams); + this.setHandler(instance, flowTask, flowCopyList); + // 消息通知 + WorkflowUtils.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice); + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + } + + /** + * 设置办理人 + * + * @param instance 实例 + * @param task (当前任务)未办理的任务 + * @param flowCopyList 抄送人 + */ + private void setHandler(Instance instance, FlowTask task, List flowCopyList) { + if (ObjectUtil.isNull(instance)) { + return; + } + // 添加抄送人 + this.setCopy(task, flowCopyList); + // 根据流程实例ID查询所有关联的任务 + List flowTasks = this.selectByInstId(instance.getId()); + if (CollUtil.isEmpty(flowTasks)) { + return; + } + List taskIdList = StreamUtils.toList(flowTasks, FlowTask::getId); + // 获取与当前任务关联的用户列表 + List associatedUsers = WorkflowUtils.getFlowUserService().getByAssociateds(taskIdList); + if (CollUtil.isEmpty(associatedUsers)) { + return; + } + List userList = new ArrayList<>(); + // 遍历任务列表,处理每个任务的办理人 + for (FlowTask flowTask : flowTasks) { + List users = StreamUtils.filter(associatedUsers, user -> Objects.equals(user.getAssociated(), flowTask.getId())); + if (CollUtil.isNotEmpty(users)) { + userList.addAll(WorkflowUtils.buildUser(users, flowTask.getId())); + } + } + // 批量删除现有任务的办理人记录 + WorkflowUtils.getFlowUserService().deleteByTaskIds(taskIdList); + // 确保要保存的 userList 不为空 + if (CollUtil.isEmpty(userList)) { + return; + } + WorkflowUtils.getFlowUserService().saveBatch(userList); + } + + /** + * 添加抄送人 + * + * @param task 任务信息 + * @param flowCopyList 抄送人 + */ + public void setCopy(FlowTask task, List flowCopyList) { + if (CollUtil.isEmpty(flowCopyList)) { + return; + } + // 添加抄送人记录 + FlowHisTask flowHisTask = flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class).eq(FlowHisTask::getTaskId, task.getId())).get(0); + FlowNode flowNode = new FlowNode(); + flowNode.setNodeCode(flowHisTask.getTargetNodeCode()); + flowNode.setNodeName(flowHisTask.getTargetNodeName()); + //生成新的任务id + long taskId = identifierGenerator.nextId(null).longValue(); + task.setId(taskId); + task.setNodeName("【抄送】" + task.getNodeName()); + Date updateTime = new Date(flowHisTask.getUpdateTime().getTime() - 1000); + FlowParams flowParams = FlowParams.build(); + flowParams.skipType(SkipType.NONE.getKey()); + flowParams.hisStatus(TaskStatusEnum.COPY.getStatus()); + flowParams.message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getUserName)); + HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams); + hisTask.setCreateTime(updateTime); + hisTask.setUpdateTime(updateTime); + hisTaskService.save(hisTask); + List userList = flowCopyList.stream() + .map(flowCopy -> { + FlowUser flowUser = new FlowUser(); + flowUser.setType(TaskAssigneeType.COPY.getCode()); + flowUser.setProcessedBy(String.valueOf(flowCopy.getUserId())); + flowUser.setAssociated(taskId); + return flowUser; + }).collect(Collectors.toList()); + // 批量保存抄送人员 + WorkflowUtils.getFlowUserService().saveBatch(userList); + } + + /** + * 查询当前用户的待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); + queryWrapper.in("t.processed_by", SpringUtils.getBean(WorkflowPermissionHandler.class).permissions()); + queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus()); + Page page = this.getFlowTaskVoPage(pageQuery, queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 查询当前用户的已办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); + queryWrapper.in("t.approver", LoginHelper.getUserIdStr()); + queryWrapper.orderByDesc("t.create_time").orderByDesc("t.update_time"); + Page page = flwTaskMapper.getListFinishTask(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 查询待办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey()); + Page page = getFlowTaskVoPage(pageQuery, queryWrapper); + return TableDataInfo.build(page); + } + + private Page getFlowTaskVoPage(PageQuery pageQuery, QueryWrapper queryWrapper) { + Page page = flwTaskMapper.getListRunTask(pageQuery.build(), queryWrapper); + List records = page.getRecords(); + if (CollUtil.isNotEmpty(records)) { + List taskIds = StreamUtils.toList(records, FlowTaskVo::getId); + Map> listMap = currentTaskAllUser(taskIds); + records.forEach(t -> { + List userList = listMap.getOrDefault(t.getId(), Collections.emptyList()); + if (CollUtil.isNotEmpty(userList)) { + t.setAssigneeIds(StreamUtils.join(userList, e -> String.valueOf(e.getUserId()))); + t.setAssigneeNames(StreamUtils.join(userList, UserDTO::getNickName)); + } + }); + } + return page; + } + + /** + * 查询已办任务 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + Page page = flwTaskMapper.getListFinishTask(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + /** + * 查询当前用户的抄送 + * + * @param flowTaskBo 参数 + * @param pageQuery 分页 + */ + @Override + public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + QueryWrapper queryWrapper = buildQueryWrapper(flowTaskBo); + queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr()); + Page page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper); + return TableDataInfo.build(page); + } + + private QueryWrapper buildQueryWrapper(FlowTaskBo flowTaskBo) { + QueryWrapper wrapper = Wrappers.query(); + wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName()); + wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName()); + wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode()); + wrapper.in(CollUtil.isNotEmpty(flowTaskBo.getCreateByIds()), "t.create_by", flowTaskBo.getCreateByIds()); + if (StringUtils.isNotBlank(flowTaskBo.getCategory())) { + List categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowTaskBo.getCategory())); + wrapper.in("t.category", StreamUtils.toList(categoryIds, Convert::toStr)); + } + wrapper.orderByDesc("t.create_time"); + return wrapper; + } + + /** + * 驳回任务 + * + * @param bo 参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean backProcess(BackProcessBo bo) { + try { + Long taskId = bo.getTaskId(); + String notice = bo.getNotice(); + List messageType = bo.getMessageType(); + String message = bo.getMessage(); + FlowTask task = flowTaskMapper.selectById(taskId); + if (ObjectUtil.isNull(task)) { + throw new ServiceException("任务不存在!"); + } + Instance inst = insService.getById(task.getInstanceId()); + BusinessStatusEnum.checkBackStatus(inst.getFlowStatus()); + Long definitionId = task.getDefinitionId(); + Definition definition = defService.getById(definitionId); + String applyNodeCode = WorkflowUtils.applyNodeCode(definitionId); + FlowParams flowParams = FlowParams.build(); + flowParams.nodeCode(bo.getNodeCode()); + flowParams.message(message); + flowParams.skipType(SkipType.REJECT.getKey()); + flowParams.flowStatus(applyNodeCode.equals(bo.getNodeCode()) ? TaskStatusEnum.BACK.getStatus() : TaskStatusEnum.WAITING.getStatus()) + .hisStatus(TaskStatusEnum.BACK.getStatus()); + flowParams.hisTaskExt(bo.getFileId()); + taskService.skip(task.getId(), flowParams); + + Instance instance = insService.getById(inst.getId()); + this.setHandler(instance, task, null); + // 消息通知 + WorkflowUtils.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice); + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + } + + /** + * 获取可驳回的前置节点 + * + * @param definitionId 流程定义id + * @param nowNodeCode 当前节点 + */ + @Override + public List getBackTaskNode(Long definitionId, String nowNodeCode) { + List nodeCodes = nodeService.getByNodeCodes(Collections.singletonList(nowNodeCode), definitionId); + if (!CollUtil.isNotEmpty(nodeCodes)) { + return nodeCodes; + } + //判断是否配置了固定驳回节点 + Node node = nodeCodes.get(0); + if (StringUtils.isNotBlank(node.getAnyNodeSkip())) { + return nodeService.getByNodeCodes(Collections.singletonList(node.getAnyNodeSkip()), definitionId); + } + //获取可驳回的前置节点 + List nodes = nodeService.previousNodeList(definitionId, nowNodeCode); + if (CollUtil.isNotEmpty(nodes)) { + return StreamUtils.filter(nodes, e -> NodeType.BETWEEN.getKey().equals(e.getNodeType())); + } + return nodes; + } + + /** + * 终止任务 + * + * @param bo 参数 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean terminationTask(FlowTerminationBo bo) { + try { + Long taskId = bo.getTaskId(); + Task task = taskService.getById(taskId); + if (task == null) { + throw new ServiceException("任务不存在!"); + } + Instance instance = insService.getById(task.getInstanceId()); + if (ObjectUtil.isNotNull(instance)) { + BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus()); + } + FlowParams flowParams = new FlowParams(); + flowParams.message(bo.getComment()); + flowParams.flowStatus(BusinessStatusEnum.TERMINATION.getStatus()) + .hisStatus(TaskStatusEnum.TERMINATION.getStatus()); + taskService.termination(taskId, flowParams); + return true; + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + } + + /** + * 按照任务id查询任务 + * + * @param taskIdList 任务id + */ + @Override + public List selectByIdList(List taskIdList) { + return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class) + .in(FlowTask::getId, taskIdList)); + } + + /** + * 按照任务id查询任务 + * + * @param taskId 任务id + */ + @Override + public FlowTaskVo selectById(Long taskId) { + Task task = taskService.getById(taskId); + if (ObjectUtil.isNull(task)) { + return null; + } + FlowTaskVo flowTaskVo = BeanUtil.toBean(task, FlowTaskVo.class); + Instance instance = insService.getById(task.getInstanceId()); + Definition definition = defService.getById(task.getDefinitionId()); + flowTaskVo.setFlowStatus(instance.getFlowStatus()); + flowTaskVo.setVersion(definition.getVersion()); + flowTaskVo.setFlowCode(definition.getFlowCode()); + flowTaskVo.setFlowName(definition.getFlowName()); + flowTaskVo.setBusinessId(instance.getBusinessId()); + List nodeList = nodeService.getByNodeCodes(Collections.singletonList(flowTaskVo.getNodeCode()), instance.getDefinitionId()); + if (CollUtil.isNotEmpty(nodeList)) { + Node node = nodeList.get(0); + flowTaskVo.setNodeRatio(node.getNodeRatio()); + } + return flowTaskVo; + } + + /** + * 按照任务id查询任务 + * + * @param taskIdList 任务id + * @return 结果 + */ + @Override + public List selectHisTaskByIdList(List taskIdList) { + return flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class) + .in(FlowHisTask::getId, taskIdList)); + } + + /** + * 按照任务id查询任务 + * + * @param taskId 任务id + * @return 结果 + */ + @Override + public FlowHisTask selectHisTaskById(Long taskId) { + return flowHisTaskMapper.selectOne(new LambdaQueryWrapper<>(FlowHisTask.class) + .eq(FlowHisTask::getId, taskId)); + } + + /** + * 按照实例id查询任务 + * + * @param instanceIdList 流程实例id + */ + @Override + public List selectByInstIdList(List instanceIdList) { + return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class) + .in(FlowTask::getInstanceId, instanceIdList)); + } + + /** + * 按照实例id查询任务 + * + * @param instanceId 流程实例id + */ + @Override + public List selectByInstId(Long instanceId) { + return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class) + .eq(FlowTask::getInstanceId, instanceId)); + } + + /** + * 任务操作 + * + * @param bo 参数 + * @param taskOperation 操作类型,委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean taskOperation(TaskOperationBo bo, String taskOperation) { + FlowParams flowParams = new FlowParams(); + flowParams.message(bo.getMessage()); + if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) { + flowParams.ignore(true); + } + + // 根据操作类型构建 FlowParams + switch (taskOperation) { + case DELEGATE_TASK, TRANSFER_TASK -> { + ValidatorUtils.validate(bo, AddGroup.class); + flowParams.addHandlers(Collections.singletonList(bo.getUserId())); + } + case ADD_SIGNATURE -> { + ValidatorUtils.validate(bo, EditGroup.class); + flowParams.addHandlers(bo.getUserIds()); + } + case REDUCTION_SIGNATURE -> { + ValidatorUtils.validate(bo, EditGroup.class); + flowParams.reductionHandlers(bo.getUserIds()); + } + default -> { + log.error("Invalid operation type:{} ", taskOperation); + throw new ServiceException("Invalid operation type " + taskOperation); + } + } + + Long taskId = bo.getTaskId(); + FlowTaskVo flowTaskVo = selectById(taskId); + if ("addSignature".equals(taskOperation) || "reductionSignature".equals(taskOperation)) { + if (flowTaskVo.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) { + throw new ServiceException(flowTaskVo.getNodeName() + "不是会签节点!"); + } + } + // 设置任务状态并执行对应的任务操作 + switch (taskOperation) { + //委派任务 + case DELEGATE_TASK -> { + flowParams.hisStatus(TaskStatusEnum.DEPUTE.getStatus()); + return taskService.depute(taskId, flowParams); + } + //转办任务 + case TRANSFER_TASK -> { + flowParams.hisStatus(TaskStatusEnum.TRANSFER.getStatus()); + return taskService.transfer(taskId, flowParams); + } + //加签,增加办理人 + case ADD_SIGNATURE -> { + flowParams.hisStatus(TaskStatusEnum.SIGN.getStatus()); + return taskService.addSignature(taskId, flowParams); + } + //减签,减少办理人 + case REDUCTION_SIGNATURE -> { + flowParams.hisStatus(TaskStatusEnum.SIGN_OFF.getStatus()); + return taskService.reductionSignature(taskId, flowParams); + } + default -> { + log.error("Invalid operation type:{} ", taskOperation); + throw new ServiceException("Invalid operation type " + taskOperation); + } + } + } + + /** + * 修改任务办理人(此方法将会批量修改所有任务的办理人) + * + * @param taskIdList 任务id + * @param userId 用户id + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean updateAssignee(List taskIdList, String userId) { + if (CollUtil.isEmpty(taskIdList)) { + return false; + } + try { + List flowTasks = this.selectByIdList(taskIdList); + // 批量删除现有任务的办理人记录 + if (CollUtil.isNotEmpty(flowTasks)) { + WorkflowUtils.getFlowUserService().deleteByTaskIds(StreamUtils.toList(flowTasks, FlowTask::getId)); + List userList = flowTasks.stream() + .map(flowTask -> { + FlowUser flowUser = new FlowUser(); + flowUser.setType(TaskAssigneeType.APPROVER.getCode()); + flowUser.setProcessedBy(userId); + flowUser.setAssociated(flowTask.getId()); + return flowUser; + }) + .collect(Collectors.toList()); + if (CollUtil.isNotEmpty(userList)) { + WorkflowUtils.getFlowUserService().saveBatch(userList); + } + } + } catch (Exception e) { + log.error(e.getMessage(), e); + throw new ServiceException(e.getMessage()); + } + return true; + } + + /** + * 获取任务所有办理人 + * + * @param taskIdList 任务id + */ + @Override + public Map> currentTaskAllUser(List taskIdList) { + Map> map = new HashMap<>(); + // 获取与当前任务关联的用户列表 + List associatedUsers = WorkflowUtils.getFlowUserService().getByAssociateds(taskIdList); + Map> listMap = StreamUtils.groupByKey(associatedUsers, User::getAssociated); + for (Map.Entry> entry : listMap.entrySet()) { + List value = entry.getValue(); + if (CollUtil.isNotEmpty(value)) { + List userDTOS = userService.selectListByIds(StreamUtils.toList(value, e -> Long.valueOf(e.getProcessedBy()))); + map.put(entry.getKey(), userDTOS); + } + } + return map; + } + + /** + * 获取当前任务的所有办理人 + * + * @param taskId 任务id + */ + @Override + public List currentTaskAllUser(Long taskId) { + // 获取与当前任务关联的用户列表 + List userList = WorkflowUtils.getFlowUserService().getByAssociateds(Collections.singletonList(taskId)); + if (CollUtil.isEmpty(userList)) { + return Collections.emptyList(); + } + return userService.selectListByIds(StreamUtils.toList(userList, e -> Long.valueOf(e.getProcessedBy()))); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TActivityServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TActivityServiceImpl.java new file mode 100644 index 0000000..03df93d --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TActivityServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.workflow.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.workflow.domain.TActivity; +import org.dromara.workflow.domain.bo.TActivityBo; +import org.dromara.workflow.domain.vo.TActivityVo; +import org.dromara.workflow.mapper.TActivityMapper; +import org.dromara.workflow.service.ITActivityService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 活动Service业务层处理 + * + * @author Lion Li + * @date 2024-07-19 + */ +@RequiredArgsConstructor +@Service +public class TActivityServiceImpl implements ITActivityService { + + private final TActivityMapper baseMapper; + + /** + * 查询活动 + * + * @param id 主键 + * @return 活动 + */ + @Override + public TActivityVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询活动列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 活动分页列表 + */ + @Override + public TableDataInfo queryPageList(TActivityBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的活动列表 + * + * @param bo 查询条件 + * @return 活动列表 + */ + @Override + public List queryList(TActivityBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TActivityBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getCreateTime() != null, TActivity::getCreateTime, bo.getCreateTime()); + lqw.eq(StringUtils.isNotBlank(bo.getTitle()), TActivity::getTitle, bo.getTitle()); + lqw.eq(bo.getStartTime() != null, TActivity::getStartTime, bo.getStartTime()); + lqw.eq(bo.getEndTime() != null, TActivity::getEndTime, bo.getEndTime()); + return lqw; + } + + /** + * 新增活动 + * + * @param bo 活动 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TActivityBo bo) { + TActivity add = MapstructUtils.convert(bo, TActivity.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改活动 + * + * @param bo 活动 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TActivityBo bo) { + TActivity update = MapstructUtils.convert(bo, TActivity.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TActivity entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除活动信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java new file mode 100644 index 0000000..537361c --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -0,0 +1,188 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.event.ProcessCreateTaskEvent; +import org.dromara.common.core.domain.event.ProcessDeleteEvent; +import org.dromara.common.core.domain.event.ProcessEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.service.WorkflowService; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.TestLeave; +import org.dromara.workflow.domain.bo.TestLeaveBo; +import org.dromara.workflow.domain.vo.TestLeaveVo; +import org.dromara.workflow.mapper.TestLeaveMapper; +import org.dromara.workflow.service.ITestLeaveService; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +/** + * 请假Service业务层处理 + * + * @author may + * @date 2023-07-21 + */ +@ConditionalOnEnable +@RequiredArgsConstructor +@Service +@Slf4j +public class TestLeaveServiceImpl implements ITestLeaveService { + + private final TestLeaveMapper baseMapper; + private final WorkflowService workflowService; + + /** + * 查询请假 + */ + @Override + public TestLeaveVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 查询请假列表 + */ + @Override + public TableDataInfo queryPageList(TestLeaveBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询请假列表 + */ + @Override + public List queryList(TestLeaveBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TestLeaveBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), TestLeave::getLeaveType, bo.getLeaveType()); + lqw.ge(bo.getStartLeaveDays() != null, TestLeave::getLeaveDays, bo.getStartLeaveDays()); + lqw.le(bo.getEndLeaveDays() != null, TestLeave::getLeaveDays, bo.getEndLeaveDays()); + lqw.orderByDesc(BaseEntity::getCreateTime); + return lqw; + } + + /** + * 新增请假 + */ + @Override + public TestLeaveVo insertByBo(TestLeaveBo bo) { + long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true); + // 截止日期也算一天 + bo.setLeaveDays((int) day + 1); + TestLeave add = MapstructUtils.convert(bo, TestLeave.class); + if (StringUtils.isBlank(add.getStatus())) { + add.setStatus(BusinessStatusEnum.DRAFT.getStatus()); + } + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return MapstructUtils.convert(add, TestLeaveVo.class); + } + + /** + * 修改请假 + */ + @Override + public TestLeaveVo updateByBo(TestLeaveBo bo) { + TestLeave update = MapstructUtils.convert(bo, TestLeave.class); + baseMapper.updateById(update); + return MapstructUtils.convert(update, TestLeaveVo.class); + } + + /** + * 批量删除请假 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(List ids) { + workflowService.deleteInstance(ids); + return baseMapper.deleteByIds(ids) > 0; + } + + /** + * 总体流程监听(例如: 草稿,撤销,退回,作废,终止,已完成,单任务完成等) + * 正常使用只需#processEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processEvent 参数 + */ + @EventListener(condition = "#processEvent.flowCode.startsWith('leave')") + public void processHandler(ProcessEvent processEvent) { + log.info("当前任务执行了{}", processEvent.toString()); + TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessId())); + testLeave.setStatus(processEvent.getStatus()); + // 用于例如审批附件 审批意见等 存储到业务表内 自行根据业务实现存储流程 + Map params = processEvent.getParams(); + if (MapUtil.isNotEmpty(params)) { + // 历史任务扩展(通常为附件) + String hisTaskExt = Convert.toStr(params.get("hisTaskExt")); + // 办理人 + String handler = Convert.toStr(params.get("handler")); + // 办理意见 + String message = Convert.toStr(params.get("message")); + } + if (processEvent.isSubmit()) { + testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus()); + } + baseMapper.updateById(testLeave); + } + + /** + * 执行任务创建监听 + * 示例:也可通过 @EventListener(condition = "#processCreateTaskEvent.flowCode=='leave1'")进行判断 + * 在方法中判断流程节点key + * if ("xxx".equals(processCreateTaskEvent.getNodeCode())) { + * //执行业务逻辑 + * } + * + * @param processCreateTaskEvent 参数 + */ + @EventListener(condition = "#processCreateTaskEvent.flowCode.startsWith('leave')") + public void processCreateTaskHandler(ProcessCreateTaskEvent processCreateTaskEvent) { + log.info("当前任务创建了{}", processCreateTaskEvent.toString()); + TestLeave testLeave = baseMapper.selectById(Long.valueOf(processCreateTaskEvent.getBusinessId())); + testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus()); + baseMapper.updateById(testLeave); + } + + /** + * 监听删除流程事件 + * 正常使用只需#processDeleteEvent.flowCode=='leave1' + * 示例为了方便则使用startsWith匹配了全部示例key + * + * @param processDeleteEvent 参数 + */ + @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')") + public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) { + log.info("监听删除流程事件,当前任务执行了{}", processDeleteEvent.toString()); + TestLeave testLeave = baseMapper.selectById(Long.valueOf(processDeleteEvent.getBusinessId())); + if (ObjectUtil.isNull(testLeave)) { + return; + } + baseMapper.deleteById(testLeave.getId()); + } + +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java new file mode 100644 index 0000000..f8a20b5 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java @@ -0,0 +1,132 @@ +package org.dromara.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.dto.CompleteTaskDTO; +import org.dromara.common.core.domain.dto.StartProcessDTO; +import org.dromara.common.core.domain.dto.StartProcessReturnDTO; +import org.dromara.common.core.service.WorkflowService; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.warm.flow.orm.entity.FlowInstance; +import org.dromara.workflow.common.ConditionalOnEnable; +import org.dromara.workflow.domain.bo.CompleteTaskBo; +import org.dromara.workflow.domain.bo.StartProcessBo; +import org.dromara.workflow.service.IFlwDefinitionService; +import org.dromara.workflow.service.IFlwInstanceService; +import org.dromara.workflow.service.IFlwTaskService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 通用 工作流服务实现 + * + * @author may + */ +@ConditionalOnEnable +@RequiredArgsConstructor +@Service +public class WorkflowServiceImpl implements WorkflowService { + + private final IFlwInstanceService flwInstanceService; + private final IFlwDefinitionService flwDefinitionService; + private final IFlwTaskService flwTaskService; + + /** + * 删除流程实例 + * + * @param businessIds 业务id + * @return 结果 + */ + @Override + public boolean deleteInstance(List businessIds) { + return flwInstanceService.deleteByBusinessIds(businessIds); + } + + /** + * 获取当前流程状态 + * + * @param taskId 任务id + */ + @Override + public String getBusinessStatusByTaskId(Long taskId) { + FlowInstance flowInstance = flwInstanceService.selectByTaskId(taskId); + return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getFlowStatus() : StringUtils.EMPTY; + } + + /** + * 获取当前流程状态 + * + * @param businessId 业务id + */ + @Override + public String getBusinessStatus(String businessId) { + FlowInstance flowInstance = flwInstanceService.selectInstByBusinessId(businessId); + return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getFlowStatus() : StringUtils.EMPTY; + } + + /** + * 设置流程变量 + * + * @param instanceId 流程实例id + * @param variables 流程变量 + */ + @Override + public void setVariable(Long instanceId, Map variables) { + flwInstanceService.setVariable(instanceId, variables); + } + + /** + * 获取流程变量 + * + * @param instanceId 流程实例id + */ + @Override + public Map instanceVariable(Long instanceId) { + return flwInstanceService.instanceVariable(instanceId); + } + + /** + * 按照业务id查询流程实例id + * + * @param businessId 业务id + * @return 结果 + */ + @Override + public Long getInstanceIdByBusinessId(String businessId) { + FlowInstance flowInstance = flwInstanceService.selectInstByBusinessId(businessId); + return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getId() : null; + } + + /** + * 新增租户流程定义 + * + * @param tenantId 租户id + */ + @Override + public void syncDef(String tenantId) { + flwDefinitionService.syncDef(tenantId); + } + + /** + * 启动流程 + * + * @param startProcess 参数 + */ + @Override + public StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess) { + return flwTaskService.startWorkFlow(BeanUtil.toBean(startProcess, StartProcessBo.class)); + } + + /** + * 办理任务 + * + * @param completeTask 参数 + */ + @Override + public boolean completeTask(CompleteTaskDTO completeTask) { + return flwTaskService.completeTask(BeanUtil.toBean(completeTask, CompleteTaskBo.class)); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java new file mode 100644 index 0000000..e48ffc8 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java @@ -0,0 +1,206 @@ +package org.dromara.workflow.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.dromara.common.core.domain.dto.UserDTO; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mail.utils.MailUtils; +import org.dromara.common.sse.dto.SseMessageDto; +import org.dromara.common.sse.utils.SseMessageUtils; +import org.dromara.warm.flow.core.constant.ExceptionCons; +import org.dromara.warm.flow.core.dto.FlowParams; +import org.dromara.warm.flow.core.entity.Node; +import org.dromara.warm.flow.core.entity.Task; +import org.dromara.warm.flow.core.entity.User; +import org.dromara.warm.flow.core.enums.NodeType; +import org.dromara.warm.flow.core.enums.SkipType; +import org.dromara.warm.flow.core.service.NodeService; +import org.dromara.warm.flow.core.service.TaskService; +import org.dromara.warm.flow.core.service.UserService; +import org.dromara.warm.flow.core.utils.AssertUtil; +import org.dromara.warm.flow.orm.entity.FlowNode; +import org.dromara.warm.flow.orm.entity.FlowTask; +import org.dromara.warm.flow.orm.entity.FlowUser; +import org.dromara.warm.flow.orm.mapper.FlowNodeMapper; +import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; +import org.dromara.workflow.common.enums.MessageTypeEnum; +import org.dromara.workflow.service.IFlwTaskAssigneeService; +import org.dromara.workflow.service.IFlwTaskService; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + + +/** + * 工作流工具 + * + * @author may + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class WorkflowUtils { + + private static final IFlwTaskAssigneeService TASK_ASSIGNEE_SERVICE = SpringUtils.getBean(IFlwTaskAssigneeService.class); + private static final IFlwTaskService FLW_TASK_SERVICE = SpringUtils.getBean(IFlwTaskService.class); + private static final FlowNodeMapper FLOW_NODE_MAPPER = SpringUtils.getBean(FlowNodeMapper.class); + private static final FlowTaskMapper FLOW_TASK_MAPPER = SpringUtils.getBean(FlowTaskMapper.class); + private static final UserService USER_SERVICE = SpringUtils.getBean(UserService.class); + private static final TaskService TASK_SERVICE = SpringUtils.getBean(TaskService.class); + private static final NodeService NODE_SERVICE = SpringUtils.getBean(NodeService.class); + + /** + * 获取工作流用户service + */ + public static UserService getFlowUserService() { + return USER_SERVICE; + } + + /** + * 构建工作流用户 + * + * @param userList 办理用户 + * @param taskId 任务ID + * @return 用户 + */ + public static Set buildUser(List userList, Long taskId) { + if (CollUtil.isEmpty(userList)) { + return Set.of(); + } + Set list = new HashSet<>(); + Set processedBySet = new HashSet<>(); + for (User user : userList) { + // 根据 processedBy 前缀判断处理人类型,分别获取用户列表 + List users = TASK_ASSIGNEE_SERVICE.fetchUsersByStorageId(user.getProcessedBy()); + // 转换为 FlowUser 并添加到结果集合 + if (CollUtil.isNotEmpty(users)) { + users.forEach(dto -> { + String processedBy = String.valueOf(dto.getUserId()); + if (!processedBySet.contains(processedBy)) { + FlowUser flowUser = new FlowUser(); + flowUser.setType(user.getType()); + flowUser.setProcessedBy(processedBy); + flowUser.setAssociated(taskId); + list.add(flowUser); + processedBySet.add(processedBy); + } + }); + } + } + return list; + } + + /** + * 发送消息 + * + * @param flowName 流程定义名称 + * @param messageType 消息类型 + * @param message 消息内容,为空则发送默认配置的消息内容 + */ + public static void sendMessage(String flowName, Long instId, List messageType, String message) { + List userList = new ArrayList<>(); + List list = FLW_TASK_SERVICE.selectByInstId(instId); + if (StringUtils.isBlank(message)) { + message = "有新的【" + flowName + "】单据已经提交至您,请您及时处理。"; + } + for (Task task : list) { + List users = FLW_TASK_SERVICE.currentTaskAllUser(task.getId()); + if (CollUtil.isNotEmpty(users)) { + userList.addAll(users); + } + } + if (CollUtil.isNotEmpty(userList)) { + for (String code : messageType) { + MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code); + if (ObjectUtil.isNotEmpty(messageTypeEnum)) { + switch (messageTypeEnum) { + case SYSTEM_MESSAGE: + SseMessageDto dto = new SseMessageDto(); + dto.setUserIds(StreamUtils.toList(userList, UserDTO::getUserId).stream().distinct().collect(Collectors.toList())); + dto.setMessage(message); + SseMessageUtils.publishMessage(dto); + break; + case EMAIL_MESSAGE: + MailUtils.sendText(StreamUtils.join(userList, UserDTO::getEmail), "单据审批提醒", message); + break; + case SMS_MESSAGE: + //todo 短信发送 + break; + default: + throw new IllegalStateException("Unexpected value: " + messageTypeEnum); + } + } + } + } + } + + /** + * 驳回 + * + * @param message 审批意见 + * @param instanceId 流程实例id + * @param targetNodeCode 目标节点 + * @param flowStatus 流程状态 + * @param flowHisStatus 节点操作状态 + */ + public static void backTask(String message, Long instanceId, String targetNodeCode, String flowStatus, String flowHisStatus) { + List list = FLW_TASK_SERVICE.selectByInstId(instanceId); + if (CollUtil.isNotEmpty(list)) { + List tasks = StreamUtils.filter(list, e -> e.getNodeCode().equals(targetNodeCode)); + if (list.size() == tasks.size()) { + return; + } + } + for (FlowTask task : list) { + List userList = FLW_TASK_SERVICE.currentTaskAllUser(task.getId()); + FlowParams flowParams = FlowParams.build(); + flowParams.nodeCode(targetNodeCode); + flowParams.message(message); + flowParams.skipType(SkipType.PASS.getKey()); + flowParams.flowStatus(flowStatus).hisStatus(flowHisStatus); + flowParams.ignore(true); + //解决会签没权限问题 + if (CollUtil.isNotEmpty(userList)) { + flowParams.handler(userList.get(0).getUserId().toString()); + } + TASK_SERVICE.skip(task.getId(), flowParams); + } + //解决会签多人审批问题 + backTask(message, instanceId, targetNodeCode, flowStatus, flowHisStatus); + } + + /** + * 申请人节点编码 + * + * @param definitionId 流程定义id + * @return 申请人节点编码 + */ + public static String applyNodeCode(Long definitionId) { + //获取已发布的流程节点 + List flowNodes = FLOW_NODE_MAPPER.selectList(new LambdaQueryWrapper().eq(FlowNode::getDefinitionId, definitionId)); + AssertUtil.isTrue(CollUtil.isEmpty(flowNodes), ExceptionCons.NOT_PUBLISH_NODE); + Node startNode = flowNodes.stream().filter(t -> NodeType.isStart(t.getNodeType())).findFirst().orElse(null); + AssertUtil.isNull(startNode, ExceptionCons.LOST_START_NODE); + Node nextNode = NODE_SERVICE.getNextNode(definitionId, startNode.getNodeCode(), null, SkipType.PASS.getKey()); + return nextNode.getNodeCode(); + } + + /** + * 删除运行中的任务 + * + * @param taskIds 任务id + */ + public static void deleteRunTask(List taskIds) { + if (CollUtil.isEmpty(taskIds)) { + return; + } + USER_SERVICE.deleteByTaskIds(taskIds); + FLOW_TASK_MAPPER.deleteByIds(taskIds); + } +} diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md new file mode 100644 index 0000000..c938b1e --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md @@ -0,0 +1,3 @@ +java包使用 `.` 分割 resource 目录使用 `/` 分割 +
+此文件目的 防止文件夹粘连找不到 `xml` 文件 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml new file mode 100644 index 0000000..e9918f1 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml new file mode 100644 index 0000000..30e2267 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml new file mode 100644 index 0000000..f539030 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TActivityMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TActivityMapper.xml new file mode 100644 index 0000000..0994c34 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TActivityMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml new file mode 100644 index 0000000..d52f6b0 --- /dev/null +++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/script/leave/leave1.json b/script/leave/leave1.json new file mode 100644 index 0000000..0cf67bc --- /dev/null +++ b/script/leave/leave1.json @@ -0,0 +1,75 @@ +{ + "flowCode" : "leave1", + "flowName" : "请假申请-普通", + "category" : "1", + "version" : "1", + "formCustom" : "N", + "formPath" : "/workflow/leaveEdit/index", + "nodeList" : [ { + "nodeType" : 0, + "nodeCode" : "d5ee3ddf-3968-4379-a86f-9ceabde5faac", + "nodeName" : "开始", + "nodeRatio" : 0.000, + "coordinate" : "200,200|200,200", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "d5ee3ddf-3968-4379-a86f-9ceabde5faac", + "nextNodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42", + "skipType" : "PASS", + "coordinate" : "220,200;310,200" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42", + "nodeName" : "申请人", + "nodeRatio" : 0.000, + "coordinate" : "360,200|360,200", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42", + "nextNodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf", + "skipType" : "PASS", + "coordinate" : "410,200;490,200" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf", + "nodeName" : "组长", + "permissionFlag" : "role:1", + "nodeRatio" : 0.000, + "coordinate" : "540,200|540,200", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf", + "nextNodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe", + "skipType" : "PASS", + "coordinate" : "590,200;670,200" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe", + "nodeName" : "部门主管", + "permissionFlag" : "role:3,role:4", + "nodeRatio" : 0.000, + "coordinate" : "720,200|720,200", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe", + "nextNodeCode" : "8b82b7d7-8660-455e-b880-d6d22ea3eb6d", + "skipType" : "PASS", + "coordinate" : "770,200;880,200" + } ] + }, { + "nodeType" : 2, + "nodeCode" : "8b82b7d7-8660-455e-b880-d6d22ea3eb6d", + "nodeName" : "结束", + "nodeRatio" : 0.000, + "coordinate" : "900,200|900,200", + "skipAnyNode" : "N", + "formCustom" : "N" + } ] +} \ No newline at end of file diff --git a/script/leave/leave2.json b/script/leave/leave2.json new file mode 100644 index 0000000..9fce8ff --- /dev/null +++ b/script/leave/leave2.json @@ -0,0 +1,111 @@ +{ + "flowCode" : "leave2", + "flowName" : "请假申请-排他网关", + "category" : "1", + "version" : "1", + "formCustom" : "N", + "formPath" : "/workflow/leaveEdit/index", + "nodeList" : [ { + "nodeType" : 0, + "nodeCode" : "cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a", + "nodeName" : "开始", + "nodeRatio" : 0.000, + "coordinate" : "300,240|300,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a", + "nextNodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd", + "skipType" : "PASS", + "coordinate" : "320,240;390,240" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd", + "nodeName" : "申请人", + "nodeRatio" : 0.000, + "coordinate" : "440,240|440,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd", + "nextNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e", + "skipType" : "PASS", + "coordinate" : "490,240;535,240" + } ] + }, { + "nodeType" : 3, + "nodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e", + "nodeRatio" : 0.000, + "coordinate" : "560,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e", + "nextNodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86", + "skipType" : "PASS", + "skipCondition" : "le@@leaveDays|2", + "coordinate" : "560,265;560,320;670,320" + }, { + "nowNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e", + "nextNodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605", + "skipName" : "大于两天", + "skipType" : "PASS", + "skipCondition" : "gt@@leaveDays|2", + "coordinate" : "560,215;560,160;670,160|560,187" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86", + "nodeName" : "组长", + "permissionFlag" : "3,4", + "nodeRatio" : 0.000, + "coordinate" : "720,320|720,320", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86", + "nextNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869", + "skipType" : "PASS", + "coordinate" : "770,320;860,320;860,280" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869", + "nodeName" : "总经理", + "permissionFlag" : "role:1", + "nodeRatio" : 0.000, + "coordinate" : "860,240|860,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869", + "nextNodeCode" : "40aa65fd-0712-4d23-b6f7-d0432b920fd1", + "skipType" : "PASS", + "coordinate" : "910,240;980,240" + } ] + }, { + "nodeType" : 2, + "nodeCode" : "40aa65fd-0712-4d23-b6f7-d0432b920fd1", + "nodeName" : "结束", + "nodeRatio" : 0.000, + "coordinate" : "1000,240|1000,240", + "skipAnyNode" : "N", + "formCustom" : "N" + }, { + "nodeType" : 1, + "nodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605", + "nodeName" : "部门领导", + "permissionFlag" : "role:1", + "nodeRatio" : 0.000, + "coordinate" : "720,160|720,160", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605", + "nextNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869", + "skipType" : "PASS", + "coordinate" : "770,160;860,160;860,200" + } ] + } ] +} diff --git a/script/leave/leave3.json b/script/leave/leave3.json new file mode 100644 index 0000000..08daae4 --- /dev/null +++ b/script/leave/leave3.json @@ -0,0 +1,121 @@ +{ + "flowCode" : "leave3", + "flowName" : "请假申请-并行网关", + "category" : "1", + "version" : "1", + "formCustom" : "N", + "formPath" : "/workflow/leaveEdit/index", + "nodeList" : [ { + "nodeType" : 0, + "nodeCode" : "a80ecf9f-f465-4ae5-a429-e30ec5d0f957", + "nodeName" : "开始", + "nodeRatio" : 0.000, + "coordinate" : "380,220|380,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "a80ecf9f-f465-4ae5-a429-e30ec5d0f957", + "nextNodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99", + "skipType" : "PASS", + "coordinate" : "400,220;470,220" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99", + "nodeName" : "申请人", + "nodeRatio" : 0.000, + "coordinate" : "520,220|520,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99", + "nextNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a", + "skipType" : "PASS", + "coordinate" : "570,220;655,220" + } ] + }, { + "nodeType" : 4, + "nodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a", + "nodeRatio" : 0.000, + "coordinate" : "680,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a", + "nextNodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe", + "skipType" : "PASS", + "coordinate" : "680,195;680,140;750,140" + }, { + "nowNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a", + "nextNodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394", + "skipType" : "PASS", + "coordinate" : "680,245;680,300;750,300" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe", + "nodeName" : "市场部", + "permissionFlag" : "role:1", + "nodeRatio" : 0.000, + "coordinate" : "800,140|800,140", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe", + "nextNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2", + "skipType" : "PASS", + "coordinate" : "850,140;920,140;920,195" + } ] + }, { + "nodeType" : 4, + "nodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2", + "nodeRatio" : 0.000, + "coordinate" : "920,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2", + "nextNodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6", + "skipType" : "PASS", + "coordinate" : "945,220;975,220;975,220;960,220;960,220;990,220" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6", + "nodeName" : "CEO", + "permissionFlag" : "1", + "nodeRatio" : 0.000, + "coordinate" : "1040,220|1040,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6", + "nextNodeCode" : "f5ace37f-5a5e-4e64-a6f6-913ab9a71cd1", + "skipType" : "PASS", + "coordinate" : "1090,220;1140,220" + } ] + }, { + "nodeType" : 2, + "nodeCode" : "f5ace37f-5a5e-4e64-a6f6-913ab9a71cd1", + "nodeName" : "结束", + "nodeRatio" : 0.000, + "coordinate" : "1160,220|1160,220", + "skipAnyNode" : "N", + "formCustom" : "N" + }, { + "nodeType" : 1, + "nodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394", + "nodeName" : "综合部", + "permissionFlag" : "role:3,role:4", + "nodeRatio" : 0.000, + "coordinate" : "800,300|800,300", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394", + "nextNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2", + "skipType" : "PASS", + "coordinate" : "850,300;920,300;920,245" + } ] + } ] +} \ No newline at end of file diff --git a/script/leave/leave4.json b/script/leave/leave4.json new file mode 100644 index 0000000..f8f4408 --- /dev/null +++ b/script/leave/leave4.json @@ -0,0 +1,90 @@ +{ + "flowCode" : "leave4", + "flowName" : "请假申请-会签", + "category" : "1", + "version" : "1", + "formCustom" : "N", + "formPath" : "/workflow/leaveEdit/index", + "nodeList" : [ { + "nodeType" : 0, + "nodeCode" : "9ce8bf00-f25b-4fc6-91b8-827082fc4876", + "nodeName" : "开始", + "nodeRatio" : 0.000, + "coordinate" : "320,240|320,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "9ce8bf00-f25b-4fc6-91b8-827082fc4876", + "nextNodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f", + "skipType" : "PASS", + "coordinate" : "340,240;410,240" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f", + "nodeName" : "申请人", + "nodeRatio" : 0.000, + "coordinate" : "460,240|460,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f", + "nextNodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045", + "skipType" : "PASS", + "coordinate" : "510,240;590,240" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045", + "nodeName" : "百分之60通过", + "permissionFlag" : "${userList}", + "nodeRatio" : 60.000, + "coordinate" : "640,240|640,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045", + "nextNodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1", + "skipType" : "PASS", + "coordinate" : "690,240;770,240" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1", + "nodeName" : "全部审批通过", + "permissionFlag" : "role:1,role:3", + "nodeRatio" : 100.000, + "coordinate" : "820,240|820,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1", + "nextNodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f", + "skipType" : "PASS", + "coordinate" : "870,240;950,240" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f", + "nodeName" : "CEO", + "permissionFlag" : "1", + "nodeRatio" : 0.000, + "coordinate" : "1000,240|1000,240", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f", + "nextNodeCode" : "b62b88c3-8d8d-4969-911e-2aaea219e7fc", + "skipType" : "PASS", + "coordinate" : "1050,240;1080,240;1080,240;1070,240;1070,240;1100,240" + } ] + }, { + "nodeType" : 2, + "nodeCode" : "b62b88c3-8d8d-4969-911e-2aaea219e7fc", + "nodeName" : "结束", + "nodeRatio" : 0.000, + "coordinate" : "1120,240|1120,240", + "skipAnyNode" : "N", + "formCustom" : "N" + } ] +} \ No newline at end of file diff --git a/script/leave/leave5.json b/script/leave/leave5.json new file mode 100644 index 0000000..dc99494 --- /dev/null +++ b/script/leave/leave5.json @@ -0,0 +1,121 @@ +{ + "flowCode" : "leave5", + "flowName" : "请假申请-并行会签网关", + "category" : "1", + "version" : "1", + "formCustom" : "N", + "formPath" : "/workflow/leaveEdit/index", + "nodeList" : [ { + "nodeType" : 0, + "nodeCode" : "ebebaf26-9cb6-497e-8119-4c9fed4c597c", + "nodeName" : "开始", + "nodeRatio" : 0.000, + "coordinate" : "300,220|300,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "ebebaf26-9cb6-497e-8119-4c9fed4c597c", + "nextNodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374", + "skipType" : "PASS", + "coordinate" : "320,220;350,220;350,220;340,220;340,220;370,220" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374", + "nodeName" : "申请人", + "nodeRatio" : 0.000, + "coordinate" : "420,220|420,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374", + "nextNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9", + "skipType" : "PASS", + "coordinate" : "470,220;535,220" + } ] + }, { + "nodeType" : 4, + "nodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9", + "nodeRatio" : 0.000, + "coordinate" : "560,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9", + "nextNodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862", + "skipType" : "PASS", + "coordinate" : "560,245;560,320;650,320" + }, { + "nowNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9", + "nextNodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4", + "skipType" : "PASS", + "coordinate" : "560,195;560,120;650,120" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862", + "nodeName" : "会签", + "permissionFlag" : "role:1,role:3", + "nodeRatio" : 100.000, + "coordinate" : "700,320|700,320", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862", + "nextNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b", + "skipType" : "PASS", + "coordinate" : "750,320;860,320;860,245" + } ] + }, { + "nodeType" : 4, + "nodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b", + "nodeRatio" : 0.000, + "coordinate" : "860,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b", + "nextNodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9", + "skipType" : "PASS", + "coordinate" : "885,220;950,220" + } ] + }, { + "nodeType" : 1, + "nodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9", + "nodeName" : "CEO", + "permissionFlag" : "1", + "nodeRatio" : 0.000, + "coordinate" : "1000,220|1000,220", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9", + "nextNodeCode" : "03c4d2bc-58b5-4408-a2e4-65afb046f169", + "skipType" : "PASS", + "coordinate" : "1050,220;1120,220" + } ] + }, { + "nodeType" : 2, + "nodeCode" : "03c4d2bc-58b5-4408-a2e4-65afb046f169", + "nodeName" : "结束", + "nodeRatio" : 0.000, + "coordinate" : "1140,220|1140,220", + "skipAnyNode" : "N", + "formCustom" : "N" + }, { + "nodeType" : 1, + "nodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4", + "nodeName" : "百分之60票签", + "permissionFlag" : "${userList}", + "nodeRatio" : 60.000, + "coordinate" : "700,120|700,120", + "skipAnyNode" : "N", + "formCustom" : "N", + "skipList" : [ { + "nowNodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4", + "nextNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b", + "skipType" : "PASS", + "coordinate" : "750,120;860,120;860,195" + } ] + } ] +} \ No newline at end of file diff --git a/script/sql/update/update_5.3.0-5.3.1.sql b/script/sql/update/update_5.3.0-5.3.1.sql new file mode 100644 index 0000000..8c313b2 --- /dev/null +++ b/script/sql/update/update_5.3.0-5.3.1.sql @@ -0,0 +1,6 @@ +ALTER TABLE `flow_node` DROP COLUMN `skip_any_node`; +ALTER TABLE `flow_node` + ADD COLUMN `ext` text NULL COMMENT '扩展属性' AFTER `update_time`; + +INSERT INTO sys_dict_type VALUES (16, '000000', '按钮权限', 'wf_button_permission', 103, 1, sysdate(), NULL, NULL, '按钮权限列表'); +INSERT INTO sys_dict_data VALUES (60, '000000', 1, '是否弹窗选人', '1', 'wf_button_permission', '', 'default', 'N', 103, 1, sysdate(), NULL, NULL,'是否弹窗选人');