From d3254353cac1040b77ba036a9dedf788a620606e Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Tue, 5 Dec 2023 16:19:41 +0800 Subject: [PATCH] fix --- .../core/domain/equip/vo/DevInfoVo.java | 2 + .../common/core/domain/system/SysFile.java | 50 +++++++++++++++++++ .../zlpt/equip/mapper/DevInfoMapper.java | 3 +- .../zlpt/equip/service/IDevInfoService.java | 9 +--- .../service/impl/DevInfoServiceImpl.java | 45 +++++++++-------- .../main/resources/mapper/DevInfoMapper.xml | 7 ++- 6 files changed, 83 insertions(+), 33 deletions(-) create mode 100644 zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/system/SysFile.java diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java index dddc053..12cbdf7 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java @@ -29,4 +29,6 @@ public class DevInfoVo extends DevInfo { /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */ private String isAudit; private Long searchNum; + private String examinationPdf; + private String insurancePdf; } diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/system/SysFile.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/system/SysFile.java new file mode 100644 index 0000000..e445d2f --- /dev/null +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/system/SysFile.java @@ -0,0 +1,50 @@ +package com.bonus.zlpt.common.core.domain.system; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 文件信息 + * + * @author ruoyi + */ +public class SysFile +{ + /** + * 文件名称 + */ + private String name; + + /** + * 文件地址 + */ + private String url; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("name", getName()) + .append("url", getUrl()) + .toString(); + } +} diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java index 1a7a13f..34235de 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; +import com.bonus.zlpt.common.core.domain.system.SysFile; /** * 设备信息Mapper接口 @@ -27,7 +28,7 @@ public interface DevInfoMapper * @param maId 设备信息主键 * @return 设备图片集 */ - public String getPicturesByMaId(Long maId); + public List getFilesByMaId(Long maId); public Long getCompanyUpNum(Long ownCo); diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java index 8effa1d..cbd5fc8 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java @@ -5,6 +5,7 @@ import java.util.Map; import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; +import com.bonus.zlpt.common.core.domain.system.SysFile; /** * 设备信息Service接口 @@ -22,14 +23,6 @@ public interface IDevInfoService */ public DevInfoVo selectDevInfoByMaId(Long maId); - /** - * 查询设备图片集 - * - * @param maId 设备信息主键 - * @return 设备图片集 - */ - public String getPicturesByMaId(Long maId); - /** * 查询设备信息列表 * diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index 8dec196..61932e0 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -1,15 +1,12 @@ package com.bonus.zlpt.equip.service.impl; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo; -import com.bonus.zlpt.common.core.domain.equip.TypeInfo; +import com.bonus.zlpt.common.core.domain.system.SysFile; import com.bonus.zlpt.common.core.utils.DateUtils; import com.bonus.zlpt.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +14,7 @@ import org.springframework.stereotype.Service; import com.bonus.zlpt.equip.mapper.DevInfoMapper; import com.bonus.zlpt.common.core.domain.equip.DevInfo; import com.bonus.zlpt.equip.service.IDevInfoService; +import org.springframework.util.CollectionUtils; /** * 设备信息Service业务层处理 @@ -27,6 +25,10 @@ import com.bonus.zlpt.equip.service.IDevInfoService; @Service public class DevInfoServiceImpl implements IDevInfoService { + private final String ASPECT_PICTURE = "ASPECT_PICTURE"; + private final String EXAMINATION_PDF = "EXAMINATION_PDF"; + private final String INSURANCE_PDF = "INSURANCE_PDF"; + @Autowired private DevInfoMapper devInfoMapper; @@ -40,9 +42,24 @@ public class DevInfoServiceImpl implements IDevInfoService public DevInfoVo selectDevInfoByMaId(Long maId) { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId); - String pictures = devInfoMapper.getPicturesByMaId(maId); - if (StringUtils.isNotEmpty(pictures)) { - String[] pictureArray = pictures.split(","); + List files = devInfoMapper.getFilesByMaId(maId); + if (!CollectionUtils.isEmpty(files)) { + List picList = new ArrayList(); + for (SysFile file : files) { + if (ASPECT_PICTURE.equals(file.getName())) { + picList.add(file.getUrl()); + } + if (EXAMINATION_PDF.equals(file.getName())) { + devInfoVo.setExaminationPdf(file.getUrl()); + } + if (INSURANCE_PDF.equals(file.getName())) { + devInfoVo.setInsurancePdf(file.getUrl()); + } + } + String[] pictureArray = null; + if (!CollectionUtils.isEmpty(picList)) { + pictureArray = picList.toArray(new String[picList.size()]); + } devInfoVo.setPictures(pictureArray); } Long companyUpNum = devInfoMapper.getCompanyUpNum(devInfoVo.getOwnCo()); @@ -50,18 +67,6 @@ public class DevInfoServiceImpl implements IDevInfoService return devInfoVo; } - /** - * 查询设备图片集 - * - * @param maId 设备信息主键 - * @return 设备图片集 - */ - @Override - public String getPicturesByMaId(Long maId) - { - return devInfoMapper.getPicturesByMaId(maId); - } - /** * 查询设备信息列表 * diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml index a593558..c1a4dc0 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -107,12 +107,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where d.ma_id = #{maId} - + SELECT s.file_name as name,s.file_url as url from ma_dev_info d - left join sys_file_info sys on d.ma_id = sys.model_id + left join sys_file_info s on d.ma_id = s.model_id WHERE d.ma_id = #{maId} - GROUP BY d.ma_id