From 7ce332a03288f469459a0babf2d3d7f58c47f5f6 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 30 Oct 2025 17:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=B9=E6=A1=88=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/enterprise/PersonnelService.java | 20 +-------- .../service/enterprise/TechnicalService.java | 10 ++++- .../domain/mainDatabase/dto/TechnicalDto.java | 8 +++- .../mapper/IMDTechnicalMapper.java | 9 ++++ .../service/IMDTechnicalService.java | 9 ++++ .../service/impl/MDTechnicalService.java | 10 +++++ .../main/resources/mapper/TechnicalMapper.xml | 45 +++++++++++++++++-- 7 files changed, 86 insertions(+), 25 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java index 78df371..aa5c081 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java @@ -252,6 +252,7 @@ public class PersonnelService { * @author cwchen * @date 2025/10/22 17:15 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult delData(EnterprisePersonnelDto dto) { // 1.校验数据是否合法 String validResult = validatorsUtils.valid(dto, EnterprisePersonnelDto.DELETE.class); @@ -366,23 +367,4 @@ public class PersonnelService { resourceFilePo.setFileType(item.getCertificateType()); return resourceFilePo; } - - /** - * 文件访问路径赋值 - * @param fileVoList - * @return List - * @author cwchen - * @date 2025/10/24 13:37 - *//* - public List setFile(List fileVoList){ - if(CollectionUtils.isNotEmpty(fileVoList)){ - for (ResourceFileVo file : fileVoList) { - SysFile sysFile = fileUploadService.getFile(file.getFilePath()); - if(Objects.nonNull(sysFile)){ - file.setLsFilePath(sysFile.getUrl()); - } - } - } - return fileVoList; - }*/ } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java index 8b7baac..3781168 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; @@ -64,6 +65,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/28 18:19 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult addTypeData(TechnicalDto.TypeDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TypeDto.ADD.class); @@ -93,6 +95,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/28 18:19 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult editTypeData(TechnicalDto.TypeDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TypeDto.UPDATE.class); @@ -106,7 +109,7 @@ public class TechnicalService { return AjaxResult.error("技术方案库类别已存在"); } // 2.添加技术方案库类别数据 - imdTechnicalService.operTypeData(dto, 1); + imdTechnicalService.operTypeData(dto, 2); } catch (Exception e) { log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); @@ -122,6 +125,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/28 18:19 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult delTypeData(TechnicalDto.TypeDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TypeDto.DELETE.class); @@ -153,6 +157,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/30 10:09 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult addData(TechnicalDto.TechnicalDataDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TechnicalDataDto.ADD.class); @@ -193,6 +198,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/30 10:09 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult editData(TechnicalDto.TechnicalDataDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TechnicalDataDto.UPDATE.class); @@ -217,6 +223,7 @@ public class TechnicalService { * @author cwchen * @date 2025/10/30 10:09 */ + @Transactional(rollbackFor = Exception.class) public AjaxResult delData(TechnicalDto.TechnicalDataDto dto) { // 校验数据是否合法 String validResult = validatorsUtils.valid(dto, TechnicalDto.TechnicalDataDto.DELETE.class); @@ -257,6 +264,7 @@ public class TechnicalService { */ public AjaxResult detailData(TechnicalDto.TechnicalDataDto dto) { TechnicalVo.Technical vo = new TechnicalVo.Technical(); + vo = imdTechnicalService.getDetailData(dto); // 1.查询关联资源文件 List fileVoList = sourceFileService.getFilesByTable(dto.getTechnicalSolutionId(),TableConstants.TB_ENTERPRISE_TECHNICAL_SOLUTION); // 2.取minio中的文件访问路径 diff --git a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/TechnicalDto.java b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/TechnicalDto.java index 0a3e8fe..0a04edc 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/TechnicalDto.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/dto/TechnicalDto.java @@ -3,6 +3,7 @@ package com.bonus.common.domain.mainDatabase.dto; import com.bonus.common.core.domain.model.LoginUser; import com.bonus.common.domain.file.po.ResourceFilePo; import com.bonus.common.utils.SecurityUtils; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -35,7 +36,7 @@ public class TechnicalDto { /** * 企业id */ - @NotNull(message = "技术方案类别id不能为空", groups = {ADD.class,UPDATE.class, DELETE.class, QUERY.class}) + @NotNull(message = "企业id不能为空", groups = {ADD.class,UPDATE.class, DELETE.class, QUERY.class}) private Long enterpriseId; /** @@ -111,7 +112,7 @@ public class TechnicalDto { /** * 技术方案类别id */ - @NotNull(message = "技术方案类别id不能为空", groups = {UPDATE.class, DELETE.class, QUERY.class}) + @NotNull(message = "技术方案类别id不能为空", groups = {ADD.class,UPDATE.class, DELETE.class, QUERY.class}) private Long technicalSolutionTypeId; /** @@ -189,6 +190,9 @@ public class TechnicalDto { .map(LoginUser::getUsername) .orElse(null); + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private String type; + /** * 查询条件限制 */ diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDTechnicalMapper.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDTechnicalMapper.java index 583d1a5..eaf1f4d 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDTechnicalMapper.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDTechnicalMapper.java @@ -73,4 +73,13 @@ public interface IMDTechnicalMapper { * @date 2025/10/30 11:01 */ void operData(@Param("list") List list,@Param("type") int type); + + /** + * 业知识库->技术方案库->技术方案库详情数据 + * @param dto + * @return Technical + * @author cwchen + * @date 2025/10/30 17:13 + */ + TechnicalVo.Technical getDetailData(TechnicalDto.TechnicalDataDto dto); } diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDTechnicalService.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDTechnicalService.java index 20abd7c..26979b8 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDTechnicalService.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDTechnicalService.java @@ -69,4 +69,13 @@ public interface IMDTechnicalService { * @date 2025/10/30 11:00 */ void operData(List dataDtos, int type); + + /** + * 企业知识库->技术方案库->技术方案库详情数据 + * @param dto + * @return Technical + * @author cwchen + * @date 2025/10/30 17:12 + */ + TechnicalVo.Technical getDetailData(TechnicalDto.TechnicalDataDto dto); } diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDTechnicalService.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDTechnicalService.java index a87c015..f930652 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDTechnicalService.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDTechnicalService.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Collections; import java.util.List; +import java.util.Optional; /** * @className:MDTechnicalService @@ -70,4 +71,13 @@ public class MDTechnicalService implements IMDTechnicalService { public void operData(List dataDtos, int type) { imdTechnicalMapper.operData(dataDtos,type); } + + @Override + public TechnicalVo.Technical getDetailData(TechnicalDto.TechnicalDataDto dto) { + try { + return Optional.ofNullable(imdTechnicalMapper.getDetailData(dto)).orElse(new TechnicalVo.Technical()); + } catch (Exception e) { + return new TechnicalVo.Technical(); + } + } } diff --git a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml index 1b2cbae..8df9080 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml @@ -35,7 +35,7 @@ - + INSERT INTO tb_enterprise_technical_solution ( @@ -101,7 +101,7 @@ technical_solution_name AS technicalSolutionName, enterprise_id AS enterpriseId FROM tb_enterprise_technical_solution_type - WHERE enterprise_id = #{enterpriseId} + WHERE enterprise_id = #{enterpriseId} AND del_flag = '0' + +