diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LogsListParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LogsListParam.java
new file mode 100644
index 000000000..396907dbd
--- /dev/null
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LogsListParam.java
@@ -0,0 +1,22 @@
+package com.njcn.device.pq.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/04/13
+ */
+@Data
+@ApiModel
+public class LogsListParam extends DeviceLogParam{
+
+ /**
+ * 描述模糊匹配字段
+ */
+ @ApiModelProperty("描述模糊匹配字段")
+ private String searchValue;
+
+}
diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LogsListVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LogsListVO.java
new file mode 100644
index 000000000..ce25a220c
--- /dev/null
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LogsListVO.java
@@ -0,0 +1,44 @@
+package com.njcn.device.pq.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2023/04/13
+ */
+@Data
+public class LogsListVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 日志类型
+ */
+ @ApiModelProperty("type")
+ private String type;
+
+ /**
+ * 更改人员
+ */
+ @ApiModelProperty("更改人员")
+ private String updateBy;
+
+ /**
+ * 更改时间
+ */
+ @ApiModelProperty("更改时间")
+ private LocalDateTime updateTime;
+
+ /**
+ * 描述
+ */
+ @ApiModelProperty("描述")
+ private String remark;
+
+}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java
index 97067168f..a3d230f58 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java
@@ -6,11 +6,16 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.device.pq.pojo.param.DeviceLogParam;
+import com.njcn.device.pq.pojo.param.LogsListParam;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
+import com.njcn.device.pq.pojo.vo.LogsListVO;
import com.njcn.device.pq.service.IPqsTerminalLogsService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
+import java.util.List;
+
/**
*
* 前端控制器
@@ -26,6 +33,8 @@ import com.njcn.web.controller.BaseController;
* @author hongawen
* @since 2023-04-13
*/
+@Slf4j
+@Api(tags = "日志")
@RestController
@RequestMapping("/pqsTerminalLogs")
@RequiredArgsConstructor
@@ -53,5 +62,20 @@ public class PqsTerminalLogsController extends BaseController {
}
}
+ /**
+ * 运维日志页面展示
+ *
+ * @author zbj
+ * @date 2023/4/13
+ */
+ @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+ @PostMapping("/getList")
+ @ApiOperation("运维日志页面展示")
+ @ApiImplicitParam(name = "logsListParam", value = "实体", required = true)
+ public HttpResult> getList(@RequestBody LogsListParam logsListParam) {
+ String methodDescribe = getMethodDescribe("getList");
+ List result = iPqsTerminalLogsService.getList(logsListParam);
+ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+ }
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java
index fbd1d5c6a..d3fe735a3 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java
@@ -2,11 +2,19 @@ package com.njcn.device.pq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pq.pojo.param.LogsListParam;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
+import com.njcn.device.pq.pojo.vo.LogsListVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
*
- * Mapper 接口
+ * Mapper 接口
*
*
* @author hongawen
@@ -14,5 +22,5 @@ import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
*/
public interface PqsTerminalLogsMapper extends BaseMapper {
- void InsertLog(PqsTerminalLogs terminalLogsNew);
+ List getList(Page page, @Param("logsListParam") LogsListParam logsListParam);
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
index 632f607fe..3d75237c4 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
@@ -2,4 +2,55 @@
+
+
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java
index 5f1da4fd3..d88e003f7 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java
@@ -1,12 +1,17 @@
package com.njcn.device.pq.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.pq.pojo.param.DeviceLogParam;
+import com.njcn.device.pq.pojo.param.LogsListParam;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
+import com.njcn.device.pq.pojo.vo.LogsListVO;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
- * 服务类
+ * 服务类
*
*
* @author hongawen
@@ -14,5 +19,8 @@ import org.springframework.stereotype.Service;
*/
@Service
public interface IPqsTerminalLogsService extends IService {
+
boolean saveLogs(PqsTerminalLogs pqsTerminalLogs);
+
+ List getList(LogsListParam logsListParam);
}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java
index 0f32bdcf8..b9ada8787 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java
@@ -1,10 +1,19 @@
package com.njcn.device.pq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pq.mapper.PqsTerminalLogsMapper;
+import com.njcn.device.pq.pojo.param.LogsListParam;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
+import com.njcn.device.pq.pojo.vo.LogsListVO;
import com.njcn.device.pq.service.IPqsTerminalLogsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
/**
*
@@ -15,10 +24,25 @@ import org.springframework.stereotype.Service;
* @since 2023-04-13
*/
@Service
+@AllArgsConstructor
public class PqsTerminalLogsServiceImpl extends ServiceImpl implements IPqsTerminalLogsService {
+ private final PqsTerminalLogsMapper pqsTerminalLogsMapper;
+
@Override
public boolean saveLogs(PqsTerminalLogs pqsTerminalLogs) {
return this.save(pqsTerminalLogs);
}
+
+ /**
+ * 运维日志页面展示
+ *
+ * @author zbj
+ * @date 2023/4/13
+ */
+ @Override
+ public List getList(LogsListParam logsListParam) {
+ return pqsTerminalLogsMapper.getList(new Page(logsListParam.getPageNum(), logsListParam.getPageSize()),logsListParam);
+
+ }
}