bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:eb8f57b7a3f3ec7bb92316b16907f6603b03f111
Branches Tags
bonus:dev
bonus:master
..
compare: bonus:4f7d272cac847993199c089e657dc0922830a67e
Branches Tags
bonus:dev
bonus:master

No commits in common. "eb8f57b7a3f3ec7bb92316b16907f6603b03f111" and "4f7d272cac847993199c089e657dc0922830a67e" have entirely different histories.
eb8f57b7a3 ... 4f7d272cac

6 changed files with 5 additions and 94 deletions
Show Stats Expand all files Collapse all files

36
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/SysFileInfo.java
View File

@ -1,36 +0,0 @@
package com.bonus.zlpt.common.core.domain.equip;
import com.bonus.zlpt.common.core.annotation.Excel;
import lombok.Data;
@Data
public class SysFileInfo {
@Excel(name = "id")
private Integer id;
@Excel(name = "设备id")
private Integer modelId;
@Excel(name = "文件名称")
private String fileName;
@Excel(name = "文件路径")
private String fileUrl;
@Excel(name = "字典id")
private Integer dicId;
@Excel(name = "创建人")
private String creator;
@Excel(name = "创建时间")
private String createTime;
}

18
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/enums/FileDictEnum.java
View File

@ -1,18 +0,0 @@
package com.bonus.zlpt.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@AllArgsConstructor
public enum FileDictEnum {
//检验信息
INSPECT_IMAGE_URL(28),
//保险信息
INSURE_IMAGE_URL(29);
private final Integer value;
}

14
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/SysFileInfoMapper.java
View File

@ -1,14 +0,0 @@
package com.bonus.zlpt.equip.mapper;
import com.bonus.zlpt.common.core.domain.equip.SysFileInfo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SysFileInfoMapper {
//根据设备id查询
List<SysFileInfo> selectByMaId(Long maId);
}

4
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/TypeInfoMapper.java
View File

@ -59,9 +59,5 @@ public interface TypeInfoMapper
*/
public int deleteTypeInfoByTypeIds(Long[] typeIds);
int selectCountByTypeId(Long typeId);
}

16
zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/UpOffServiceImpl.java
View File

@ -5,12 +5,9 @@ import java.util.stream.Collectors;
import com.bonus.zlpt.common.core.domain.equip.FileInfo;
import com.bonus.zlpt.common.core.domain.equip.SysFileInfo;
import com.bonus.zlpt.common.core.domain.equip.TypeInfo;
import com.bonus.zlpt.common.core.domain.equip.dto.UpOffDto;
import com.bonus.zlpt.common.core.enums.FileDictEnum;
import com.bonus.zlpt.equip.mapper.FileInfoMapper;
import com.bonus.zlpt.equip.mapper.SysFileInfoMapper;
import com.bonus.zlpt.equip.mapper.TypeInfoMapper;
import com.bonus.zlpt.common.core.domain.equip.vo.MaDevInfoVo;
import org.springframework.beans.factory.annotation.Autowired;
@ -35,11 +32,8 @@ public class UpOffServiceImpl implements IUpOffService
@Autowired
private TypeInfoMapper typeInfoMapper;
// @Autowired
// private FileInfoMapper fileInfoMapper;
@Autowired
private SysFileInfoMapper sysFileInfoMapper;
private FileInfoMapper fileInfoMapper;
/**
* 查询设备上下架管理
@ -169,12 +163,12 @@ public class UpOffServiceImpl implements IUpOffService
for (MaDevInfoVo devInfoVo : devInfoVos) {
//组装url
List<SysFileInfo> fileInfos = sysFileInfoMapper.selectByMaId(devInfoVo.getMaId());
for (SysFileInfo fileInfo : fileInfos) {
if(FileDictEnum.INSPECT_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
List<FileInfo> fileInfos = fileInfoMapper.selectByMaId(devInfoVo.getMaId());
for (FileInfo fileInfo : fileInfos) {
if("0".equals(fileInfo.getType())){
devInfoVo.setInspectImageUrl(fileInfo.getFileUrl());
}
if(FileDictEnum.INSURE_IMAGE_URL.getValue().equals(fileInfo.getDicId())){
if("1".equals(fileInfo.getType())){
devInfoVo.setInsureImageUrl(fileInfo.getFileUrl());
}
}

11
zlpt-modules/zlpt-equip/src/main/resources/mapper/SysFileInfoMapper.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.zlpt.equip.mapper.SysFileInfoMapper">
<select id="selectByMaId" resultType="com.bonus.zlpt.common.core.domain.equip.SysFileInfo">
select * from sys_file_info where model_id = #{maId}
</select>
</mapper>