Skip to content

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

作业前接口全部逻辑提交--shizhilong

parent 49485e31
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 647 additions and 88 deletions
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/CorrugationRecordMapper.xml
View file @ 321ff6d9
......@@ -32,6 +32,7 @@
<if test="dto.endTime != null">
AND t2.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
order by t2.create_time desc
</select>
<select id="getDetail"
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/RailWearRecordMapper.xml
View file @ 321ff6d9
......@@ -33,6 +33,7 @@
<if test="dto.endTime != null">
AND t2.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
order by t2.create_time desc
</select>
<select id="getDetail"
resultType="org.jeecg.modules.checkData.vo.RailWearRecordDetailVO">
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/algorithm/AnalysisAlgorithmLine.java
View file @ 321ff6d9
......@@ -411,11 +411,8 @@ public class AnalysisAlgorithmLine {
unit.setUnitStartMileage(checkDataMap.getStartingMileage());
unit.setUnitEndMileage(checkDataMap.getEndMileage());
unit.setWorkStatus(1);
//获取当前登录人信息
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String realname = user.getUsername();
unit.setCreateBy(realname);
unit.setUpdateBy(realname);
unit.setCreateBy(checkDataMap.getCreateBy());
unit.setUpdateBy(checkDataMap.getUpdateBy());
//线路巡查主表
RecordPatrolMaster recordPatrolMaster = recordPatrolMasterService.getById(checkDataMap.getEkId());
if (recordPatrolMaster != null) {
......@@ -457,12 +454,9 @@ public class AnalysisAlgorithmLine {
unit.setUnitEndMileage(checkDataMap.getEndMileage());
unit.setWorkStatus(1);
unit.setMarkStatus(1);
unit.setCreateBy(checkDataMap.getCreateBy());
unit.setUpdateBy(checkDataMap.getUpdateBy());
unit.setRemark(analysisLineBatch.getRemark());
//获取当前登录人信息
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String realname = user.getUsername();
unit.setCreateBy(realname);
unit.setUpdateBy(realname);
unitList.add(unit);
return unit.getId();
}
......@@ -494,11 +488,8 @@ public class AnalysisAlgorithmLine {
unit.setUnitEndMileage(new BigDecimal(map.get("endMileage").toString()));
unit.setWorkStatus(1);
unit.setMarkStatus(1);
//获取当前登录人信息
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String realname = user.getUsername();
unit.setCreateBy(realname);
unit.setUpdateBy(realname);
unit.setCreateBy(checkDataMap.getCreateBy());
unit.setUpdateBy(checkDataMap.getUpdateBy());
unit.setRemark(analysisLineBatch.getRemark());
unitList.add(unit);
return unit.getId();
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchController.java
View file @ 321ff6d9
......@@ -4,15 +4,13 @@ package org.jeecg.modules.diseaseAnalysis.controller;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.exception.JeecgBootException;
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.dto.*;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
import org.jeecg.modules.diseaseAnalysis.vo.*;
......@@ -20,10 +18,7 @@ import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -137,6 +132,23 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
AnalysisLineBatchInfoDTO dto) {
Page<AnalysisLineBatchUnitDeviceVO> pageData = new Page<>(pageNo, pageSize);
pageData = this.service.getInfoPageList(pageData, dto);
List<AnalysisLineBatchUnitDeviceVO> records = pageData.getRecords();
if(CollectionUtils.isNotEmpty(records)){
Set<String> analysisLineBatchIds = records.stream().map(AnalysisLineBatchUnitDeviceVO::getAnalysisBatchId).collect(Collectors.toSet());
List<String> ids = new ArrayList();
analysisLineBatchIds.forEach(id->{
ids.add(id);
});
List<AnalysisLineBatchCheckDataMapVO> checkBatchList = this.service.listRecordDetail(ids);
if (ObjectUtil.isNotEmpty(checkBatchList)) {
Map<String, List<AnalysisLineBatchCheckDataMapVO>> analysisBatchMap = checkBatchList.stream().collect(Collectors.groupingBy(AnalysisLineBatchCheckDataMapVO::getAnalysisBatchId));
records.forEach(record -> {
AnalysisLineBatchCheckDataMapVO mapVO = analysisBatchMap.get(record.getAnalysisBatchId()).get(0);
record.setCheckBy(mapVO.getCheckBy());
record.setCheckTime(mapVO.getCheckTime());
});
}
}
return Result.OK(pageData);
}
......@@ -249,7 +261,29 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> list = this.service.getAnalysisLineBatchUnitDevicePatrolAssistInfoList(analysisBatchId, ekId, deviceId);
return Result.OK(list);
}
/**
* 维修作业管理-选择分析批次-列表分页查询
*
* @param pageNo
* @param pageSize
* @param dto
* @return
*/
@AutoLog(value = "维修作业管理-选择分析批次-列表分页查询")
@ApiOperation(value = "维修作业管理-选择分析批次-列表分页查询", notes = "维修作业管理-选择分析批次-列表分页查询")
@GetMapping(value = "/getWorkPageList")
public Result<IPage<AnalysisLineBatchWorkVO>> getWorkPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
AnalysisLineBatchWorkDTO dto) {
List<String> ekTypeList = new ArrayList<>();
if (dto.getEkType().contains(",")) {
ekTypeList = Arrays.asList(dto.getEkType().split(","));
}
dto.setEkTypeList(ekTypeList);
Page<AnalysisLineBatchWorkVO> pageData = new Page<>(pageNo, pageSize);
pageData = this.service.getWorkPageList(pageData, dto);
return Result.OK(pageData);
}
//***********************************分析新增编辑接口*************************************************************************************************************
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchSaveOrUpdateDTO.java
View file @ 321ff6d9
......@@ -84,6 +84,10 @@ public class AnalysisLineBatchSaveOrUpdateDTO {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("检查起始里程")
private BigDecimal startingMileage;
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/AnalysisLineBatchWorkDTO.java 0 → 100644
View file @ 321ff6d9
package org.jeecg.modules.diseaseAnalysis.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.List;
/**
* <p>
* 线路质量分析 -分析批次表
* </p>
*
* @author hkl
* @since 2024-07-19
*/
@Getter
@Setter
@ApiModel(value = "AnalysisLineBatch对象", description = "线路质量分析 -分析批次表")
public class AnalysisLineBatchWorkDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("分析批次号")
private String analysisBatchCode;
@ApiModelProperty("检查批次号")
private String ekCode;
@ApiModelProperty("所属线路id")
private String lightRailId;
@ApiModelProperty("所属线别id")
private String lineAliasId;
@ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private String ekType;
@ApiModelProperty("不需要前端传递，需要后台将ekType参数处理成集合")
private List<String> ekTypeList;
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/dto/EkRecordsMasterCheckDTO.java
View file @ 321ff6d9
......@@ -39,4 +39,10 @@ public class EkRecordsMasterCheckDTO {
@ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private String type;
@ApiModelProperty("线路id")
private String lightRailId;
@ApiModelProperty("线别id")
private String lineAliasId;
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/entity/AnalysisLineBatchCheckDataMap.java
View file @ 321ff6d9
......@@ -73,6 +73,10 @@ public class AnalysisLineBatchCheckDataMap implements Serializable {
@TableField("check_time")
private Date checkTime;
@ApiModelProperty("检查人")
@TableField("check_by")
private String checkBy;
@ApiModelProperty("起始里程")
@TableField("starting_mileage")
private BigDecimal startingMileage;
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/AnalysisLineBatchMapper.java
View file @ 321ff6d9
......@@ -7,6 +7,7 @@ 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.AnalysisLineBatchWorkDTO;
import org.jeecg.modules.diseaseAnalysis.dto.EkRecordsMasterCheckDTO;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
import org.jeecg.modules.diseaseAnalysis.vo.*;
......@@ -129,5 +130,11 @@ public interface AnalysisLineBatchMapper extends BaseMapper<AnalysisLineBatch> {
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(@Param("analysisBatchId") String analysisBatchId, @Param("ekId")String ekId, @Param("deviceId")String deviceId);
/**
* 维修作业管理-选择分析批次-列表分页查询
* @param pageData
* @param dto
* @return
*/
Page<AnalysisLineBatchWorkVO> getWorkPageList(@Param("pageData") Page<AnalysisLineBatchWorkVO> pageData, @Param("dto")AnalysisLineBatchWorkDTO dto);
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/mapper/xml/AnalysisLineBatchMapper.xml
View file @ 321ff6d9
......@@ -19,6 +19,12 @@
<if test="dto.endTime != null">
AND t.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
<if test="dto.lightRailId != null and dto.lightRailId != ''">
AND t.light_rail_id = #{dto.lightRailId}
</if>
<if test="dto.lineAliasId != null and dto.lineAliasId != ''">
AND t.line_alias_id = #{dto.lineAliasId}
</if>
ORDER BY t.update_time DESC
</select>
......@@ -39,6 +45,12 @@
<if test="dto.endTime != null">
AND t.inspect_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
<if test="dto.lightRailId != null and dto.lightRailId != ''">
AND t.light_rail_id = #{dto.lightRailId}
</if>
<if test="dto.lineAliasId != null and dto.lineAliasId != ''">
AND t.line_alias_id = #{dto.lineAliasId}
</if>
ORDER BY t.update_time DESC
</select>
......@@ -256,4 +268,36 @@
</if>
ORDER BY t1.update_time DESC
</select>
<select id="getWorkPageList" resultType="org.jeecg.modules.diseaseAnalysis.vo.AnalysisLineBatchWorkVO">
SELECT
t1.*,
t2.check_time,
t2.check_by,
t2.ek_id,
t2.ek_code,
FROM
t_dsa_analysis_line_batch t1 left join t_dsa_analysis_line_batch_check_data_map t2 on t1.id = t2.analysis_batch_id
WHERE
1=1
<if test="dto.analysisBatchCode != null and dto.analysisBatchCode != ''">
AND t1.analysis_batch_code like concat('%',#{dto.analysisBatchCode},'%')
</if>
<if test="dto.ekCode != null and dto.ekCode != ''">
AND t2.ek_code like concat('%',#{dto.ekCode},'%')
</if>
<if test="dto.lightRailId != null and dto.lightRailId != ''">
AND t1.light_rail_id = #{dto.lightRailId}
</if>
<if test="dto.lineAliasId != null and dto.lineAliasId != ''">
AND t1.line_alias_id = #{dto.lineAliasId}
</if>
<if test="dto.ekTypeList != null">
AND t1.ek_type IN
<foreach collection="dto.ekTypeList" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
ORDER BY t1.update_time DESC
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/IAnalysisLineBatchService.java
View file @ 321ff6d9
......@@ -2,10 +2,7 @@ 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.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.dto.*;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatch;
import org.jeecg.modules.diseaseAnalysis.vo.*;
......@@ -125,6 +122,16 @@ public interface IAnalysisLineBatchService extends IService<AnalysisLineBatch> {
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(String analysisBatchId, String ekId, String deviceId);
/**
* 维修作业管理-选择分析批次-列表分页查询
* @param pageData
* @param dto
* @return
*/
Page<AnalysisLineBatchWorkVO> getWorkPageList(Page<AnalysisLineBatchWorkVO> pageData, AnalysisLineBatchWorkDTO dto);
/**
*其他病害分析-分析批次-新增分析批次
* @param dto
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/service/impl/AnalysisLineBatchServiceImpl.java
View file @ 321ff6d9
......@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.diseaseAnalysis.algorithm.MultiProducerLine;
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.dto.*;
import org.jeecg.modules.diseaseAnalysis.entity.*;
import org.jeecg.modules.diseaseAnalysis.mapper.*;
import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchService;
......@@ -210,6 +207,17 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
return list;
}
/**
* 维修作业管理-选择分析批次-列表分页查询
* @param pageData
* @param dto
* @return
*/
@Override
public Page<AnalysisLineBatchWorkVO> getWorkPageList(Page<AnalysisLineBatchWorkVO> pageData, AnalysisLineBatchWorkDTO dto) {
return this.baseMapper.getWorkPageList(pageData,dto);
}
/**
*其他病害分析-分析批次-新增分析批次
* @param dto
......@@ -235,6 +243,7 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
analysisLineBatchCheckDataMap.setStartingMileage(checkDataDTO.getStartingMileage());
analysisLineBatchCheckDataMap.setEndMileage(checkDataDTO.getEndMileage());
analysisLineBatchCheckDataMap.setCheckTime(checkDataDTO.getCheckTime());
analysisLineBatchCheckDataMap.setCheckBy(checkDataDTO.getCheckBy());
analysisLineBatchCheckDataMap.setEkType(checkDataDTO.getEkType());
analysisLineBatchCheckDataMap.setAnalysisStatus(1);// 分析中
analysisLineBatchCheckDataMap.setRemark(dto.getRemark());
......@@ -283,6 +292,7 @@ public class AnalysisLineBatchServiceImpl extends ServiceImpl<AnalysisLineBatchM
analysisLineBatchCheckDataMap.setStartingMileage(checkDataDTO.getStartingMileage());
analysisLineBatchCheckDataMap.setEndMileage(checkDataDTO.getEndMileage());
analysisLineBatchCheckDataMap.setCheckTime(checkDataDTO.getCheckTime());
analysisLineBatchCheckDataMap.setCheckBy(checkDataDTO.getCheckBy());
analysisLineBatchCheckDataMap.setEkType(checkDataDTO.getEkType());
analysisLineBatchCheckDataMap.setAnalysisStatus(1);// 分析中
analysisLineBatchCheckDataMap.setRemark(dto.getRemark());
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchCheckDataMapVO.java
View file @ 321ff6d9
......@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
......@@ -56,8 +57,12 @@ public class AnalysisLineBatchCheckDataMapVO {
private String ekType;
@ApiModelProperty("检查日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("起始里程")
private BigDecimal startingMileage;
......
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchUnitDeviceVO.java
View file @ 321ff6d9
......@@ -90,4 +90,12 @@ public class AnalysisLineBatchUnitDeviceVO {
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/AnalysisLineBatchWorkVO.java 0 → 100644
View file @ 321ff6d9
package org.jeecg.modules.diseaseAnalysis.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* <p>
* 线路质量分析 -分析批次表
* </p>
*
* @author hkl
* @since 2024-07-19
*/
@Getter
@Setter
@ApiModel(value = "AnalysisLineBatch对象", description = "线路质量分析 -分析批次表")
public class AnalysisLineBatchWorkVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("分析批次号")
private String analysisBatchCode;
@ApiModelProperty("所属线路id")
private String lightRailId;
@ApiModelProperty("所属线路名称")
private String lightRailName;
@ApiModelProperty("所属线别id")
private String lineAliasId;
@ApiModelProperty("所属线别名称")
private String lineAliasName;
@ApiModelProperty("分析起始里程")
private BigDecimal startingMileage;
@ApiModelProperty("分析终点里程")
private BigDecimal endMileage;
@ApiModelProperty("分析状态 0-创建 1-分析中 99-分析完成")
private Integer analysisStatus;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private String ekType;
@ApiModelProperty("检查批次号")
private String ekCode;
@ApiModelProperty("检查id")
private String ekId;
@ApiModelProperty("检查日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
}
jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/vo/EkRecordsMasterCheckVO.java
View file @ 321ff6d9
......@@ -75,6 +75,7 @@ public class EkRecordsMasterCheckVO {
private Date updateTime;
@ApiModelProperty("检查日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date checkTime;
@ApiModelProperty("检查人")
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java
View file @ 321ff6d9
......@@ -10,7 +10,12 @@ import io.swagger.annotations.ApiParam;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevicePatrolAssistInfo;
import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDevicePatrolAssistInfoService;
import org.jeecg.modules.diseaseAnalysis.service.IAnalysisLineBatchUnitDeviceService;
import org.jeecg.modules.diseaseAnalysis.vo.*;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatch;
import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO;
import org.jeecg.modules.maintenanceWork.dto.*;
import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
import org.jeecg.modules.maintenanceWork.entity.WorkBatchDetail;
......@@ -26,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -48,6 +54,10 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
@Resource
private IWorkBatchDetailModifyService workBatchDetailModifyService;
@Resource
private IAnalysisLineBatchUnitDeviceService analysisLineBatchUnitDeviceService;
@AutoLog(value = "维修作业管理-作业计划批次管理-分页列表查询")
@ApiOperation(value = "维修作业管理-作业计划批次管理-分页列表查询", notes = "维修作业管理-作业计划批次管理-分页列表查询")
@GetMapping(value = "/listRecord")
......@@ -59,6 +69,50 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
return Result.OK(pageData);
}
@AutoLog(value = "维修作业管理-作业计划批次管理-获取详情关联超限数据")
@ApiOperation(value = "维修作业管理-作业计划批次管理-获取详情关联超限数据", notes = "维修作业管理-作业计划批次管理-获取详情关联超限数据")
@GetMapping(value = "/getTransfiniteList")
public Result<Map<String, Object>> getTransfiniteList(@RequestParam("analysisBatchId") String analysisBatchId, @RequestParam("analysisBatchUnitDeviceId") String analysisBatchUnitDeviceId, @RequestParam("analysisType") Integer analysisType) {
Map<String, Object> map = new HashMap<>();
if (analysisType == 0) {
List<AnalysisBatchUnitDeviceTransfiniteVO> list = this.service.getTransfiniteList(analysisBatchUnitDeviceId);
//动静态超限数据
map.put("cx", list);
}else if(analysisType == 1){
List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> turnoutInfoVOList = this.service.getAnalysisLineBatchUnitEkInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//道岔超限数据
map.put("cx", turnoutInfoVOList);
}else if(analysisType == 2){
List<AnalysisLineBatchUnitDeviceRailWearInfoVO> railWearInfoList = this.service.getAnalysisLineBatchUnitDeviceRailWearInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//钢轨伤损超限数据
map.put("cx", railWearInfoList);
}else if(analysisType == 3){
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> curveWearInfoList = this.service.getAnalysisLineBatchUnitDeviceCurveWearInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//曲线磨耗检查超限数据
map.put("cx", curveWearInfoList);
}else if(analysisType == 4){
List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> corrugationInfoList = this.service.getAnalysisLineBatchUnitDeviceCorrugationInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//钢轨波磨检查超限数据
map.put("cx", corrugationInfoList);
}else if(analysisType == 5){
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> trackBedInfoList = this.service.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//道床检查超限数据
map.put("cx", trackBedInfoList);
}else {
//根据分析单元id查询巡道员备忘录
String remark = analysisLineBatchUnitDeviceService.getById(analysisBatchUnitDeviceId).getRemark();
List<AnalysisLineBatchUnitDevicePatrolInfoVO> patrolInfoList = this.service.getAnalysisLineBatchUnitDevicePatrolInfoList(analysisBatchId,analysisBatchUnitDeviceId);
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> patrolAssistInfoList = this.service.getAnalysisLineBatchUnitDevicePatrolAssistInfoList(analysisBatchId,analysisBatchUnitDeviceId);
//线路巡查超限数据
map.put("cx", patrolInfoList);
//协助线路巡查超限数据
map.put("xlcx", patrolAssistInfoList);
//巡道员备忘录
map.put("remark", remark);
}
return Result.OK(map);
}
@AutoLog(value = "维修作业管理-作业计划批次管理-获取派工用户")
@ApiOperation(value = "维修作业管理-作业计划批次管理-获取派工用户", notes = "维修作业管理-作业计划批次管理-获取派工用户")
@GetMapping(value = "/listUser")
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/AnalysisBatchSaveDTO.java
View file @ 321ff6d9
......@@ -46,7 +46,7 @@ public class AnalysisBatchSaveDTO {
@ApiModelProperty("作业终点里程")
private BigDecimal workEndMileage;
@ApiModelProperty("作业终止时间")
@ApiModelProperty("作业起始时间")
private Date workStartTime;
@ApiModelProperty("作业终止时间")
......@@ -55,9 +55,12 @@ public class AnalysisBatchSaveDTO {
@ApiModelProperty("作业班组")
private String team;
@ApiModelProperty("分析类型（1-动静态分析2：其他病害分析）")
@ApiModelProperty("分析类型（0-动静态分析 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
private Integer workType;
@ApiModelProperty("作业状态 0-未作业 1-已作业")
private Integer workStatus;
......@@ -67,6 +70,12 @@ public class AnalysisBatchSaveDTO {
@ApiModelProperty("分析批次id")
private String analysisBatchId;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("查询条件")
private Form form;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/DispatchDTO.java
View file @ 321ff6d9
package org.jeecg.modules.maintenanceWork.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
......@@ -59,4 +61,10 @@ public class DispatchDTO {
@ApiModelProperty("单元得分")
private BigDecimal unitScore;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchDTO.java
View file @ 321ff6d9
......@@ -43,9 +43,12 @@ public class WorkBatchDTO {
@ApiModelProperty("作业班组")
private String team;
@ApiModelProperty("分析类型（1-动静态分析2：其他病害分析）")
@ApiModelProperty("分析类型（0-动静态分析 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
private Integer workType;
@ApiModelProperty("来源 1-页面添加 2-超限派工添加")
private Integer source;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchSaveOrUpdateDTO.java
View file @ 321ff6d9
package org.jeecg.modules.maintenanceWork.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -54,6 +55,12 @@ public class WorkBatchSaveOrUpdateDTO {
@ApiModelProperty("作业班组")
private String team;
@ApiModelProperty("分析类型（0-动静态分析 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
private Integer workType;
@ApiModelProperty("来源 1-页面添加 2-超限派工添加")
private Integer source;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchSaveOrUpdateDetailDTO.java
View file @ 321ff6d9
package org.jeecg.modules.maintenanceWork.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
@ApiModel(value = "WorkBatchSaveOrUpdateDetailDTO对象", description = "维修作业管理-页面来源保存或更新dto")
public class WorkBatchSaveOrUpdateDetailDTO {
@ApiModelProperty("分析批次单元设备id")
@ApiModelProperty("分析批次id")
private String analysisBatchId;
@ApiModelProperty("分析批次code")
private String analysisBatchCode;
@ApiModelProperty("单元设备id")
private String unitId;
@ApiModelProperty("单元设备code")
......@@ -41,4 +50,10 @@ public class WorkBatchSaveOrUpdateDetailDTO {
@ApiModelProperty("维修建议")
private String remark;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/WorkBatchTransfiniteSaveDTO.java
View file @ 321ff6d9
......@@ -55,9 +55,12 @@ public class WorkBatchTransfiniteSaveDTO {
@ApiModelProperty("作业班组")
private String team;
@ApiModelProperty("分析类型（1-动静态分析2：其他病害分析）")
@ApiModelProperty("分析类型（0-动静态分析 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
private Integer workType;
@ApiModelProperty("派工列表")
private List<DispatchDTO> detailList;
}
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatch.java
View file @ 321ff6d9
......@@ -89,10 +89,14 @@ public class WorkBatch implements Serializable {
@TableField("team")
private String team;
@ApiModelProperty("分析类型（1-动静态分析2：其他病害分析）")
@ApiModelProperty("分析类型（0-动静态分析 1-道岔分析 2-钢轨常规探伤分析 3-曲线钢轨磨耗分析 4-钢轨波磨分析 5-道床检查分析 6-线路巡查分析）")
@TableField("analysis_type")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
@TableField("work_type")
private Integer workType;
@ApiModelProperty("来源 1-页面添加 2-超限派工添加")
@TableField("source")
private Integer source;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java
View file @ 321ff6d9
......@@ -69,6 +69,14 @@ public class WorkBatchDetail implements Serializable {
@TableField("analysis_batch_unit_device_id")
private String analysisBatchUnitDeviceId;
@ApiModelProperty("检查日期")
@TableField("check_time")
private Date checkTime;
@ApiModelProperty("检查人")
@TableField("check_by")
private String checkBy;
@ApiModelProperty("单元设备id")
@TableField("unit_id")
private String unitId;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml
View file @ 321ff6d9
......@@ -41,7 +41,9 @@
t1.unit_score_level_str,
t1.unit_score,
t1.reform_remark,
t1.remark
t1.remark,
t1.check_by,
t1.check_time
FROM t_mw_work_batch_detail t1
WHERE t1.work_batch_id in
<if test="workBatchIds !=null and workBatchIds.size()>0">
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml
View file @ 321ff6d9
......@@ -23,6 +23,7 @@
t1.work_status,
t1.del_flag,
t1.analysis_type,
t1.work_type
(SELECT count(1) FROM t_mw_work_batch_detail WHERE work_batch_id = t1.id) work_unit_device_num
FROM
t_mw_work_batch t1
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/IWorkBatchService.java
View file @ 321ff6d9
package org.jeecg.modules.maintenanceWork.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.diseaseAnalysis.entity.AnalysisLineBatchUnitDevicePatrolAssistInfo;
import org.jeecg.modules.diseaseAnalysis.vo.*;
import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceTransfiniteVO;
import org.jeecg.modules.homePage.vo.ToDoDetailVO;
import org.jeecg.modules.maintenanceWork.dto.*;
import org.jeecg.modules.maintenanceWork.entity.WorkBatch;
......@@ -27,6 +30,67 @@ public interface IWorkBatchService extends IService<WorkBatch> {
Page<WorkBatchVO> listRecord(Page<WorkBatchVO> pageData, WorkBatchDTO dto);
/**
* 动静态超限数据查询
* @param analysisBatchUnitDeviceId
* @return
*/
List<AnalysisBatchUnitDeviceTransfiniteVO> getTransfiniteList(String analysisBatchUnitDeviceId);
/**
* 道岔
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDeviceTurnoutInfoVO> getAnalysisLineBatchUnitEkInfoList(String analysisBatchId,String analysisBatchUnitDeviceId);
/**
* 钢轨伤损
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDeviceRailWearInfoVO> getAnalysisLineBatchUnitDeviceRailWearInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
/**
* 曲线磨耗检查
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDeviceCurveWearInfoVO> getAnalysisLineBatchUnitDeviceCurveWearInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
/**
* 钢轨波磨检查
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDeviceCorrugationInfoVO> getAnalysisLineBatchUnitDeviceCorrugationInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
/**
* 道床检查
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> getAnalysisLineBatchUnitDeviceTrackBedInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
/**
* 线路巡查
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolInfoVO> getAnalysisLineBatchUnitDevicePatrolInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
/**
* 协助线路巡查
* @param analysisBatchId 分析批次id
* @param analysisBatchUnitDeviceId 分析单元id
* @return
*/
List<AnalysisLineBatchUnitDevicePatrolAssistInfoVO> getAnalysisLineBatchUnitDevicePatrolAssistInfoList(String analysisBatchId, String analysisBatchUnitDeviceId);
void saveRecord(WorkBatchSaveOrUpdateDTO dto);
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailVO.java
View file @ 321ff6d9
......@@ -47,6 +47,12 @@ public class WorkBatchDetailVO {
@ApiModelProperty("工作批次id")
private String workBatchId;
@ApiModelProperty("检查日期")
private Date checkTime;
@ApiModelProperty("检查人")
private String checkBy;
@ApiModelProperty("单元设备id")
private String unitId;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchVO.java
View file @ 321ff6d9
......@@ -61,10 +61,12 @@ public class WorkBatchVO {
@ApiModelProperty("作业班组")
private String team;
@ApiModelProperty("分析类型（1-动静态分析2：其他病害分析）")
@TableField("analysis_type")
@ApiModelProperty("分析类型（0-动静态分析 1-道岔检查 2-钢轨常规探伤检查 3-曲线钢轨磨耗检查 4-钢轨波磨检查 5-道床检查 6-线路检查）")
private Integer analysisType;
@ApiModelProperty("作业类型（1-单元方式 2-分析批次方式）")
private Integer workType;
@ApiModelProperty("来源 1-页面添加 2-超限派工添加")
private Integer source;
......
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