From ba0370744337693da29c3be821eea705ab3c51c1 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 2 Jul 2025 15:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/pojo/param/PqFrontLogsParam.java | 5 ++- .../njcn/system/mapper/PqFrontLogsMapper.java | 5 ++- .../mapper/mapping/PqFrontLogsMapper.xml | 17 +++++++++ .../service/impl/PqFrontLogsServiceImpl.java | 37 ++++++++++++++++++- 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsMapper.xml diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqFrontLogsParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqFrontLogsParam.java index ea4ffcfd9..b46e04f3c 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqFrontLogsParam.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqFrontLogsParam.java @@ -16,10 +16,13 @@ import lombok.Data; @Data public class PqFrontLogsParam extends BaseParam { - + //terminal设备，measurepoint监测点 private String level; + //"logtype": "com/data", //日志类型 private String logType; + //"grade": "NORMAL/DEBUG", //日志等级 private String grade; + //前置类型stat稳态/recall补招/realTime实时/comtrade private String frontType; } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/PqFrontLogsMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/PqFrontLogsMapper.java index 117209ac6..c9333d710 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/PqFrontLogsMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/PqFrontLogsMapper.java @@ -1,9 +1,12 @@ package com.njcn.system.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.db.mapper.BatchBaseMapper; import com.njcn.system.excel.UserLogExcel; import com.njcn.system.pojo.po.PqFrontLogs; import com.njcn.system.pojo.po.UserLog; +import com.njcn.system.pojo.vo.PqFrontLogsVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,5 +23,5 @@ import java.util.List; public interface PqFrontLogsMapper extends BatchBaseMapper { - + Page page(@Param("page")Page objectPage, @Param("ew") QueryWrapper queryWrapper); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsMapper.xml new file mode 100644 index 000000000..2cc38d82b --- /dev/null +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java index a16842cbe..7b58ba68e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.system.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.LogInfoDTO; @@ -8,16 +9,20 @@ import com.njcn.system.mapper.PqFrontLogsMapper; import com.njcn.system.mapper.UserLogMapper; import com.njcn.system.pojo.dto.PqFrontLogsDTO; import com.njcn.system.pojo.param.PqFrontLogsParam; +import com.njcn.system.pojo.po.PqDashboardPage; import com.njcn.system.pojo.po.PqFrontLogs; import com.njcn.system.pojo.po.UserLog; import com.njcn.system.pojo.vo.PqFrontLogsVO; import com.njcn.system.service.IUserLogService; import com.njcn.system.service.PqFrontLogsService; +import com.njcn.web.factory.PageFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.Objects; + /** *

@@ -43,6 +48,36 @@ public class PqFrontLogsServiceImpl extends ServiceImpl queryPage(PqFrontLogsParam baseParam) { - return null; + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (Objects.nonNull(baseParam.getSearchBeginTime()) && Objects.nonNull(baseParam.getSearchEndTime())) { + queryWrapper.between("A.Create_Time", baseParam.getSearchBeginTime(), baseParam.getSearchEndTime()); + } + if(Objects.nonNull(baseParam.getSearchValue())){ + queryWrapper.like("A.log",baseParam.getSearchValue()); + } + + Page page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), queryWrapper); + page.getRecords().forEach(temp->{ + temp.setLevel(Objects.equals(temp.getLevel(),"terminal")?"设备":"监测点"); + temp.setFrontType(getFrontType(temp.getFrontType())); + + }); + return page; + } + public String getFrontType(String frontType){ + // //前置类型stat稳态/recall补招/realTime实时/comtrade + switch (frontType) { + case "stat": + return "稳态"; + case "recall": + return "补招"; + case "realTime": + return "实时"; + case "comtrade": + return "录波"; + default: + return "/"; + + } } }