完善日志查看接口

src/main/java/com/zy/bms/controller/LogsController.java

@@ -0,0 +1,44 @@
+package com.zy.bms.controller;
+
+import com.zy.bms.common.ServerResponse;
+import com.zy.bms.pojo.io.LogsIO;
+import com.zy.bms.service.IInstructionsService;
+import com.zy.bms.service.ILogsService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 消息日志 控制层
+ *
+ * @author yang xiao kun
+ * create on 2021/7/29
+ */
+@RestController
+@RequestMapping("/bms/api/operate/logs")
+public class LogsController {
+
+    @Resource
+    private ILogsService logsService;
+    @Resource
+    private IInstructionsService instructionsService;
+
+    /**
+     * 分页查询日志
+     */
+    @PostMapping("listPage.do")
+    public ServerResponse listPage(LogsIO io) {
+        return ServerResponse.success(logsService.listPage(io));
+    }
+
+    /**
+     * 获取全部的指令
+     */
+    @GetMapping("getAllInstruction.do")
+    public ServerResponse getAllInstruction() {
+        return ServerResponse.success(instructionsService.list());
+    }
+}

src/main/java/com/zy/bms/mapper/LogsMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zy.bms.entity.Logs;
 import com.zy.bms.pojo.io.LogsIO;
+import com.zy.bms.pojo.vo.LogsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -24,5 +25,5 @@ public interface LogsMapper extends BaseMapper<Logs> {
      * @param page 分页参数
      * @param io   查询条件
      */
-    IPage<Logs> listPage(Page<Logs> page, @Param("io") LogsIO io);
+    IPage<LogsVo> listPage(Page<LogsVo> page, @Param("io") LogsIO io);
 }

src/main/java/com/zy/bms/pojo/vo/LogsVo.java

@@ -0,0 +1,49 @@
+package com.zy.bms.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 日志查询 Vo
+ *
+ * @author yang xiao kun
+ * create on 2021/7/29
+ */
+@Data
+public class LogsVo {
+    /**
+     * 设备ID
+     */
+    private String openNum;
+
+    /**
+     * 类型
+     */
+    private Integer type;
+
+    /**
+     * 发送内容
+     */
+    private String content;
+
+    /**
+     * 主题
+     */
+    private String topic;
+
+    /**
+     * 指令
+     */
+    private String m;
+
+    /**
+     * 指令注释
+     */
+    private String desc;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

src/main/java/com/zy/bms/service/ILogsService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zy.bms.entity.Logs;
 import com.zy.bms.pojo.io.LogsIO;
+import com.zy.bms.pojo.vo.LogsVo;
 
 /**
  * <p>
@@ -36,5 +37,5 @@ public interface ILogsService extends IService<Logs> {
      *
      * @param io 查询条件
      */
-    IPage<Logs> listPage(LogsIO io);
+    IPage<LogsVo> listPage(LogsIO io);
 }

src/main/java/com/zy/bms/service/impl/LogsService.java

@@ -8,13 +8,11 @@ import com.zy.bms.entity.Logs;
 import com.zy.bms.mapper.LogsMapper;
 import com.zy.bms.pojo.dto.MqttDTO;
 import com.zy.bms.pojo.io.LogsIO;
+import com.zy.bms.pojo.vo.LogsVo;
 import com.zy.bms.service.ILogsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * MQTT 收发日志 Service
  *
@@ -36,8 +34,8 @@ public class LogsService extends ServiceImpl<LogsMapper, Logs> implements ILogsS
     }
 
     @Override
-    public IPage<Logs> listPage(LogsIO io) {
-        Page<Logs> page = new Page<>(io.getCurrent(), io.getSize());
+    public IPage<LogsVo> listPage(LogsIO io) {
+        Page<LogsVo> page = new Page<>(io.getCurrent(), io.getSize());
         return baseMapper.listPage(page, io);
     }
 

src/main/resources/mapper/LogsMapping.xml

@@ -2,22 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.bms.mapper.LogsMapper">
 
-    <select id="listPage" resultType="com.zy.bms.entity.Logs">
+    <select id="listPage" resultType="com.zy.bms.pojo.vo.LogsVo">
         SELECT
-            *
+            t1.topic,
+            t1.type,
+            t1.open_num,
+            t1.content,
+            t1.m,
+            t1.create_time,
+            t2.desc
         FROM
-            logs
+            logs t1
+        LEFT JOIN instructions t2 ON t1.m = t2.code
         <where>
             <if test="io.openNum != null and io.openNum != ''">
-                AND open_num LIKE CONCAT("%",#{io.openNum},"%")
+                AND t1.open_num LIKE CONCAT("%",#{io.openNum},"%")
             </if>
             <if test="io.type != null and io.type > -1">
-                AND `type` = #{io.type}
+                AND t1.type = #{io.type}
             </if>
             <if test="io.m != null and io.m !=''">
-                AND m = #{io.m}
+                AND t1.m = #{io.m}
             </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY t1.create_time DESC
     </select>
 </mapper>