Commit 26aa58e5 authored by lisong's avatar lisong

添加监管数据操作接口

parent 0de7aa58
......@@ -12,8 +12,9 @@ import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.ymt.api.common.CommonException;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentMessageDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgConstructionInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ImageSizeEnums;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
......@@ -544,5 +545,36 @@ public class EquipmentCategoryController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveSupervisoryData")
@ApiOperation(httpMethod = "POST", value = "监管设备数据保存", notes = "监管设备保存")
public ResponseModel<Boolean> saveSupervisoryData(@RequestBody EquipmentMessageDto data) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveSupervisoryData(data));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveConstructionInfoData")
@ApiOperation(httpMethod = "POST", value = "监管设备施工数据保存", notes = "监管设备施工数据保存")
public ResponseModel<Boolean> saveConstructionInfoData(@RequestBody IdxBizJgConstructionInfo data) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveConstructionInfoData(data));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveMaintenanceRecordInfoData")
@ApiOperation(httpMethod = "POST", value = "监管设备维保数据保存", notes = "监管设备维保数据保存")
public ResponseModel<Boolean> saveMaintenanceRecordInfoData(@RequestBody IdxBizJgMaintenanceRecordInfo data) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveMaintenanceRecordInfoData(data));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveDetectionInfoData")
@ApiOperation(httpMethod = "POST", value = "监管设备检验检测数据保存", notes = "监管设备检验检测数据保存")
public ResponseModel<Boolean> saveDetectionInfoData(@RequestBody IdxBizJgInspectionDetectionInfo data) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveDetectionInfoData(data));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/deleteByRecord")
@ApiOperation(httpMethod = "POST", value = "数据异常回滚", notes = "数据异常回滚")
public ResponseModel<Boolean> saveDetectionInfoData(@RequestParam("record") String record) {
return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.deleteByRecord(record));
}
}
package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -9,10 +10,7 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.*;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
......@@ -1879,7 +1877,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
if (!ObjectUtils.isEmpty(esElevator)) {
Double lat = esElevator.getLatitude();
Double lon = esElevator.getLongitude();
esElevator.setLocation(new GeoPoint(lat, lon));
//esElevator.setLocation(new GeoPoint(lat, lon));
esElavtorRepository.save(esElevator);
superviseInfoMapper.updateRecordBatch(recordList);
}
......@@ -2171,4 +2169,230 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
}
return totle;
}
@Transactional
public Boolean saveSupervisoryData(EquipmentMessageDto data) {
if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(data.getSupervisoryCode())) {
return false;
}
Date date = new Date();
String supervisoryCode = data.getSupervisoryCode();
Integer saveStatus = data.getSaveStatus();
Integer alias = 0;
// 使用信息
if (!ObjectUtils.isEmpty(data.getUseInfo())) {
IdxBizJgUseInfo useInfo = data.getUseInfo();
useInfo.setRecDate(date);
if (saveStatus == 1) {
useInfo.setRecord(supervisoryCode);
useInfo.setClaimDate(date);
useInfo.setCreateDate(date);
useInfo.setDataSource("1");
idxBizJgUseInfoService.save(useInfo);
} else {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, supervisoryCode);
idxBizJgUseInfoService.update(data.getUseInfo(), lambda);
}
}
// 设计信息
if (!ObjectUtils.isEmpty(data.getDesignInfo())) {
IdxBizJgDesignInfo designInfo = data.getDesignInfo();
designInfo.setRecDate(date);
if (saveStatus == 1) {
designInfo.setRecord(supervisoryCode);
idxBizJgDesignInfoService.save(designInfo);
} else {
LambdaQueryWrapper<IdxBizJgDesignInfo> lambda = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambda.eq(IdxBizJgDesignInfo::getRecord, supervisoryCode);
idxBizJgDesignInfoService.update(designInfo, lambda);
}
}
// 制造信息
if (!ObjectUtils.isEmpty(data.getFactoryInfo())) {
IdxBizJgFactoryInfo factoryInfo = data.getFactoryInfo();
factoryInfo.setRecDate(date);
if (saveStatus == 1) {
factoryInfo.setRecord(supervisoryCode);
idxBizJgFactoryInfoService.save(factoryInfo);
} else {
LambdaQueryWrapper<IdxBizJgFactoryInfo> lambda = new QueryWrapper<IdxBizJgFactoryInfo>().lambda();
lambda.eq(IdxBizJgFactoryInfo::getRecord, supervisoryCode);
idxBizJgFactoryInfoService.update(factoryInfo, lambda);
}
}
// 注册登记
if (!ObjectUtils.isEmpty(data.getRegisterInfo())) {
IdxBizJgRegisterInfo registerInfo = data.getRegisterInfo();
registerInfo.setRecDate(date);
if (saveStatus == 1) {
registerInfo.setRecord(supervisoryCode);
alias = Integer.parseInt(String.valueOf(registerInfo.getEquList()));
registerInfo.setEquList("3000");
idxBizJgRegisterInfoService.save(registerInfo);
} else {
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambda = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambda.eq(IdxBizJgRegisterInfo::getRecord, supervisoryCode);
idxBizJgRegisterInfoService.update(registerInfo, lambda);
}
}
// // 维保信息
// if (!ObjectUtils.isEmpty(data.getMaintenanceRecordInfo())) {
// IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = data.getMaintenanceRecordInfo();
// maintenanceRecordInfo.setRecDate(date);
// if (saveStatus == 1) {
// maintenanceRecordInfo.setRecord(supervisoryCode);
// idxBizJgMaintenanceRecordInfoService.save(maintenanceRecordInfo);
// } else {
// LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo> lambda = new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().lambda();
// lambda.eq(IdxBizJgMaintenanceRecordInfo::getRecord, supervisoryCode);
// idxBizJgMaintenanceRecordInfoService.update(maintenanceRecordInfo, lambda);
// }
// }
// 其他信息
if (!ObjectUtils.isEmpty(data.getOtherInfo())) {
IdxBizJgOtherInfo otherInfo = data.getOtherInfo();
otherInfo.setRecDate(date);
if (saveStatus == 1) {
otherInfo.setRecord(supervisoryCode);
otherInfo.setClaimStatus("已认领");
otherInfo.setAlias(alias);
idxBizJgOtherInfoService.save(otherInfo);
} else {
LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambda.eq(IdxBizJgOtherInfo::getRecord, supervisoryCode);
idxBizJgOtherInfoService.update(otherInfo, lambda);
}
}
// 监管信息
if (!ObjectUtils.isEmpty(data.getSupervisionInfo())) {
IdxBizJgSupervisionInfo supervisionInfo = data.getSupervisionInfo();
supervisionInfo.setRecDate(date);
if (saveStatus == 1) {
supervisionInfo.setRecord(supervisoryCode);
idxBizJgSupervisionInfoService.save(supervisionInfo);
} else {
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambda = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambda.eq(IdxBizJgSupervisionInfo::getRecord, supervisoryCode);
idxBizJgSupervisionInfoService.update(supervisionInfo, lambda);
}
}
// 参数信息
if (!ObjectUtils.isEmpty(data.getParams())) {
Map<String, Object> params = data.getParams();
IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = new IdxBizJgTechParamsElevator();
BeanUtil.copyProperties(params, idxBizJgTechParamsElevator);
idxBizJgTechParamsElevator.setRecDate(date);
if (saveStatus == 1) {
idxBizJgTechParamsElevator.setRecord(supervisoryCode);
idxBizJgTechParamsElevatorService.save(idxBizJgTechParamsElevator);
} else {
LambdaQueryWrapper<IdxBizJgTechParamsElevator> lambda = new QueryWrapper<IdxBizJgTechParamsElevator>().lambda();
lambda.eq(IdxBizJgTechParamsElevator::getRecord, supervisoryCode);
idxBizJgTechParamsElevatorService.update(idxBizJgTechParamsElevator, lambda);
}
}
checkEsData(supervisoryCode);
return true;
}
@Transactional
public Boolean saveConstructionInfoData(IdxBizJgConstructionInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgConstructionInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgConstructionInfoService.save(data);
}
}else {
return false;
}
return true;
}
@Transactional
public Boolean saveMaintenanceRecordInfoData(IdxBizJgMaintenanceRecordInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgMaintenanceRecordInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgMaintenanceRecordInfoService.save(data);
}
}else {
return false;
}
return true;
}
@Transactional
public Boolean saveDetectionInfoData(IdxBizJgInspectionDetectionInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgInspectionDetectionInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgInspectionDetectionInfoService.save(data);
}
}else {
return false;
}
return true;
}
public Boolean deleteByRecord(String record) {
if (!ObjectUtils.isEmpty(record)){
// 使用信息删除
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, record);
idxBizJgUseInfoService.getBaseMapper().delete(lambda);
// 设计信息删除
LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, record);
idxBizJgDesignInfoService.getBaseMapper().delete(lambdaDes);
// 制造信息删除
LambdaQueryWrapper<IdxBizJgFactoryInfo> lambdaFac = new QueryWrapper<IdxBizJgFactoryInfo>().lambda();
lambdaFac.eq(IdxBizJgFactoryInfo::getRecord, record);
idxBizJgFactoryInfoService.getBaseMapper().delete(lambdaFac);
// 施工信息删除
LambdaQueryWrapper<IdxBizJgConstructionInfo> lambdaCon = new QueryWrapper<IdxBizJgConstructionInfo>().lambda();
lambdaCon.eq(IdxBizJgConstructionInfo::getRecord, record);
idxBizJgConstructionInfoService.getBaseMapper().delete(lambdaCon);
// 注册信息删除
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
idxBizJgRegisterInfoService.getBaseMapper().delete(lambdaReg);
// 维保信息删除
LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo> lambdaMain = new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().lambda();
lambdaMain.eq(IdxBizJgMaintenanceRecordInfo::getRecord, record);
idxBizJgMaintenanceRecordInfoService.getBaseMapper().delete(lambdaMain);
// 监督信息删除
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, record);
idxBizJgSupervisionInfoService.getBaseMapper().delete(lambdaSup);
// 其他信息删除
LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
idxBizJgOtherInfoService.getBaseMapper().delete(lambdaOth);
// 检验检测信息删除
LambdaQueryWrapper<IdxBizJgInspectionDetectionInfo> lambdaIns = new QueryWrapper<IdxBizJgInspectionDetectionInfo>().lambda();
lambdaIns.eq(IdxBizJgInspectionDetectionInfo::getRecord, record);
idxBizJgInspectionDetectionInfoService.getBaseMapper().delete(lambdaIns);
// 参数删除
LambdaQueryWrapper<IdxBizJgTechParamsElevator> lambdaPar = new QueryWrapper<IdxBizJgTechParamsElevator>().lambda();
lambdaPar.eq(IdxBizJgTechParamsElevator::getRecord, record);
idxBizJgTechParamsElevatorService.getBaseMapper().delete(lambdaPar);
}else {
return false;
}
return true;
}
}
\ No newline at end of file
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