diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProgramVersionMapper.xml b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProgramVersionMapper.xml index aad9c5d32..85a25d22f 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProgramVersionMapper.xml +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/mapper/mapping/ProgramVersionMapper.xml @@ -23,7 +23,7 @@ AND A.Dev_Type = B.Id AND A.Update_By = C.Id - AND A.Dev_Type = '${devType}' + AND A.Dev_Type = ${devType} diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java index c963a7e37..14904f95e 100644 --- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java +++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/ProgramVersionServiceImpl.java @@ -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 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> partition = Lists.partition(version, pageSize); + List 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> partition = Lists.partition(version, pageSize); - List versionVOS = partition.get(pageNum - 1); - page.setRecords(versionVOS); return page; } @@ -76,7 +79,6 @@ public class ProgramVersionServiceImpl extends ServiceImpl + + - - \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index a8a28182a..f174fc8e2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -8,6 +8,7 @@ import com.njcn.system.pojo.vo.AuditLogVO; import com.njcn.system.service.AuditService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -42,46 +43,40 @@ public class AuditServiceImpl implements AuditService { auditParam.setPageNum(auditParam.getPageSize()*(auditParam.getPageNum()-1)); List userLogs = auditMapper.selectAuditLog(auditParam); - for (UserLog userLog: userLogs) { - AuditLogVO auditLogVO = new AuditLogVO(); - String ip = userLog.getIp(); - auditLogVO.setIp(userLog.getIp()); - String updateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(userLog.getUpdateTime()); - auditLogVO.setTime(updateTime); - auditLogVO.setUserName(userLog.getUserName()); - auditLogVO.setOperate(userLog.getOperate()); - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(userLog.getUserName()).append(userLog.getUpdateBy()).append("在") - .append(userLog.getOperateType()); - - + if (!CollectionUtils.isEmpty(userLogs)) { + for (UserLog userLog: userLogs) { + AuditLogVO auditLogVO = new AuditLogVO(); + String updateTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(userLog.getUpdateTime()); + auditLogVO.setTime(updateTime); + auditLogVO.setUserName(userLog.getUserName()); + auditLogVO.setOperate(userLog.getOperate()); + StringBuilder describe = new StringBuilder(); + describe.append(userLog.getUserName()).append("在").append(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(userLog.getUpdateTime())).append("在").append(userLog.getIp()).append("执行了").append(userLog.getOperate()).append("，结果为"); + if (userLog.getResult()==1) { + describe.append("成功"); + } + if (userLog.getResult()==0) { + describe.append("失败").append("，失败原因为").append(userLog.getFailReason()); + } + auditLogVO.setDescribe(describe.toString()); + auditLogVO.setOperateType(userLog.getType() == 0 ? "业务事件" : "系统事件"); + auditLogVO.setResult(userLog.getResult() == 0 ? "失败" : "成功"); + auditLogVO.setIp(userLog.getIp()); + if (userLog.getLevel()==0) { + auditLogVO.setLevel("普通"); + }if (userLog.getLevel()==1) { + auditLogVO.setLevel("中等"); + }if (userLog.getLevel()==2) { + auditLogVO.setLevel("严重"); + } + auditLogVOS.add(auditLogVO); + } } - - //当前页数据 - // page.setRecords(); - - - return null; + page.setRecords(auditLogVOS); + return page; } - // @Override - // public void insetAuditLog() { - // Audit audit = new Audit(); - // String userId = IdUtil.simpleUUID(); - // audit.setId(userId); - // audit.setIp("225.225.225.2"); - // audit.setOperate("查询稳态趋势对比"); - // audit.setType(0); - // audit.setResult("成功"); - // audit.setLevel("普通"); - // audit.setUserLogDescribe("正式用户组yfyw2在2022-07-12 10:38在49.72.16.99执行了查询稳态趋势对比,结果为成功"); - // audit.setUpdateBy("e9e2251e3149462aaea6c73cbda5eaa3"); - // audit.setUpdateTime(LocalDateTime.now()); - // audit.setState(0); - // auditMapper.insert(audit); - // } - }