Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

zbj//1.运维日志页面展示

Browse Source
This commit is contained in:
zhangbaojian
2023-04-14 12:31:48 +08:00
parent c8ed7001ec
commit 249b1cf025
7 changed files with 184 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LogsListParam.java Normal file
View File

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

44
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LogsListVO.java Normal file
View File

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

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqsTerminalLogsController.java
View File

@@ -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;
/**
* <p>
* 前端控制器
@@ -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<List<LogsListVO>> getList(@RequestBody LogsListParam logsListParam) {
String methodDescribe = getMethodDescribe("getList");
List<LogsListVO> result = iPqsTerminalLogsService.getList(logsListParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

10
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsTerminalLogsMapper.java
View File

@@ -2,7 +2,15 @@ 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;
/**
* <p>
@@ -14,5 +22,5 @@ import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
*/
public interface PqsTerminalLogsMapper extends BaseMapper<PqsTerminalLogs> {
void InsertLog(PqsTerminalLogs terminalLogsNew);
List<LogsListVO> getList(Page<LogsListVO> page, @Param("logsListParam") LogsListParam logsListParam);
}

51
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsTerminalLogsMapper.xml
View File

@@ -2,4 +2,55 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pq.mapper.PqsTerminalLogsMapper">
<!--<select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
SELECT
sdd.`Name` "type",
ptl.Create_By "updateBy",
ptl.Create_Time "updateTime",
ptl.`Terminal_Describe` "remark"
FROM
pqs_terminal_logs ptl
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
<where>
<if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')
</if>
<if test="logsListParam.searchEndTime != null and logsListParam.searchEndTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &lt;= date_format(#{logsListParam.searchEndTime},'%y%m%d')
</if>
<if test="logsListParam.searchValue !=null and logsListParam.searchValue !=''">
and (ptl.Terminal_Describe like CONCAT('%', #{logsListParam.searchValue},'%')
</if>
<if test="logsListParam.type !=null and logsListParam.type !=''">
and sdd.Code = #{logsListParam.type}
</if>
</where>
ORDER BY ptl.Create_Time DESC
LIMIT #{page.current},#{page.size}
</select>-->
<select id="getList" resultType="com.njcn.device.pq.pojo.vo.LogsListVO">
SELECT
sdd.`Name` "type",
ptl.Create_By "updateBy",
ptl.Create_Time "updateTime",
ptl.`Terminal_Describe` "remark"
FROM
pqs_terminal_logs ptl
LEFT JOIN sys_dict_data sdd ON sdd.Id = ptl.`Terminal_Type`
<where>
<if test="logsListParam.searchBeginTime != null and logsListParam.searchBeginTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &gt;= date_format(#{logsListParam.searchBeginTime},'%y%m%d')
</if>
<if test="logsListParam.searchEndTime != null and logsListParam.searchEndTime != ''">
and date_format(ptl.Create_Time,'%y%m%d') &lt;= date_format(#{logsListParam.searchEndTime},'%y%m%d')
</if>
<if test="logsListParam.searchValue !=null and logsListParam.searchValue !=''">
and ptl.Terminal_Describe like CONCAT('%', #{logsListParam.searchValue},'%')
</if>
<if test="logsListParam.type !=null and logsListParam.type !=''">
and sdd.Code = #{logsListParam.type}
</if>
</where>
ORDER BY ptl.Create_Time DESC
</select>
</mapper>

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IPqsTerminalLogsService.java
View File

@@ -1,9 +1,14 @@
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;
/**
* <p>
* 服务类
@@ -14,5 +19,8 @@ import org.springframework.stereotype.Service;
*/
@Service
public interface IPqsTerminalLogsService extends IService<PqsTerminalLogs> {
boolean saveLogs(PqsTerminalLogs pqsTerminalLogs);
List<LogsListVO> getList(LogsListParam logsListParam);
}

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqsTerminalLogsServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -15,10 +24,25 @@ import org.springframework.stereotype.Service;
* @since 2023-04-13
*/
@Service
@AllArgsConstructor
public class PqsTerminalLogsServiceImpl extends ServiceImpl<PqsTerminalLogsMapper, PqsTerminalLogs> 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<LogsListVO> getList(LogsListParam logsListParam) {
return pqsTerminalLogsMapper.getList(new Page<LogsListVO>(logsListParam.getPageNum(), logsListParam.getPageSize()),logsListParam);
}
}