Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

新增审计日志列表

Browse Source
This commit is contained in:
陈超
2022-07-13 21:31:30 +08:00
parent 014c766806
commit 53580a46b8
5 changed files with 64 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProgramVersionMapper.xml
View File

@@ -23,7 +23,7 @@
AND A.Dev_Type = B.Id
AND A.Update_By = C.Id
<if test="devType != null and devType != ''">
AND A.Dev_Type = '${devType}'
AND A.Dev_Type = ${devType}
</if>
</select>

26
pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.njcn.device.service.ProgramVersionService;
import com.njcn.web.utils.RequestUtil;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
@@ -46,19 +47,21 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
page.setCurrent(pageNum);
List<VersionVO> version = programVersionMapper.getVersion(devType);
for (VersionVO vo: version) {
if (vo.getVersionType().isEmpty()) {
vo.setVersionType("通用");
if (!CollectionUtils.isEmpty(version)) {
for (VersionVO vo: version) {
if (vo.getVersionType().isEmpty()) {
vo.setVersionType("通用");
}
}
//待分页数据总量
page.setTotal(version.size());
//分页总页数
int pages = (int)Math.ceil(version.size()*1.0/pageSize);
page.setPages(pages);
List<List<VersionVO>> partition = Lists.partition(version, pageSize);
List<VersionVO> versionVOS = partition.get(pageNum - 1);
page.setRecords(versionVOS);
}
//待分页数据总量
page.setTotal(version.size());
//分页总页数
int pages = (int)Math.ceil(version.size()*1.0/pageSize);
page.setPages(pages);
List<List<VersionVO>> partition = Lists.partition(version, pageSize);
List<VersionVO> versionVOS = partition.get(pageNum - 1);
page.setRecords(versionVOS);
return page;
}
@@ -76,7 +79,6 @@ public class ProgramVersionServiceImpl extends ServiceImpl<VersionMapper, Versio
} else {
version.setVersionType("");
}
version.setName(name);
byte[] b = null, bytes = null;
try {