From 53a13352cdd04187b32aebe97afb81b904acf753 Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Wed, 19 Nov 2025 14:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=20js=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ruoyi-admin/pom.xml | 10 +++++----- .../sc/student/domain/resp/RespSearchStudent.java | 3 +++ .../business/sc/student/repo/model/ScStudent.java | 10 +++++----- .../sc/student/service/BusinessScStudentService.java | 3 ++- .../xluobo/business/sys/address/AddressController.java | 6 +++--- .../sys/admin/service/BusinessSysDeptService.java | 9 +++++++-- .../src/main/java/com/ruoyi/RuoYiApplication.java | 4 ++++ .../framework/web/service/UserDetailsServiceImpl.java | 10 +++++----- 9 files changed, 35 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index a9e5bf4..4d3be18 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common - ruoyi-mall + pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 5e67ac4..76f8c3c 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -91,11 +91,11 @@ ${ruoyi.version} - - com.ruoyi - ruoyi-mall - ${ruoyi.version} - + + + + + org.junit.vintage junit-vintage-engine diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespSearchStudent.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespSearchStudent.java index 434804b..73b402d 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespSearchStudent.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/domain/resp/RespSearchStudent.java @@ -1,6 +1,8 @@ package cn.xluobo.business.sc.student.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import java.io.Serializable; @@ -19,6 +21,7 @@ public class RespSearchStudent implements Serializable { + @JsonSerialize(using = ToStringSerializer.class) private Long studentId; private Long schoolId; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/model/ScStudent.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/model/ScStudent.java index fb006d7..12807cb 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/model/ScStudent.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/repo/model/ScStudent.java @@ -1,10 +1,9 @@ package cn.xluobo.business.sc.student.repo.model; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -34,7 +33,8 @@ public class ScStudent implements Serializable { /** * 学生id */ - @TableId(value = "student_id") + @TableId(value = "student_id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long studentId; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java index d5d70e2..d7f293b 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sc/student/service/BusinessScStudentService.java @@ -122,6 +122,7 @@ public class BusinessScStudentService { if (null != contactList && contactList.size() > 0) { scStudent.setPhone(contactList.get(0).getContactPhone()); } + scStudent.setTenantId(SecurityUtils.getLoginUser().getNowTenantId()); scStudent.setCreateUser(loginUser.getUserId()); scStudentService.save(scStudent); @@ -141,7 +142,7 @@ public class BusinessScStudentService { scStudent.setPhone(contactList.get(0).getContactPhone()); } - return APIResponse.toOkResponse(); + return APIResponse.toAPIResponse(scStudent.getStudentId().toString()); } /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/address/AddressController.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/address/AddressController.java index 29f20a8..6e4865b 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/address/AddressController.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/address/AddressController.java @@ -1,11 +1,11 @@ package cn.xluobo.business.sys.address; import cn.hutool.core.util.ObjectUtil; -import cn.xluobo.core.page.RespPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cyl.manager.ums.domain.entity.Address; -import com.cyl.manager.ums.mapper.AddressMapper; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.page.RespPage; +import com.ruoyi.mall.domain.Address; +import com.ruoyi.mall.mapper.AddressMapper; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java index e61d75e..3108078 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/service/BusinessSysDeptService.java @@ -12,6 +12,7 @@ import com.google.common.collect.Lists; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.system.mapper.SysDeptMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,6 +31,9 @@ public class BusinessSysDeptService { @Autowired private ISysDeptService sysDeptService; + + @Autowired + private SysDeptMapper deptMapper; @Autowired private ISysUserDeptService userDeptService; @Autowired @@ -180,8 +184,9 @@ public class BusinessSysDeptService { // sysDept.setDeptType("2"); LoginUser loginUser = SecurityUtils.getLoginUser(); sysDept.setTenantId(loginUser.getNowTenantId()); - QueryWrapper qw = new QueryWrapper<>(sysDept); - List list = sysDeptService.list(qw); +// QueryWrapper qw = new QueryWrapper<>(sysDept); +// List list = sysDeptService.list(qw); + List list = deptMapper.selectDeptList(sysDept); return list.stream().map(RespTreeSelect::new).collect(Collectors.toList()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index c0f3bd3..67b2bbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -1,8 +1,11 @@ package com.ruoyi; +import cn.xluobo.config.properties.AddressProperties; +import cn.xluobo.config.properties.UploadConfigProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -14,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.ruoyi","cn.xluobo"} ) +@EnableConfigurationProperties({UploadConfigProperties.class, AddressProperties.class}) @EnableScheduling public class RuoYiApplication { public static void main(String[] args) { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index c6f783c..1dd009c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -40,11 +40,6 @@ public class UserDetailsServiceImpl implements UserDetailsService public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { SysUser user = userService.selectUserByUserName(username); - SysTenant tenant=tenantService.getById(user.getTenantId()); - if (ObjectUtil.isEmpty(tenant) || !tenant.getInUse().equals("0") || !DateUtil.date().before(tenant.getEndTime()) ){ - log.info("用户所属租户：{} 异常.", tenant.getTenantName()); - throw new ServiceException("用户所属租户：" + tenant.getTenantName() + " 异常"); - } if (StringUtils.isNull(user)) { log.info("登录用户：{} 不存在.", username); @@ -60,6 +55,11 @@ public class UserDetailsServiceImpl implements UserDetailsService log.info("登录用户：{} 已被停用.", username); throw new ServiceException("对不起，您的账号：" + username + " 已停用"); } + SysTenant tenant=tenantService.getById(user.getTenantId()); + if (ObjectUtil.isEmpty(tenant) || !tenant.getInUse().equals("0") || !DateUtil.date().before(tenant.getEndTime()) ){ + log.info("用户所属租户：{} 异常.", tenant.getTenantName()); + throw new ServiceException("用户所属租户：" + tenant.getTenantName() + " 异常"); + } return createLoginUser(user); }