Commit ab3bc547 authored by 鲁鸿波's avatar 鲁鸿波

添加条件确认监测日志

parent 388d17e6
......@@ -2,6 +2,7 @@ package com.testor.module.hazard.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.testor.biz.file.controller.SysFileController;
import com.testor.common.util.DateUtil;
import com.testor.module.hazard.dao.THazardConditionConfirmationDao;
import com.testor.module.hazard.model.domain.*;
......@@ -18,6 +19,8 @@ import com.tongtech.tfw.workflow.service.dto.ProcessInsStartResult;
import com.xxl.job.core.handler.annotation.XxlJob;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import com.tongtech.tfw.backend.common.models.supers.SuperServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -46,10 +49,14 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
@Autowired
private THazardConditionConfirmationRecordService tHazardConditionConfirmationRecordService;
private static final Logger log = LoggerFactory.getLogger(THazardConditionConfirmationServiceImpl.class);
@Override
@Transactional(rollbackFor = Exception.class)
public THazardConditionConfirmation saveOrUpdateEntity(THazardConditionConfirmationDTO tHazardConditionConfirmationDTO) {
THazardConditionConfirmation tHazardConditionConfirmation = BeanHelper.beanToBean(tHazardConditionConfirmationDTO, THazardConditionConfirmation.class);
log.info("保存或更新安全条件确认参数数据:{}", tHazardConditionConfirmation);
String id = tHazardConditionConfirmationDTO.getId();
// 查询条件包装器
......@@ -57,16 +64,22 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
.eq(THazardConditionConfirmation::getPlanId, tHazardConditionConfirmationDTO.getPlanId())
.eq(THazardConditionConfirmation::getWorkTypeId, tHazardConditionConfirmationDTO.getWorkTypeId())
.orderByDesc(THazardConditionConfirmation::getBatch);
log.info("tHazardConditionConfirmationLambdaQueryWrapper参数:{}", tHazardConditionConfirmationLambdaQueryWrapper);
log.info("saveOrUpdateEntity之id值:{}", id);
// 如果是新增操作
if (StringUtils.isBlank(id)) {
// 查询最大批次的记录
List<THazardConditionConfirmation> hazardConditionConfirmations = this.list(tHazardConditionConfirmationLambdaQueryWrapper);
log.info("saveOrUpdateEntity之最大批次的记录:{}", hazardConditionConfirmations);
if (!CollectionUtils.isEmpty(hazardConditionConfirmations)) {
THazardConditionConfirmation hazardConditionConfirmation = hazardConditionConfirmations.get(0);
Date createDate = hazardConditionConfirmation.getCreateDate();
LocalDateTime createDatelocalDateTime = DateUtil.dateToLocalDateTime(createDate);
log.info("saveOrUpdateEntity之最大批次的记录创建时间:{}", createDatelocalDateTime);
log.info("saveOrUpdateEntity之当前时间:{}", LocalDateTime.now());
// 如果当前时间在最大批次的创建时间之后,增加批次
if (DateUtil.notSameDayAndAfter(LocalDateTime.now(), createDatelocalDateTime)) {
tHazardConditionConfirmation.setBatch(hazardConditionConfirmation.getBatch() + 1);
......@@ -77,8 +90,10 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
}else {
// 如果是更新操作,检查同一批次是否已有其他记录
THazardConditionConfirmation existingEntity = this.getById(id);
log.info("saveOrUpdateEntity之更新操作参数数据:{}", existingEntity);
if (existingEntity != null) {
Integer batch = existingEntity.getBatch();
log.info("saveOrUpdateEntity之批次:{}", batch);
// 检查是否有同一批次但不同ID的记录
tHazardConditionConfirmationLambdaQueryWrapper.ne(THazardConditionConfirmation::getId, tHazardConditionConfirmationDTO.getId())
.eq(THazardConditionConfirmation::getBatch, batch);
......@@ -88,6 +103,7 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
}
}
log.info("保存或更新tHazardConditionConfirmation:{}", tHazardConditionConfirmation);
// 保存或更新
this.saveOrUpdate(tHazardConditionConfirmation);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment