模拟数据生成

This commit is contained in:
guoshengxiong 2025-05-28 09:57:12 +08:00
parent 735d67c44e
commit 4a1f52465c
8 changed files with 193 additions and 8 deletions

View File

@ -1,18 +1,15 @@
package com.zhgd.xmgl.modules.quality.controller;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto;
import com.zhgd.xmgl.modules.quality.entity.vo.*;
import com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordVo;
import com.zhgd.xmgl.modules.quality.entity.vo.RecordVo;
import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto;
import com.zhgd.xmgl.modules.xz.security.entity.vo.*;
import com.zhgd.xmgl.util.MessageUtil;
@ -27,8 +24,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -431,6 +426,13 @@ public class QualityInspectionRecordController {
return Result.success(qualityInspectionRecordService.riskChart(map));
}
@ApiOperation(value = "补录质量检查记录信息", notes = "补录质量检查记录信息", httpMethod = "POST")
@PostMapping(value = "/backAdd")
public Result backAdd(@RequestBody QualityInspectionRecord qualityInspectionRecord) {
qualityInspectionRecordService.backAdd(qualityInspectionRecord);
return Result.ok();
}
}

View File

@ -255,4 +255,36 @@ public class QualityInspectionRecord implements Serializable {
private String subentryName;
@TableField(exist = false)
@ApiModelProperty(value = "整改人整改时间")
private String zgRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "整改人附件")
private String zgFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "整改人补充说明")
private String zgAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "复查人整改时间")
private String fcRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "复查人附件")
private String fcFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "复查人补充说明")
private String fcAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "核验人整改时间")
private String hyRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "核验人附件")
private String hyFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "核验人补充说明")
private String hyAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "违章人员")
private Long violatorId;
}

View File

@ -271,4 +271,5 @@ public interface IQualityInspectionRecordService extends IService<QualityInspect
*/
List<XzSecurityQualityInspectionRecordTotalVo> riskChart(Map<String, Object> map);
void backAdd(QualityInspectionRecord qualityInspectionRecord);
}

View File

@ -45,10 +45,12 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord;
import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto;
import com.zhgd.xmgl.modules.xz.security.entity.vo.*;
import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityInspectionRecordMapper;
import com.zhgd.xmgl.push.config.PushPayloads;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
@ -662,6 +664,59 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
return rsList;
}
@Override
public void backAdd(QualityInspectionRecord record) {
SimpleDateFormat df = new SimpleDateFormat(Cts.YYYY_MM_DD_HH_MM_SS);
if (StrUtil.isBlank(record.getCreateTime())) {
record.setCreateTime(df.format(new Date()));
}
record.setChangeLimitTime(DateUtil.formatDateTime(DateUtil.parse(record.getChangeLimitTime())));
String enterpriseSn = record.getEnterpriseSn();
if (StrUtil.isNotBlank(enterpriseSn)) {
EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
.eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
record.setEnterpriseId(enterpriseInfo.getId());
}
qualityInspectionRecordMapper.insert(record);
Long userId = SecurityUtils.getUser().getUserId();
QualityRectifyRecord zg = new QualityRectifyRecord();
zg.setQualityId(record.getId());
zg.setType(1);
zg.setStatus(2);
zg.setRectifyTime(record.getZgRectifyTime());
zg.setFileUrl(record.getZgFileUrl());
zg.setAdditionalRemarks(record.getZgAdditionalRemarks());
zg.setCreateTime(record.getZgRectifyTime());
zg.setCreateUser(userId);
zg.setViolatorId(record.getViolatorId());
qualityRectifyRecordMapper.insert(zg);
QualityRectifyRecord fc = new QualityRectifyRecord();
fc.setQualityId(record.getId());
fc.setType(2);
fc.setStatus(2);
fc.setRectifyTime(record.getFcRectifyTime());
fc.setFileUrl(record.getFcFileUrl());
fc.setAdditionalRemarks(record.getFcAdditionalRemarks());
fc.setCreateTime(record.getFcRectifyTime());
fc.setCreateUser(userId);
fc.setViolatorId(record.getViolatorId());
qualityRectifyRecordMapper.insert(fc);
QualityRectifyRecord hy = new QualityRectifyRecord();
hy.setQualityId(record.getId());
hy.setType(3);
hy.setStatus(2);
hy.setRectifyTime(record.getHyRectifyTime());
hy.setFileUrl(record.getHyFileUrl());
hy.setAdditionalRemarks(record.getHyAdditionalRemarks());
hy.setCreateTime(record.getHyRectifyTime());
hy.setCreateUser(userId);
hy.setViolatorId(record.getViolatorId());
qualityRectifyRecordMapper.insert(hy);
}
@Override
public Page<StatsByChangeIdVo> statsByChangeId(Map<String, Object> paramMap) {
Page page = PageUtil.getPage(paramMap);

View File

@ -513,9 +513,17 @@ public class XzSecurityQualityInspectionRecordController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
})
@PostMapping( "/specialPage")
@PostMapping("/specialPage")
public Result<Page<XzSecurityQualityInspectionRecordVo>> querySpecialPage(@RequestBody Map<String, Object> map) {
return Result.success(qualityInspectionRecordService.querySpecialPage(map));
}
@OperLog(operModul = "安全管理", operType = "补录安全检查记录信息", operDesc = "补录安全检查记录信息")
@ApiOperation(value = "补录安全检查记录信息", notes = "补录安全检查记录信息", httpMethod = "POST")
@PostMapping(value = "/backAdd")
public Result backAdd(@RequestBody XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord) {
qualityInspectionRecordService.backAdd(xzSecurityQualityInspectionRecord);
return Result.ok();
}
}

View File

@ -265,5 +265,35 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
@ApiModelProperty(value = "安全履职预警超时时间(分钟)")
private Integer safeWatchAlarmExceedMinute;
@TableField(exist = false)
@ApiModelProperty(value = "整改人整改时间")
private String zgRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "整改人附件")
private String zgFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "整改人补充说明")
private String zgAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "复查人整改时间")
private String fcRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "复查人附件")
private String fcFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "复查人补充说明")
private String fcAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "核验人整改时间")
private String hyRectifyTime;
@TableField(exist = false)
@ApiModelProperty(value = "核验人附件")
private String hyFileUrl;
@TableField(exist = false)
@ApiModelProperty(value = "核验人补充说明")
private String hyAdditionalRemarks;
@TableField(exist = false)
@ApiModelProperty(value = "违章人员")
private Long violatorId;
}

View File

@ -312,4 +312,6 @@ public interface IXzSecurityQualityInspectionRecordService extends IService<XzSe
* @return
*/
Page<XzSecurityQualityInspectionRecordVo> querySpecialPage(Map<String, Object> map);
void backAdd(XzSecurityQualityInspectionRecord xzSecurityQualityInspectionRecord);
}

View File

@ -64,6 +64,7 @@ import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRec
import com.zhgd.xmgl.modules.xz.service.IXzWorkerSafeWatchConfigService;
import com.zhgd.xmgl.modules.xz.special.service.CountApiService;
import com.zhgd.xmgl.push.config.PushPayloads;
import com.zhgd.xmgl.security.util.SecurityUtils;
import com.zhgd.xmgl.util.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@ -950,6 +951,60 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
return baseMapper.querySpecialPage(map, PageUtil.getPage(map));
}
@Override
public void backAdd(XzSecurityQualityInspectionRecord record) {
SimpleDateFormat df = new SimpleDateFormat(Cts.YYYY_MM_DD_HH_MM_SS);
if (StrUtil.isBlank(record.getCreateTime())) {
record.setCreateTime(df.format(new Date()));
}
record.setChangeLimitTime(DateUtil.formatDateTime(DateUtil.parse(record.getChangeLimitTime())));
String enterpriseSn = record.getEnterpriseSn();
if (StrUtil.isNotBlank(enterpriseSn)) {
EnterpriseInfo enterpriseInfo = enterpriseInfoMapper.selectOne(new LambdaQueryWrapper<EnterpriseInfo>()
.eq(EnterpriseInfo::getEnterpriseSn, enterpriseSn));
record.setEnterpriseId(enterpriseInfo.getId());
}
xzSecurityQualityInspectionRecordMapper.insert(record);
Long userId = SecurityUtils.getUser().getUserId();
XzSecurityQualityRectifyRecord zg = new XzSecurityQualityRectifyRecord();
zg.setQualityId(record.getId());
zg.setType(1);
zg.setStatus(2);
zg.setRectifyTime(record.getZgRectifyTime());
zg.setFileUrl(record.getZgFileUrl());
zg.setAdditionalRemarks(record.getZgAdditionalRemarks());
zg.setCreateTime(record.getZgRectifyTime());
zg.setCreateUser(userId);
zg.setViolatorId(record.getViolatorId());
xzSecurityQualityRectifyRecordMapper.insert(zg);
XzSecurityQualityRectifyRecord fc = new XzSecurityQualityRectifyRecord();
fc.setQualityId(record.getId());
fc.setType(2);
fc.setStatus(2);
fc.setRectifyTime(record.getFcRectifyTime());
fc.setFileUrl(record.getFcFileUrl());
fc.setAdditionalRemarks(record.getFcAdditionalRemarks());
fc.setCreateTime(record.getFcRectifyTime());
fc.setCreateUser(userId);
fc.setViolatorId(record.getViolatorId());
xzSecurityQualityRectifyRecordMapper.insert(fc);
XzSecurityQualityRectifyRecord hy = new XzSecurityQualityRectifyRecord();
hy.setQualityId(record.getId());
hy.setType(3);
hy.setStatus(2);
hy.setRectifyTime(record.getHyRectifyTime());
hy.setFileUrl(record.getHyFileUrl());
hy.setAdditionalRemarks(record.getHyAdditionalRemarks());
hy.setCreateTime(record.getHyRectifyTime());
hy.setCreateUser(userId);
hy.setViolatorId(record.getViolatorId());
xzSecurityQualityRectifyRecordMapper.insert(hy);
}
private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) {
if (hiddenDangerInspectRecord.getRecordType() == null || Objects.equals(hiddenDangerInspectRecord.getRecordType(), XzSecurityQualityInspectionRecordRecordTypeEnum.RECORD.getValue())) {
return;