Skip to content

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

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

parent 06f6e60d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 489 additions and 15 deletions
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