Skip to content

H
hzsomms
Commit f5869112 authored by 史志龙's avatar 史志龙
Browse files
Options

道床、线路巡查分析功能接口提交--shizhilong

parent 06f6e60d
Show whitespace changes
Inline Side-by-side
Showing with 489 additions and 15 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/algorithm/AnalysisAlgorithmLine.java
View file @ f5869112
......@@ -7,12 +7,15 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.checkData.entity.*;
import org.jeecg.modules.checkData.service.*;
import org.jeecg.modules.deviceAsset.entity.TrackBedManagement;
import org.jeecg.modules.deviceAsset.service.ITrackBedManagementService;
import org.jeecg.modules.diseaseAnalysis.entity.*;
import org.jeecg.modules.diseaseAnalysis.service.*;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.AnalysisAlgorithmMapper;
import org.jeecg.modules.utils.BeanCopyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.math.BigDecimal;
......@@ -40,17 +43,36 @@ public class AnalysisAlgorithmLine {
@Resource
private IAnalysisLineBatchUnitDeviceCorrugationInfoService analysisLineBatchUnitDeviceCorrugationInfoService;
@Resource
private IAnalysisLineBatchUnitDeviceTrackBedInfoService analysisLineBatchUnitDeviceTrackBedInfoService;
@Resource
private IAnalysisLineBatchUnitDevicePatrolInfoService analysisLineBatchUnitDevicePatrolInfoService;
@Resource
private IAnalysisLineBatchUnitDevicePatrolAssistInfoService analysisLineBatchUnitDevicePatrolAssistInfoService;
//分析部分
//***************************************************************************************************************
//检查部分
@Resource
private IRecordsMasterTurnoutInfoService turnoutInfoService;
@Resource
private IRailWearRecordService railWearRecordService;
@Resource
private ICorrugationRecordService corrugationRecordService;
@Resource
private ITrackBedManagementCheckService trackBedManagementCheckService;
@Resource
private IRecordPatrolMasterService recordPatrolMasterService;
@Resource
private IRecordPatrolMasterInfoService recordPatrolMasterInfoService;
@Resource
private IRecordPatrolMasterAssistService recordPatrolMasterAssistService;
@Resource
private ICurveWearRecordService curveWearRecordService;
@Resource
private IAnalysisLineBatchUnitDeviceService unitDeviceService;
@Resource
private IRecordsMasterCheckService masterCheckService;
@Resource
private ITrackBedManagementService trackBedManagementService;
@Transactional
public void analysisLine(String analysisLineBatchId) {
......@@ -102,21 +124,108 @@ public class AnalysisAlgorithmLine {
wrapper3.eq(AnalysisLineBatchUnitDeviceCorrugationInfo::getAnalysisBatchId, analysisLineBatch.getId());
analysisLineBatchUnitDeviceCorrugationInfoService.remove(wrapper3);
corrugationInfoCheckDataAnalysis(analysisLineBatch, checkDataMap, unitDeviceList);
} else if ("5" == checkDataMap.getEkType()) {
//5-道床检查
//原来道床检查单元信息详情删除
LambdaQueryWrapper<AnalysisLineBatchUnitDeviceTrackBedInfo> wrapper3 = Wrappers.lambdaQuery();
wrapper3.eq(AnalysisLineBatchUnitDeviceTrackBedInfo::getAnalysisBatchId, analysisLineBatch.getId());
analysisLineBatchUnitDeviceTrackBedInfoService.remove(wrapper3);
trackBedInfoCheckDataAnalysis(analysisLineBatch, checkDataMap);
} else {
//6-线路检查
//原来线路巡查-巡道员检查单元信息详情删除
LambdaQueryWrapper<AnalysisLineBatchUnitDevicePatrolInfo> wrapper3 = Wrappers.lambdaQuery();
wrapper3.eq(AnalysisLineBatchUnitDevicePatrolInfo::getAnalysisBatchId, analysisLineBatch.getId());
analysisLineBatchUnitDevicePatrolInfoService.remove(wrapper3);
//原来线路巡查-协助巡道员检查单元信息详情删除
LambdaQueryWrapper<AnalysisLineBatchUnitDevicePatrolAssistInfo> wrapper4 = Wrappers.lambdaQuery();
wrapper4.eq(AnalysisLineBatchUnitDevicePatrolAssistInfo::getAnalysisBatchId, analysisLineBatch.getId());
analysisLineBatchUnitDevicePatrolAssistInfoService.remove(wrapper4);
patrolInfoCheckDataAnalysis(analysisLineBatch, checkDataMap);
}
// else if ("5" == checkDataMap.getEkType()) {
// //5-道床检查
//
// } else {
// //6-线路检查
// }
}
// 分析完成ine
analysisLineBatchService.lambdaUpdate().set(AnalysisLineBatch::getAnalysisStatus, 99).eq(AnalysisLineBatch::getId, analysisLineBatchId).update();
analysisLineBatchCheckDataMapService.lambdaUpdate().set(AnalysisLineBatchCheckDataMap::getAnalysisStatus, 99).eq(AnalysisLineBatchCheckDataMap::getAnalysisBatchId, analysisLineBatchId).update();
log.info("[分析完成]|线程id:【" + Thread.currentThread().getId() + "】=============分析批次ID:【" + analysisLineBatchId + "】");
}
/**
* 病害分析->线路巡查病害分析批次数据、检查批次
*/
public void patrolInfoCheckDataAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap) {
//初始化单元表
List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
//初始化巡道员检查记录详情
List<AnalysisLineBatchUnitDevicePatrolInfo> unitInfoList = new ArrayList<>();
//初始化协助巡道员检查记录详情
List<AnalysisLineBatchUnitDevicePatrolAssistInfo> unitAssistInfoList = new ArrayList<>();
//获取巡道员检查记录详情
List<RecordPatrolMasterInfo> ekIfoList = recordPatrolMasterInfoService.lambdaQuery().eq(RecordPatrolMasterInfo::getRecordMasterId, checkDataMap.getEkId()).eq(RecordPatrolMasterInfo::getDelFlag, "0")
.list();
//获取协助巡道员检查记录详情
List<RecordPatrolMasterAssist> ekAssistIfoList = recordPatrolMasterAssistService.lambdaQuery().eq(RecordPatrolMasterAssist::getRecordMasterId, checkDataMap.getEkId()).eq(RecordPatrolMasterAssist::getDelFlag, "0")
.list();
if (checkDataMap != null) {
//保存单元信息
String deviceId = savePatrolUnit(analysisLineBatch, checkDataMap, unitList, ekIfoList);
if (CollectionUtils.isNotEmpty(ekIfoList)) {
ekIfoList.forEach(model -> {
//组装分析巡道员检查记录信息详情
savePatrolInfoRecordUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
});
}
if (CollectionUtils.isNotEmpty(ekAssistIfoList)) {
ekAssistIfoList.forEach(model -> {
//组装分析协助巡道员检查记录信息详情
savePatrolAssistInfoRecordUnitInfo(analysisLineBatch, checkDataMap, unitAssistInfoList, model, deviceId);
});
}
}
if (CollectionUtils.isNotEmpty(unitList)) {
unitDeviceService.saveBatch(unitList);
}
//保存分析巡道员检查记录信息详情
if (CollectionUtils.isNotEmpty(unitInfoList)) {
analysisLineBatchUnitDevicePatrolInfoService.saveBatch(unitInfoList);
}
//保存分析协助巡道员检查记录信息详情
if (CollectionUtils.isNotEmpty(unitAssistInfoList)) {
analysisLineBatchUnitDevicePatrolAssistInfoService.saveBatch(unitAssistInfoList);
}
}
/**
* 病害分析->道床病害分析批次数据、检查批次
*/
public void trackBedInfoCheckDataAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap) {
//初始化单元表
List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
//初始化钢轨波磨病害分析单元表详情
List<AnalysisLineBatchUnitDeviceTrackBedInfo> unitInfoList = new ArrayList<>();
//获取检查记录详情
List<TrackBedManagementCheck> ekList = trackBedManagementCheckService.lambdaQuery().eq(TrackBedManagementCheck::getRecordsMasterCheckId, checkDataMap.getEkId()).eq(TrackBedManagementCheck::getDelFlag, "0")
.list();
if (checkDataMap != null) {
//保存单元信息
String deviceId = saveTrackBedUnit(analysisLineBatch, checkDataMap, unitList);
if (CollectionUtils.isNotEmpty(ekList)) {
ekList.forEach(model -> {
//保存道床单元信息详情
saveTrackBedRecordUnitInfo(analysisLineBatch, checkDataMap, unitInfoList, model, deviceId);
});
}
}
if (CollectionUtils.isNotEmpty(unitList)) {
unitDeviceService.saveBatch(unitList);
}
if (CollectionUtils.isNotEmpty(unitInfoList)) {
analysisLineBatchUnitDeviceTrackBedInfoService.saveBatch(unitInfoList);
}
}
/**
* 病害分析->钢轨波磨病害分析批次数据、检查批次、1-钢轨,2-曲线,3-竖曲线,4-道岔
*/
......@@ -161,6 +270,10 @@ public class AnalysisAlgorithmLine {
*/
public void curveWearInfoCheckDataAnalysis(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<Map<String, Object>> unitDeviceList) {
//刷选出曲线和竖曲线的设备
unitDeviceList = unitDeviceList.stream().filter
(map -> "2".equals(map.get("type").toString()) || "3".equals(map.get("type").toString())).collect(Collectors.toList());
//初始化单元表
List<AnalysisLineBatchUnitDevice> unitList = new ArrayList<>();
//初始化曲线钢轨磨耗病害分析单元表详情
......@@ -276,6 +389,72 @@ public class AnalysisAlgorithmLine {
}
//*********************************单元表维护公共方法封装******************************************************************
/**
* 线路单元
*
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
* @param unitList 最终封装到的集合
*/
public String savePatrolUnit(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<AnalysisLineBatchUnitDevice> unitList,List<RecordPatrolMasterInfo> ekIfoList) {
//维护单元表
AnalysisLineBatchUnitDevice unit = new AnalysisLineBatchUnitDevice();
unit.setId(UUIDGenerator.generate());
unit.setAnalysisBatchId(analysisLineBatch.getId());
unit.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unit.setEkCode(checkDataMap.getEkCode());
unit.setEkId(checkDataMap.getEkId());
unit.setUnitStartMileage(checkDataMap.getStartingMileage());
unit.setUnitEndMileage(checkDataMap.getEndMileage());
unit.setWorkStatus(1);
//线路巡查主表
RecordPatrolMaster recordPatrolMaster = recordPatrolMasterService.getById(checkDataMap.getEkId());
if (recordPatrolMaster != null) {
unit.setRemark(recordPatrolMaster.getRemark());
}
//检查结果
ekIfoList = ekIfoList.stream().filter
(map -> "1".equals(map.getStatus())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(ekIfoList)){
unit.setCheckStatus(2);
unit.setMarkStatus(2);
}else {
unit.setCheckStatus(1);
unit.setMarkStatus(3);
}
unitList.add(unit);
return unit.getId();
}
/**
* 道床单元
*
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
* @param unitList 最终封装到的集合
*/
public String saveTrackBedUnit(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<AnalysisLineBatchUnitDevice> unitList) {
//维护单元表
AnalysisLineBatchUnitDevice unit = new AnalysisLineBatchUnitDevice();
unit.setId(UUIDGenerator.generate());
unit.setAnalysisBatchId(analysisLineBatch.getId());
unit.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unit.setEkCode(checkDataMap.getEkCode());
unit.setEkId(checkDataMap.getEkId());
unit.setUnitStartMileage(checkDataMap.getStartingMileage());
unit.setUnitEndMileage(checkDataMap.getEndMileage());
unit.setWorkStatus(1);
unit.setMarkStatus(1);
unit.setRemark(analysisLineBatch.getRemark());
unitList.add(unit);
return unit.getId();
}
/**
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
......@@ -331,6 +510,7 @@ public class AnalysisAlgorithmLine {
unitInfo.setEkId(checkDataMap.getEkId());
unitInfo.setGaugeCode(masterCheckService.getById(checkDataMap.getEkId()).getGaugeCode());
unitInfo.setType(info.getType());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
......@@ -355,6 +535,7 @@ public class AnalysisAlgorithmLine {
unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unitInfo.setEkCode(checkDataMap.getEkCode());
unitInfo.setEkId(checkDataMap.getEkId());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
......@@ -382,6 +563,7 @@ public class AnalysisAlgorithmLine {
unitInfo.setDeviceProjectId(info.getCurveId());
unitInfo.setDeviceProjectCode(info.getCurveCode());
unitInfo.setDeviceProjectType(info.getProjectType());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
......@@ -406,6 +588,88 @@ public class AnalysisAlgorithmLine {
unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unitInfo.setEkCode(checkDataMap.getEkCode());
unitInfo.setEkId(checkDataMap.getEkId());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
/**
* 道床病害分析单元详情维护
*
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
* @param unitInfoList 最终封装到的集合
* @param info 检查记录详情
* @param deviceId 单元表id
*/
public void saveTrackBedRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<AnalysisLineBatchUnitDeviceTrackBedInfo> unitInfoList, TrackBedManagementCheck info, String deviceId) {
//维护单元详情表
AnalysisLineBatchUnitDeviceTrackBedInfo unitInfo = new AnalysisLineBatchUnitDeviceTrackBedInfo();
BeanCopyUtil.copyProperties(info, unitInfo);
unitInfo.setId(UUIDGenerator.generate());
unitInfo.setDeviceId(deviceId);
unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unitInfo.setEkCode(checkDataMap.getEkCode());
unitInfo.setEkId(checkDataMap.getEkId());
TrackBedManagement trackBedManagement = trackBedManagementService.getById(info.getTrakBedManagementId());
unitInfo.setTrackBedId(trackBedManagement.getId());
unitInfo.setTrackBedCode(trackBedManagement.getTrackBedCode());
unitInfo.setTrackBedType(trackBedManagement.getTrackBedType());
unitInfo.setStartingMileage(trackBedManagement.getStartingMileage());
unitInfo.setEndMileage(trackBedManagement.getEndMileage());
unitInfo.setTrackBedLen(trackBedManagement.getTrackBedLen());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
/**
* 线路巡查病害分析巡道员巡查单元详情维护
*
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
* @param unitInfoList 最终封装到的集合
* @param info 检查记录详情
* @param deviceId 单元表id
*/
public void savePatrolInfoRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<AnalysisLineBatchUnitDevicePatrolInfo> unitInfoList, RecordPatrolMasterInfo info, String deviceId) {
//维护单元详情表
AnalysisLineBatchUnitDevicePatrolInfo unitInfo = new AnalysisLineBatchUnitDevicePatrolInfo();
BeanCopyUtil.copyProperties(info, unitInfo);
unitInfo.setId(UUIDGenerator.generate());
unitInfo.setDeviceId(deviceId);
unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unitInfo.setEkCode(checkDataMap.getEkCode());
unitInfo.setEkId(checkDataMap.getEkId());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
/**
* 线路巡查病害分析协助巡道员巡查单元详情维护
*
* @param analysisLineBatch 分析主表
* @param checkDataMap 分析表对应的检查表关系表
* @param unitInfoList 最终封装到的集合
* @param info 检查记录详情
* @param deviceId 单元表id
*/
public void savePatrolAssistInfoRecordUnitInfo(AnalysisLineBatch analysisLineBatch, AnalysisLineBatchCheckDataMap
checkDataMap, List<AnalysisLineBatchUnitDevicePatrolAssistInfo> unitInfoList, RecordPatrolMasterAssist info, String deviceId) {
//维护单元详情表
AnalysisLineBatchUnitDevicePatrolAssistInfo unitInfo = new AnalysisLineBatchUnitDevicePatrolAssistInfo();
BeanCopyUtil.copyProperties(info, unitInfo);
unitInfo.setId(UUIDGenerator.generate());
unitInfo.setDeviceId(deviceId);
unitInfo.setAnalysisBatchId(analysisLineBatch.getId());
unitInfo.setAnalysisBatchCode(analysisLineBatch.getAnalysisBatchCode());
unitInfo.setEkCode(checkDataMap.getEkCode());
unitInfo.setEkId(checkDataMap.getEkId());
unitInfo.setDelFlag("0");
unitInfoList.add(unitInfo);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchController.java
View file @ f5869112
......@@ -203,6 +203,54 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId, ekId, deviceId);
return Result.OK(list);
}
/**
* 线路质量分析-其他病害分析-道床单元详情检查记录查询
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
@AutoLog(value = "线路质量分析-其他病害分析-道床单元详情检查记录查询")
@ApiOperation(value = "线路质量分析-其他病害分析-道床单元详情检查记录查询", notes = "线路质量分析-其他病害分析-道床单元详情检查记录查询")
@GetMapping(value = "/getAnalysisLineBatchUnitDeviceTrackBedInfoList")
public Result<List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>> getAnalysisLineBatchUnitDeviceTrackBedInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId, ekId, deviceId);
return Result.OK(list);
}
/**
* 线路质量分析-其他病害分析-线路巡查巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
@AutoLog(value = "线路质量分析-其他病害分析-线路巡查巡道员检查详情")
@ApiOperation(value = "线路质量分析-其他病害分析-线路巡查巡道员检查详情", notes = "线路质量分析-其他病害分析-线路巡查巡道员检查详情")
@GetMapping(value = "/getAnalysisLineBatchUnitDevicePatrolInfoList")
public Result<List<AnalysisLineBatchUnitDevicePatrolInfoVO>> getAnalysisLineBatchUnitDevicePatrolInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
List<AnalysisLineBatchUnitDevicePatrolInfoVO> list = this.service.getAnalysisLineBatchUnitDevicePatrolInfoList(analysisBatchId, ekId, deviceId);
return Result.OK(list);
}
/**
* 线路质量分析-其他病害分析-线路巡查协助巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
@AutoLog(value = "线路质量分析-其他病害分析-线路巡查协助巡道员检查详情")
@ApiOperation(value = "线路质量分析-其他病害分析-线路巡查协助巡道员检查详情", notes = "线路质量分析-其他病害分析-线路巡查协助巡道员检查详情")
@GetMapping(value = "/getAnalysisLineBatchUnitDevicePatrolAssistInfoList")
public Result<List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO>> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> list = this.service.getAnalysisLineBatchUnitDevicePatrolAssistInfoList(analysisBatchId, ekId, deviceId);
return Result.OK(list);
}
//***********************************分析新增编辑接口*************************************************************************************************************
@AutoLog(value = "其他病害分析-分析批次-新增分析批次")
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchUnitDevice.java
View file @ f5869112
......@@ -100,7 +100,7 @@ public class AnalysisLineBatchUnitDevice implements Serializable {
@TableField("work_status")
private Integer workStatus;
@ApiModelProperty("标记状态(1:未标记，1：异常，2：正常)")
@ApiModelProperty("标记状态(1:未标记，2：异常，3：正常)")
@TableField("mark_status")
private Integer markStatus;
......@@ -108,7 +108,7 @@ public class AnalysisLineBatchUnitDevice implements Serializable {
@TableField("check_status")
private Integer checkStatus;
@ApiModelProperty("备注")
@ApiModelProperty("备注(同时兼容巡道员备忘录)")
@TableField("remark")
private String remark;
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchMapper.java
View file @ f5869112
......@@ -102,5 +102,32 @@ public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
* @return
*/
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
/**
* 线路质量分析-其他病害分析-道床单元详情检查记录查询
* @param analysisBatchId
* @param ekId
* @param deviceId
* @return
*/
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> getAnalysisLineBatchUnitDeviceTrackBedInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
/**
* 线路质量分析-其他病害分析-线路巡查巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolInfoVO> getAnalysisLineBatchUnitDevicePatrolInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
/**
* 线路质量分析-其他病害分析-线路巡查协助巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml
View file @ f5869112
......@@ -195,5 +195,62 @@
</if>
ORDER BY t1.update_time DESC
</select>
<select id="getAnalysisLineBatchUnitDeviceTrackBedInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDeviceTrackBedInfoVO">
SELECT
t1.*
FROM
t_dsa_analysis_line_batch_unit_device_track_bed_info t1
WHERE
1=1
AND t1.del_flag = '0'
<if test="analysisBatchId != null and analysisBatchId != ''">
AND t1.analysis_batch_id = #{analysisBatchId}
</if>
<if test="ekId != null and ekId != ''">
AND t1.ek_id = #{ekId}
</if>
<if test="deviceId != null and deviceId != ''">
AND t1.device_id = #{deviceId}
</if>
ORDER BY t1.update_time DESC
</select>
<select id="getAnalysisLineBatchUnitDevicePatrolInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDevicePatrolInfoVO">
SELECT
t1.*
FROM
t_dsa_analysis_line_batch_unit_device_patrol_info t1
WHERE
1=1
AND t1.del_flag = '0'
<if test="analysisBatchId != null and analysisBatchId != ''">
AND t1.analysis_batch_id = #{analysisBatchId}
</if>
<if test="ekId != null and ekId != ''">
AND t1.ek_id = #{ekId}
</if>
<if test="deviceId != null and deviceId != ''">
AND t1.device_id = #{deviceId}
</if>
ORDER BY t1.seq ASC
</select>
<select id="getAnalysisLineBatchUnitDevicePatrolAssistInfoList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchUnitDevicePatrolAssistInfoVO">
SELECT
t1.*
FROM
t_dsa_analysis_line_batch_unit_device_patrol_assist_info t1
WHERE
1=1
AND t1.del_flag = '0'
<if test="analysisBatchId != null and analysisBatchId != ''">
AND t1.analysis_batch_id = #{analysisBatchId}
</if>
<if test="ekId != null and ekId != ''">
AND t1.ek_id = #{ekId}
</if>
<if test="deviceId != null and deviceId != ''">
AND t1.device_id = #{deviceId}
</if>
ORDER BY t1.update_time DESC
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchService.java
View file @ f5869112
......@@ -2,17 +2,12 @@ package org.jeecg.modules.diseaseAnalysis.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.checkData.dto.CorrugationRecordDTO;
import org.jeecg.modules.checkData.vo.CorrugationRecordVO;
import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchDTO;
import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchInfoDTO;
import org.jeecg.modules.diseaseAnalysis.dto.AnalysisLineBatchSaveOrUpdateDTO;
import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchCheckDataMap;
import org.jeecg.modules.diseaseAnalysis.vo.*;
import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchSaveOrUpdateDTO;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
......@@ -104,7 +99,32 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
* @return
*/
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(String analysisBatchId, String ekId, String deviceId);
/**
* 线路质量分析-其他病害分析-道床单元详情检查记录查询
* @param analysisBatchId
* @param ekId
* @param deviceId
* @return
*/
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> getAnalysisLineBatchUnitDeviceTrackBedInfoList(String analysisBatchId, String ekId, String deviceId);
/**
* 线路质量分析-其他病害分析-线路巡查巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolInfoVO> getAnalysisLineBatchUnitDevicePatrolInfoList(String analysisBatchId, String ekId, String deviceId);
/**
* 线路质量分析-其他病害分析-线路巡查协助巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(String analysisBatchId, String ekId, String deviceId);
/**
*其他病害分析-分析批次-新增分析批次
* @param dto
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchServiceImpl.java
View file @ f5869112
......@@ -45,6 +45,12 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
private AnalysisLineBatchUnitDeviceCurveWearInfoMapper analysisLineBatchUnitDeviceCurveWearInfoMapper;
@Resource
private AnalysisLineBatchUnitDeviceCorrugationInfoMapper analysisLineBatchUnitDeviceCorrugationInfoMapper;
@Resource
private AnalysisLineBatchUnitDeviceTrackBedInfoMapper analysisLineBatchUnitDeviceTrackBedInfoMapper;
@Resource
private AnalysisLineBatchUnitDevicePatrolInfoMapper analysisLineBatchUnitDevicePatrolInfoMapper;
@Resource
private AnalysisLineBatchUnitDevicePatrolAssistInfoMapper analysisLineBatchUnitDevicePatrolAssistInfoMapper;
/**
* 线路质量分析-其他病害分析-检查记录-分页列表查询
*
......@@ -165,6 +171,44 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId, ekId, deviceId);
return list;
}
/**
* 线路质量分析-其他病害分析-道床单元详情检查记录查询
* @param analysisBatchId
* @param ekId
* @param deviceId
* @return
*/
@Override
public List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> getAnalysisLineBatchUnitDeviceTrackBedInfoList(String analysisBatchId, String ekId, String deviceId) {
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId, ekId, deviceId);
return list;
}
/**
* 线路质量分析-其他病害分析-线路巡查巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
@Override
public List<AnalysisLineBatchUnitDevicePatrolInfoVO> getAnalysisLineBatchUnitDevicePatrolInfoList(String analysisBatchId, String ekId, String deviceId) {
List<AnalysisLineBatchUnitDevicePatrolInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDevicePatrolInfoList(analysisBatchId, ekId, deviceId);
return list;
}
/**
* 线路质量分析-其他病害分析-线路巡查协助巡道员检查详情
*
* @param analysisBatchId 分析批次id
* @param ekId 检查批次id
* @param deviceId 线路质量分析-其他病害分析-单元表id
* @return
*/
@Override
public List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(String analysisBatchId, String ekId, String deviceId) {
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> list = this.baseMapper.getAnalysisLineBatchUnitDevicePatrolAssistInfoList(analysisBatchId, ekId, deviceId);
return list;
}
/**
*其他病害分析-分析批次-新增分析批次
......@@ -294,6 +338,20 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
LambdaQueryWrapper<AnalysisLineBatchUnitDeviceCorrugationInfo> wrapper2 = Wrappers.lambdaQuery();
wrapper2.in(AnalysisLineBatchUnitDeviceCorrugationInfo::getAnalysisBatchId, idList);
analysisLineBatchUnitDeviceCorrugationInfoMapper.delete(wrapper2);
}else if(type == 5){
//3.删除道床检查单元详情表
LambdaQueryWrapper<AnalysisLineBatchUnitDeviceTrackBedInfo> wrapper2 = Wrappers.lambdaQuery();
wrapper2.in(AnalysisLineBatchUnitDeviceTrackBedInfo::getAnalysisBatchId, idList);
analysisLineBatchUnitDeviceTrackBedInfoMapper.delete(wrapper2);
}else {
//3.删除线路检查单元详情表
LambdaQueryWrapper<AnalysisLineBatchUnitDevicePatrolInfo> wrapper2 = Wrappers.lambdaQuery();
wrapper2.in(AnalysisLineBatchUnitDevicePatrolInfo::getAnalysisBatchId, idList);
analysisLineBatchUnitDevicePatrolInfoMapper.delete(wrapper2);
LambdaQueryWrapper<AnalysisLineBatchUnitDevicePatrolAssistInfo> wrapper3 = Wrappers.lambdaQuery();
wrapper3.in(AnalysisLineBatchUnitDevicePatrolAssistInfo::getAnalysisBatchId, idList);
analysisLineBatchUnitDevicePatrolAssistInfoMapper.delete(wrapper3);
}
//4.删除分析主表
this.baseMapper.deleteBatchIds(idList);
......
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