From 1d0a20aaaeb6a9d0c97fdb502d369b985a7d5224 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Sat, 9 Dec 2023 11:37:31 +0800 Subject: [PATCH 1/2] fix --- .../zlpt/equip/mapper/DevInfoMapper.java | 1 + .../service/impl/DevInfoServiceImpl.java | 44 +++++++++++-------- .../main/resources/mapper/DevInfoMapper.xml | 7 +++ 3 files changed, 34 insertions(+), 18 deletions(-) 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 ef109b7..3d68c71 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 @@ -84,4 +84,5 @@ public interface DevInfoMapper int insertLon(InforMationDto inforMationDto); public List getSysDic(); + public SysDic getSysDicById(Integer id); } 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 daa7e35..c42fa52 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 @@ -17,6 +17,8 @@ import com.bonus.zlpt.equip.service.IDevInfoService; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import static com.bonus.zlpt.common.core.web.domain.AjaxResult.error; + /** * 设备信息Service业务层处理 * @@ -47,28 +49,34 @@ public class DevInfoServiceImpl implements IDevInfoService public DevInfoVo selectDevInfoByMaId(Long maId) { DevInfoVo devInfoVo = devInfoMapper.selectDevInfoByMaId(maId); - List files = devInfoMapper.getFilesByMaId(maId); - if (!CollectionUtils.isEmpty(files) && files.get(0) != null) { - List picList = new ArrayList(); - for (SysFile file : files) { - if (file.getDicId() == ASPECT_PICTURE) { - picList.add(file.getUrl()); + try { + List files = devInfoMapper.getFilesByMaId(maId); + if (!CollectionUtils.isEmpty(files) && files.get(0) != null) { + List picList = new ArrayList(); + for (SysFile file : files) { + if (file.getDicId() == ASPECT_PICTURE) { + picList.add(file.getUrl()); + } + if (file.getDicId() == EXAMINATION_PDF) { + devInfoVo.setExaminationPdf(file.getUrl()); + } + if (file.getDicId() == INSURANCE_PDF) { + devInfoVo.setInsurancePdf(file.getUrl()); + } } - if (file.getDicId() == EXAMINATION_PDF) { - devInfoVo.setExaminationPdf(file.getUrl()); - } - if (file.getDicId() == INSURANCE_PDF) { - devInfoVo.setInsurancePdf(file.getUrl()); + String[] pictureArray = null; + if (!CollectionUtils.isEmpty(picList)) { + pictureArray = picList.toArray(new String[picList.size()]); } + devInfoVo.setPictures(pictureArray); } - String[] pictureArray = null; - if (!CollectionUtils.isEmpty(picList)) { - pictureArray = picList.toArray(new String[picList.size()]); - } - devInfoVo.setPictures(pictureArray); + Long companyUpNum = devInfoMapper.getCompanyUpNum(devInfoVo.getOwnCo()); + devInfoVo.setCompanyUpNum(companyUpNum); + SysDic sysDic = devInfoMapper.getSysDicById(Integer.parseInt(devInfoVo.getMaStatus())); + devInfoVo.setMaStatusStr(sysDic.getName()); + } catch (Exception e) { + error("fail to get devInfo for files or companyUpNum or maStatusStr" + maId); } - Long companyUpNum = devInfoMapper.getCompanyUpNum(devInfoVo.getOwnCo()); - devInfoVo.setCompanyUpNum(companyUpNum); return devInfoVo; } 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 93d0301..95519af 100644 --- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml +++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml @@ -347,4 +347,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id,p_id,code,`name`,description,`value`,sort,`level`,status,create_time,creator from sys_dic + + \ No newline at end of file From c7d4515410393b638fda41b2b69f09baefc7fe7e Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Sat, 9 Dec 2023 11:38:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/api/domain/BmCompanyInfo.java | 3 +++ .../impl/BmCompanyInfoServiceImpl.java | 7 +++++- .../resources/mapper/BmCompanyInfoMapper.xml | 2 +- .../zlpt/system/config/SmsComponent.java | 19 +++++++++++----- .../src/main/resources/bootstrap.yml | 22 +++++++++---------- 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java index 3da3a8c..6dbaa54 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java @@ -228,5 +228,8 @@ public class BmCompanyInfo implements Serializable { @ApiModelProperty(value = "法人身份证国徽面", required = true) private String legalNationUrl; + //用户名 + private String userName; + } \ No newline at end of file diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java index fa089fd..c3de65f 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java @@ -89,7 +89,12 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { @Override public List selectList(BmCompanyDto bmCompanyDto) { - return bmCompanyInfoMapper.selectList(bmCompanyDto); + List bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto); + for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) { + SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getAuditor().longValue()).getData(); + bmCompanyInfo.setUserName(data.getUserName()); + } + return bmCompanyInfos; } /** diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml index 3477d1d..ceef7a8 100644 --- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -429,7 +429,7 @@