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

微服务版本相关bug修改

Browse Source
This commit is contained in:
hzj
2025-09-03 16:29:01 +08:00
parent 173c7743b0
commit 6be76acda7
20 changed files with 470 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-system/system-boot/src/main/java/com/njcn/system/controller/PqFrontLogsController.java
View File

@@ -11,7 +11,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.system.pojo.dto.PqFrontLogsDTO;
import com.njcn.system.pojo.param.PqFrontLogsChildParam;
import com.njcn.system.pojo.param.PqFrontLogsParam;
import com.njcn.system.pojo.po.PqFrontLogsChild;
import com.njcn.system.pojo.po.UserLog;
import com.njcn.system.pojo.vo.PqFrontLogsVO;
import com.njcn.system.service.IUserLogService;
@@ -75,5 +77,14 @@ public class PqFrontLogsController extends BaseController {
Page<PqFrontLogsVO> list = pqFrontLogsService.queryPage(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
@PostMapping("/queryLogCHild")
@ApiOperation("查询前置日志")
@ApiImplicitParam(name = "baseParam", value = "查询日志参数", required = true)
public HttpResult<Page<PqFrontLogsChild>> queryLogCHild(@RequestBody PqFrontLogsChildParam baseParam) {
String methodDescribe = getMethodDescribe("queryFrontLogs");
Page<PqFrontLogsChild> list = pqFrontLogsService.queryLogCHild(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

15
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/PqFrontLogsChildMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.njcn.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.system.pojo.po.PqFrontLogsChild;
/**
* Description:
* Date: 2025/09/03 下午 1:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface PqFrontLogsChildMapper extends BaseMapper<PqFrontLogsChild> {
}

20
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsChildMapper.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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.PqFrontLogsChildMapper">
<resultMap id="BaseResultMap" type="com.njcn.system.pojo.po.PqFrontLogsChild">
<!--@mbg.generated-->
<!--@Table pq_front_logs_child-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="main_id" jdbcType="VARCHAR" property="mainId" />
<result column="log" jdbcType="LONGVARCHAR" property="log" />
<result column="state" jdbcType="INTEGER" property="state" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, main_id, log, `state`, create_by, create_time, update_by, update_time
</sql>
</mapper>

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

@@ -5,11 +5,14 @@
<select id="page" resultType="com.njcn.system.pojo.vo.PqFrontLogsVO">
select
A.*,
line.name businessName
line.name businessName,
sys.name codeName
from
PQ_FRONT_LOGS A
left join pq_line line
on line.id =A.business_id
left join sys_dict_data sys
on sys.Code = A.code
<where>
${ew.sqlSegment}
</where>

18
pqs-system/system-boot/src/main/java/com/njcn/system/service/PqFrontLogsChildService.java Normal file
View File

@@ -0,0 +1,18 @@
package com.njcn.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.system.pojo.po.PqDashboardPage;
import com.njcn.system.pojo.po.PqFrontLogsChild;
/**
*
* Description:
* Date: 2025/09/03 下午 1:52【需求编号】
*
* @author clam
* @version V1.0.0
*/
public interface PqFrontLogsChildService extends IService<PqFrontLogsChild> {
}

4
pqs-system/system-boot/src/main/java/com/njcn/system/service/PqFrontLogsService.java
View File

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.common.pojo.dto.LogInfoDTO;
import com.njcn.system.pojo.dto.PqFrontLogsDTO;
import com.njcn.system.pojo.param.PqFrontLogsChildParam;
import com.njcn.system.pojo.param.PqFrontLogsParam;
import com.njcn.system.pojo.po.PqFrontLogs;
import com.njcn.system.pojo.po.PqFrontLogsChild;
import com.njcn.system.pojo.po.UserLog;
import com.njcn.system.pojo.vo.PqFrontLogsVO;
@@ -24,4 +26,6 @@ public interface PqFrontLogsService extends IService<PqFrontLogs> {
void addFrontLogs(PqFrontLogsDTO pqFrontLogsDTO);
Page<PqFrontLogsVO> queryPage(PqFrontLogsParam baseParam);
Page<PqFrontLogsChild> queryLogCHild(PqFrontLogsChildParam baseParam);
}

27
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsChildServiceImpl.java Normal file
View File

@@ -0,0 +1,27 @@
package com.njcn.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.system.mapper.PqDashboardPageMapper;
import com.njcn.system.mapper.PqFrontLogsMapper;
import com.njcn.system.pojo.po.PqDashboardPage;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.njcn.system.pojo.po.PqFrontLogsChild;
import com.njcn.system.mapper.PqFrontLogsChildMapper;
import com.njcn.system.service.PqFrontLogsChildService;
/**
*
* Description:
* Date: 2025/09/03 下午 1:52【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service
public class PqFrontLogsChildServiceImpl extends ServiceImpl<PqFrontLogsChildMapper, PqFrontLogsChild> implements PqFrontLogsChildService{
}

82
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java
View File

@@ -5,22 +5,29 @@ 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;
import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
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.PqFrontLogsChildParam;
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.PqFrontLogsChild;
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.PqFrontLogsChildService;
import com.njcn.system.service.PqFrontLogsService;
import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.StringUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.Objects;
@@ -37,34 +44,91 @@ import java.util.Objects;
@Slf4j
public class PqFrontLogsServiceImpl extends ServiceImpl<PqFrontLogsMapper, PqFrontLogs> implements PqFrontLogsService {
private final PqFrontLogsChildService pqFrontLogsChildService;
@Override
public void addFrontLogs(PqFrontLogsDTO pqFrontLogsDTO) {
PqFrontLogs pqFrontLogs = new PqFrontLogs();
BeanUtils.copyProperties(pqFrontLogsDTO,pqFrontLogs);
pqFrontLogs.setState(1);
this.save(pqFrontLogs);
PqFrontLogs one = this.lambdaQuery()
.eq(PqFrontLogs::getLevel, pqFrontLogsDTO.getLevel())
.eq(PqFrontLogs::getFrontType, pqFrontLogsDTO.getFrontType())
.eq(PqFrontLogs::getCode, pqFrontLogsDTO.getCode())
.eq(PqFrontLogs::getBusinessId, pqFrontLogsDTO.getBusinessId())
.eq(PqFrontLogs::getState,1).one();
if(Objects.nonNull(one)){
one.setUpdateTime(LocalDateTime.now());
this.updateById(one);
PqFrontLogsChild pqFrontLogsChild = new PqFrontLogsChild();
pqFrontLogsChild.setMainId(one.getId());
pqFrontLogsChild.setLog(pqFrontLogsDTO.getLog());
pqFrontLogsChild.setState(1);
pqFrontLogsChildService.save(pqFrontLogsChild);
}else {
PqFrontLogs pqFrontLogs = new PqFrontLogs();
BeanUtils.copyProperties(pqFrontLogsDTO,pqFrontLogs);
pqFrontLogs.setState(1);
this.save(pqFrontLogs);
PqFrontLogsChild pqFrontLogsChild = new PqFrontLogsChild();
pqFrontLogsChild.setMainId(pqFrontLogs.getId());
pqFrontLogsChild.setLog(pqFrontLogsDTO.getLog());
pqFrontLogsChild.setGrade(pqFrontLogsDTO.getGrade());
pqFrontLogsChild.setState(1);
pqFrontLogsChildService.save(pqFrontLogsChild);
}
}
@Override
public Page<PqFrontLogsVO> queryPage(PqFrontLogsParam baseParam) {
QueryWrapper<PqFrontLogs> queryWrapper = new QueryWrapper<>();
if (Objects.nonNull(baseParam.getSearchBeginTime()) && Objects.nonNull(baseParam.getSearchEndTime())) {
queryWrapper.between("A.Create_Time", baseParam.getSearchBeginTime()+" 00:00:00", baseParam.getSearchEndTime()+" 23:59:59");
queryWrapper.between("A.update_Time", baseParam.getSearchBeginTime()+" 00:00:00", baseParam.getSearchEndTime()+" 23:59:59");
}
if(Objects.nonNull(baseParam.getSearchValue())){
queryWrapper.like("A.log",baseParam.getSearchValue());
queryWrapper.like("line.name", baseParam.getSearchValue());
}
queryWrapper.orderByDesc("A.Create_Time");
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getCode()),"A.code",baseParam.getCode());
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getFrontType()),"A.front_type",baseParam.getFrontType()) ;
queryWrapper.orderByDesc("A.update_Time");
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")?"设备":"监测点");
if(Objects.equals(temp.getLevel(),"terminal")){
temp.setLevel("设备");
}else if(Objects.equals(temp.getLevel(),"measurepoint")){
temp.setLevel("监测点");
}else if(Objects.equals(temp.getLevel(),"process")){
temp.setLevel("进程");
}else {
temp.setLevel("/");
}
temp.setFrontType(getFrontType(temp.getFrontType()));
});
return page;
}
@Override
public Page<PqFrontLogsChild> queryLogCHild(PqFrontLogsChildParam baseParam) {
Page<PqFrontLogsChild> page = new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam));
QueryWrapper<PqFrontLogsChild> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PqFrontLogsChild::getMainId,baseParam.getMainId())
.between(PqFrontLogsChild::getCreateTime,baseParam.getSearchBeginTime()+" 00:00:00", baseParam.getSearchEndTime()+" 23:59:59")
.like(PqFrontLogsChild::getLog,baseParam.getSearchValue()).orderByDesc(PqFrontLogsChild::getCreateTime);
Page<PqFrontLogsChild> page1 = pqFrontLogsChildService.page(page, queryWrapper);
return page1;
}
public String getFrontType(String frontType){
// //前置类型stat稳态/recall补招/realTime实时/comtrade
switch (frontType) {

54
pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/FrontLogsCleanTaskRunner.java Normal file
View File

@@ -0,0 +1,54 @@
package com.njcn.system.timer.tasks;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.njcn.dataProcess.api.DataRecallFeignClient;
import com.njcn.message.message.RecallMessage;
import com.njcn.system.pojo.po.PqFrontLogs;
import com.njcn.system.pojo.po.PqFrontLogsChild;
import com.njcn.system.service.PqFrontLogsChildService;
import com.njcn.system.service.PqFrontLogsService;
import com.njcn.system.timer.TimerTaskRunner;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
/**
* 类的介绍：装置算法执行链定时任务
*
* @author xuyang
* @version 1.0.0
* @createTime 2023/12/6 9:35
*/
@Component
@RequiredArgsConstructor
public class FrontLogsCleanTaskRunner implements TimerTaskRunner {
private final PqFrontLogsChildService pqFrontLogsChildService;
private final PqFrontLogsService pqFrontLogsService;
@Override
public void action(String date) {
//主表清60d的之前的数据，子表清7天之前的数据
QueryWrapper<PqFrontLogsChild> queryWrapper = new QueryWrapper<>();
QueryWrapper<PqFrontLogs> pqFrontLogsQueryWrapper = new QueryWrapper<>();
LocalDate calDate;
if(StrUtil.isBlank(date)){
calDate = LocalDate.parse(date, DatePattern.NORM_DATE_FORMATTER);
}else {
calDate =LocalDate.now();
}
queryWrapper.lambda().lt(PqFrontLogsChild::getCreateTime,calDate.minusDays(7).atTime(0,0,0));
pqFrontLogsChildService.getBaseMapper().delete(queryWrapper);
pqFrontLogsQueryWrapper.lambda().lt(PqFrontLogs::getUpdateTime,calDate.minusDays(60).atTime(0,0,0));
pqFrontLogsService.getBaseMapper().delete(pqFrontLogsQueryWrapper);
}
}