From 30f726c6d7f82bf4f7e0342d20fbd245f1c2a0ad Mon Sep 17 00:00:00 2001 From: YYD-YY <2962062657@qq.com> Date: Sun, 5 Oct 2025 16:34:38 +0800 Subject: [PATCH] =?UTF-8?q?10.5=E4=BF=AE=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alops/framework/web/service/SysLoginService.java | 2 ++ .../framework/web/service/SysRegisterService.java | 2 ++ .../src/main/java/com/alops/system/domain/EquManu.java | 10 +++++----- .../src/main/java/com/alops/system/domain/EquType.java | 6 +++--- .../com/alops/system/domain/dto/EquSupplierAddDto.java | 1 - .../alops/system/domain/dto/EquSupplierUpdateDto.java | 1 - .../alops/system/service/impl/EquManuServiceImpl.java | 2 ++ .../system/service/impl/EquSupplierServiceImpl.java | 7 +++++-- .../alops/system/service/impl/EquTypeServiceImpl.java | 2 ++ .../src/main/resources/mapper/system/EquManuMapper.xml | 1 + 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysLoginService.java b/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysLoginService.java index 32240b2d..07e58c00 100644 --- a/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysLoginService.java +++ b/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysLoginService.java @@ -29,6 +29,8 @@ import com.alops.framework.security.context.AuthenticationContextHolder; import com.alops.system.service.ISysConfigService; import com.alops.system.service.ISysUserService; +import java.util.Date; + /** * 登录校验方法 * diff --git a/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysRegisterService.java b/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysRegisterService.java index bb402155..ec49fb96 100644 --- a/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysRegisterService.java +++ b/ALOps_sys_backend/alops-framework/src/main/java/com/alops/framework/web/service/SysRegisterService.java @@ -19,6 +19,8 @@ import com.alops.framework.manager.factory.AsyncFactory; import com.alops.system.service.ISysConfigService; import com.alops.system.service.ISysUserService; +import java.util.Date; + /** * 注册校验方法 * diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java index c514d6b6..9761a0d5 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquManu.java @@ -31,8 +31,8 @@ public class EquManu @Excel(name = "厂商简介") private String description; - /** 联系人ID */ - @Excel(name = "联系人ID") + /** 联系人*/ + @Excel(name = "联系人") private String contactBy; /** 联系方式 */ @@ -50,7 +50,7 @@ public class EquManu private Long status; //@JsonIgnore - private String createBy; // 新增 + private Long createBy; // 新增 public EquManu() {} @@ -144,11 +144,11 @@ public class EquManu return status; } - public String getCreateBy() { + public Long getCreateBy() { return createBy; } - public void setCreateBy(String createBy) { + public void setCreateBy(Long createBy) { this.createBy = createBy; } diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java index 110d5090..054932fa 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquType.java @@ -43,7 +43,7 @@ public class EquType private Date createDate; //@JsonIgnore - private String createBy; + private Long createBy; public EquType() {} @@ -106,11 +106,11 @@ public class EquType return createDate; } - public String getCreateBy() { + public Long getCreateBy() { return createBy; } - public void setCreateBy(String createBy) { + public void setCreateBy(Long createBy) { this.createBy = createBy; } diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierAddDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierAddDto.java index b325c232..521f48d6 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierAddDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierAddDto.java @@ -13,6 +13,5 @@ public class EquSupplierAddDto { private String description; private String contactBy; private String contactWay; - private Long createBy; private Long status; } diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierUpdateDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierUpdateDto.java index f25dbeaa..aa0bbcbd 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierUpdateDto.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/EquSupplierUpdateDto.java @@ -6,7 +6,6 @@ import lombok.Data; public class EquSupplierUpdateDto { private String contactBy; private String contactWay; - private Long createBy; private String description; private String id; private String name; diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java index 875a9c5d..0c2f1b26 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquManuServiceImpl.java @@ -60,6 +60,7 @@ public class EquManuServiceImpl implements IEquManuService equManu.setId(UUID.randomUUID().toString()); equManu.setCreateDate(new Date()); Long userId = SecurityUtils.getLoginUser().getUserId(); + equManu.setCreateBy(userId); return equManuMapper.insertEquManu(equManu); } @@ -73,6 +74,7 @@ public class EquManuServiceImpl implements IEquManuService public int updateEquManu(EquManu equManu) { Long userId = SecurityUtils.getLoginUser().getUserId(); + equManu.setCreateBy(userId); return equManuMapper.updateEquManu(equManu); } diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java index 747b8eaf..e583f9f2 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquSupplierServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.UUID; import com.alops.common.utils.DateUtils; +import com.alops.common.utils.SecurityUtils; import com.alops.system.domain.dto.EquSupplierAddDto; import com.alops.system.domain.dto.EquSupplierUpdateDto; import org.springframework.beans.factory.annotation.Autowired; @@ -70,11 +71,12 @@ public class EquSupplierServiceImpl implements IEquSupplierService equSupplier.setDescription(dto.getDescription()); equSupplier.setContactBy(dto.getContactBy()); equSupplier.setContactWay(dto.getContactWay()); - equSupplier.setCreateBy(dto.getCreateBy()); equSupplier.setCreateTime(new Date()); // 自动生成创建时间 equSupplier.setStatus(dto.getStatus()); + Long userId = SecurityUtils.getLoginUser().getUserId(); + equSupplier.setCreateBy(userId); return equSupplierMapper.insertEquSupplier(equSupplier); } @@ -94,12 +96,13 @@ public class EquSupplierServiceImpl implements IEquSupplierService equSupplier.setDescription(updateDto.getDescription()); equSupplier.setContactBy(updateDto.getContactBy()); equSupplier.setContactWay(updateDto.getContactWay()); - equSupplier.setCreateBy(updateDto.getCreateBy()); equSupplier.setStatus(updateDto.getStatus()); // 后端自动设置修改时间 equSupplier.setCreateTime(new Date()); + Long userId = SecurityUtils.getLoginUser().getUserId(); + equSupplier.setCreateBy(userId); return equSupplierMapper.updateEquSupplier(equSupplier); } diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java index cd95be3d..08303f4f 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/EquTypeServiceImpl.java @@ -57,6 +57,7 @@ public class EquTypeServiceImpl implements IEquTypeService { equType.setId(UUID.randomUUID().toString()); Long userId = SecurityUtils.getLoginUser().getUserId(); + equType.setCreateBy(userId); return equTypeMapper.insertEquType(equType); } @@ -70,6 +71,7 @@ public class EquTypeServiceImpl implements IEquTypeService public int updateEquType(EquType equType) { Long userId = SecurityUtils.getLoginUser().getUserId(); + equType.setCreateBy(userId); return equTypeMapper.updateEquType(equType); } diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml index a8e0608d..74c9bf3a 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquManuMapper.xml @@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and contact_way = #{contactWay} and create_date = #{createDate} and status = #{status} + and create_by = #{createBy}