提交代码

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;
 
 }

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<PqFrontLogs> {
 
 
-
+    Page<PqFrontLogsVO> page(@Param("page")Page<Object> objectPage, @Param("ew") QueryWrapper<PqFrontLogs> queryWrapper);
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsMapper.xml

@@ -0,0 +1,17 @@
+<?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.njcn.system.mapper.PqFrontLogsMapper">
+
+  <select id="page" resultType="com.njcn.system.pojo.vo.PqFrontLogsVO">
+    select
+    A.*,
+    line.name businessName
+    from
+    PQ_FRONT_LOGS A
+    left join pq_line line
+    on  line.id =A.business_id
+    <where>
+       ${ew.sqlSegment}
+    </where>
+  </select>
+</mapper>

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;
+
 
 /**
  * <p>
@@ -43,6 +48,36 @@ public class PqFrontLogsServiceImpl extends ServiceImpl<PqFrontLogsMapper, PqFro
 
     @Override
     public Page<PqFrontLogsVO> queryPage(PqFrontLogsParam baseParam) {
-        return null;
+        QueryWrapper<PqFrontLogs> 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<PqFrontLogsVO>  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 "/";
+
+        }
     }
 }