Commit fe473b97 authored by hkl's avatar hkl

feat:1.pc端维修记录调整

parent 06942fdb
......@@ -25,11 +25,11 @@ public class CodeGenerate {
String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
// 模块名
String moduleName = "maintenanceWork";
String moduleName = "dynamicStaticAnalysis";
// 表名
String[] tables = {
"t_mw_work_batch_detail_modify",
"t_dsa_config_tqi_limit",
};
......
......@@ -25,7 +25,6 @@
FROM
t_ek_rail_wear_record t1
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
left join t_sn_light_rail t3 on t2.light_rail_id = t3.id
WHERE t1.del_flag = '0'
<if test="dto.ekCode != null and dto.ekCode != ''">
AND t2.ek_code like concat('%',#{dto.ekCode},'%')
......@@ -36,7 +35,6 @@
<if test="dto.endTime != null">
AND t2.check_time <![CDATA[ <= ]]> #{dto.endTime}
</if>
AND t3.status = 1
</select>
<select id="getDetail"
resultType="org.jeecg.modules.checkData.vo.RailWearRecordDetailVO">
......
package org.jeecg.modules.dynamicStaticAnalysis.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDispatching;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigTqiLimit;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigTqiLimitService;
import org.jeecg.modules.dynamicStaticAnalysis.vo.ConfigTqiLimitVO;
import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import java.util.List;
/**
* <p>
* 动静态分析-配置参数-TQI管理标准顺质量指数 前端控制器
* </p>
*
* @author hkl
* @since 2023-09-15
*/
@RestController
@RequestMapping("/dynamicStaticAnalysis/configTqiLimit")
@Api(tags = "动静态分析-配置参数-TQI管理标准顺质量指数")
public class ConfigTqiLimitController extends JeecgController<ConfigTqiLimit, IConfigTqiLimitService> {
@AutoLog(value = "动静态分析-配置参数-TQI管理标准顺质量指数-查询所有参数")
@ApiOperation(value = "动静态分析-配置参数-TQI管理标准顺质量指数-查询所有参数", notes = "动静态分析-配置参数-TQI管理标准顺质量指数-查询所有参数")
@GetMapping(value = "/listRecord")
public Result<List<ConfigTqiLimit>> listRecord() {
List<ConfigTqiLimit> list = this.service.list();
return Result.OK(list);
}
@AutoLog(value = "动静态分析-配置参数-TQI管理标准顺质量指数-批量更新")
@ApiOperation(value = "动静态分析-配置参数-TQI管理标准顺质量指数-批量更新", notes = "动静态分析-配置参数-TQI管理标准顺质量指数-批量更新")
@PostMapping(value = "/batchUpdateRecord")
public Result<String> batchUpdateRecord(@RequestBody List<ConfigTqiLimit> records) {
this.service.updateBatchById(records);
return Result.OK("操作成功");
}
}
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-配置-TQI管理标准顺质量指数
* </p>
*
* @author hkl
* @since 2023-09-15
*/
@Getter
@Setter
@TableName("t_dsa_config_tqi_limit")
@ApiModel(value = "ConfigTqiLimit对象", description = "动静态分析-配置-TQI管理标准顺质量指数")
public class ConfigTqiLimit implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限")
@TableField("speed_min")
private Integer speedMin;
@ApiModelProperty("速度上限")
@TableField("speed_max")
private Integer speedMax;
@ApiModelProperty("数据字典标签")
@TableField("dict_label")
private String dictLabel;
@ApiModelProperty("数据字典值")
@TableField("dict_value")
private String dictValue;
@ApiModelProperty("超标类型 1-超标≤10% 2-超标≤20% 3-超标>20%")
@TableField("over_standard_type")
private Integer overStandardType;
@ApiModelProperty("评价等级中文说明")
@TableField("over_standard_type_str")
private String overStandardTypeStr;
@ApiModelProperty("tqi下限")
@TableField("tqi_min")
private BigDecimal tqiMin;
@ApiModelProperty("tqi上限")
@TableField("tqi_max")
private BigDecimal tqiMax;
@ApiModelProperty("是否删除(0:未删除; 1:已删除)")
@TableField("del_flag")
private String delFlag;
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
}
package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigTqiLimit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 动静态分析-配置-TQI管理标准顺质量指数 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-09-15
*/
public interface ConfigTqiLimitMapper extends BaseMapper<ConfigTqiLimit> {
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigTqiLimitMapper">
</mapper>
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-分析批次-单元设备测点得分
* </p>
*
* @author hkl
* @since 2023-08-28
*/
@Getter
@Setter
@ApiModel(value = "AnalysisBatchUnitDeviceTqiScore对象", description = "动静态分析-分析批次-单元设备测点得分")
public class AnalysisBatchUnitDeviceTqiScoreDTO {
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 Integer speedMin;
@ApiModelProperty("速度上限")
private Integer speedMax;
@ApiModelProperty("分析类型 1-均值分析 2-峰值分析")
private Integer analysisType;
@ApiModelProperty("分析批次单元设备id")
private String analysisBatchUnitDeviceId;
@ApiModelProperty("分析批次号")
private String analysisBatchCode;
@ApiModelProperty("分析批id")
private String analysisBatchId;
@ApiModelProperty("单元设备id")
private String unitId;
@ApiModelProperty("单元设备code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
private String unitTypeName;
@ApiModelProperty("测点类型")
private String pointTypeName;
@ApiModelProperty("高低左")
private BigDecimal highLowLeft;
@ApiModelProperty("高低左分数")
private BigDecimal highLowLeftScore;
@ApiModelProperty("高低左权值")
private BigDecimal highLowLeftWeightValues;
@ApiModelProperty("高低右")
private BigDecimal highLowRight;
@ApiModelProperty("高低右分数")
private BigDecimal highLowRightScore;
@ApiModelProperty("高低右权值")
private BigDecimal highLowRightWeightValues;
@ApiModelProperty("轨向左")
private BigDecimal trackLeft;
@ApiModelProperty("轨向左分数")
private BigDecimal trackLeftScore;
@ApiModelProperty("轨向左权值")
private BigDecimal trackLeftWeightValues;
@ApiModelProperty("轨向右")
private BigDecimal trackRight;
@ApiModelProperty("轨向右分数")
private BigDecimal trackRightScore;
@ApiModelProperty("轨向右权值")
private BigDecimal trackRightWeightValues;
@ApiModelProperty("水平(mm)")
private BigDecimal level;
@ApiModelProperty("水平(mm)分数")
private BigDecimal levelScore;
@ApiModelProperty("水平(mm)权值")
private BigDecimal levelWeightValues;
@ApiModelProperty("轨距(mm)")
private BigDecimal trackGauge;
@ApiModelProperty("轨距(mm)分数")
private BigDecimal trackGaugeScore;
@ApiModelProperty("轨距(mm)权值")
private BigDecimal trackGaugeWeightValues;
@ApiModelProperty("三角坑(mm)")
private BigDecimal triangularPit;
@ApiModelProperty("三角坑(mm)分数")
private BigDecimal triangularPitScore;
@ApiModelProperty("三角坑(mm)权值")
private BigDecimal triangularPitWeightValues;
@ApiModelProperty("TQI数值")
private BigDecimal tqiComeUpon;
@ApiModelProperty("TQI数值分数")
private BigDecimal tqiComeUponScore;
@ApiModelProperty("TQI数值权值")
private BigDecimal tqiComeUponWeightValues;
@ApiModelProperty("总得分")
private BigDecimal sumScore;
@ApiModelProperty("备注")
private String remark;
}
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-分析批次-单元设备测点得分
* </p>
*
* @author hkl
* @since 2023-08-28
*/
@Getter
@Setter
@ApiModel(value = "AnalysisBatchUnitDeviceTqiScore对象", description = "动静态分析-分析批次-单元设备测点得分")
public class AnalysisBatchUnitDeviceTqiScoreVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限")
@TableField("speed_min")
private Integer speedMin;
@ApiModelProperty("速度上限")
@TableField("speed_max")
private Integer speedMax;
@ApiModelProperty("分析类型 1-均值分析 2-峰值分析")
@TableField("analysis_type")
private Integer analysisType;
@ApiModelProperty("分析批次单元设备id")
@TableField("analysis_batch_unit_device_id")
private String analysisBatchUnitDeviceId;
@ApiModelProperty("分析批次号")
@TableField("analysis_batch_code")
private String analysisBatchCode;
@ApiModelProperty("分析批id")
@TableField("analysis_batch_id")
private String analysisBatchId;
@ApiModelProperty("单元设备id")
@TableField("unit_id")
private String unitId;
@ApiModelProperty("单元设备code")
@TableField("unit_code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
@TableField("unit_type")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
@TableField("unit_type_name")
private String unitTypeName;
@ApiModelProperty("测点类型")
@TableField("point_type_name")
private String pointTypeName;
@ApiModelProperty("高低左")
@TableField("high_low_left")
private BigDecimal highLowLeft;
@ApiModelProperty("高低左分数")
@TableField("high_low_left_score")
private BigDecimal highLowLeftScore;
@ApiModelProperty("高低左权值")
@TableField("high_low_left_weight_values")
private BigDecimal highLowLeftWeightValues;
@ApiModelProperty("高低右")
@TableField("high_low_right")
private BigDecimal highLowRight;
@ApiModelProperty("高低右分数")
@TableField("high_low_right_score")
private BigDecimal highLowRightScore;
@ApiModelProperty("高低右权值")
@TableField("high_low_right_weight_values")
private BigDecimal highLowRightWeightValues;
@ApiModelProperty("轨向左")
@TableField("track_left")
private BigDecimal trackLeft;
@ApiModelProperty("轨向左分数")
@TableField("track_left_score")
private BigDecimal trackLeftScore;
@ApiModelProperty("轨向左权值")
@TableField("track_left_weight_values")
private BigDecimal trackLeftWeightValues;
@ApiModelProperty("轨向右")
@TableField("track_right")
private BigDecimal trackRight;
@ApiModelProperty("轨向右分数")
@TableField("track_right_score")
private BigDecimal trackRightScore;
@ApiModelProperty("轨向右权值")
@TableField("track_right_weight_values")
private BigDecimal trackRightWeightValues;
@ApiModelProperty("水平(mm)")
@TableField("level")
private BigDecimal level;
@ApiModelProperty("水平(mm)分数")
@TableField("level_score")
private BigDecimal levelScore;
@ApiModelProperty("水平(mm)权值")
@TableField("level_weight_values")
private BigDecimal levelWeightValues;
@ApiModelProperty("轨距(mm)")
@TableField("track_gauge")
private BigDecimal trackGauge;
@ApiModelProperty("轨距(mm)分数")
@TableField("track_gauge_score")
private BigDecimal trackGaugeScore;
@ApiModelProperty("轨距(mm)权值")
@TableField("track_gauge_weight_values")
private BigDecimal trackGaugeWeightValues;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private BigDecimal triangularPit;
@ApiModelProperty("三角坑(mm)分数")
@TableField("triangular_pit_score")
private BigDecimal triangularPitScore;
@ApiModelProperty("三角坑(mm)权值")
@TableField("triangular_pit_weight_values")
private BigDecimal triangularPitWeightValues;
@ApiModelProperty("TQI数值")
@TableField("tqi_come_upon")
private BigDecimal tqiComeUpon;
@ApiModelProperty("TQI数值分数")
@TableField("tqi_come_upon_score")
private BigDecimal tqiComeUponScore;
@ApiModelProperty("TQI数值权值")
@TableField("tqi_come_upon_weight_values")
private BigDecimal tqiComeUponWeightValues;
@ApiModelProperty("总得分")
@TableField("sum_score")
private BigDecimal sumScore;
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
}
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-分析批次-单元设备派工表
* </p>
*
* @author hkl
* @since 2023-08-30
*/
@Getter
@Setter
@ApiModel(value = "AnalysisBatchUnitDeviceWork对象", description = "动静态分析-分析批次-单元设备派工表")
public class AnalysisBatchUnitDeviceWorkDTO {
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("分析批次单元设备id")
private String analysisBatchUnitDeviceId;
@ApiModelProperty("分析批次号")
private String analysisBatchCode;
@ApiModelProperty("分析批id")
private String analysisBatchId;
@ApiModelProperty("单元设备id")
private String unitId;
@ApiModelProperty("单元设备code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
private String unitTypeName;
@ApiModelProperty("派工原因")
private Integer workReason;
@ApiModelProperty("备注")
private String remark;
}
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-分析批次-单元设备派工表
* </p>
*
* @author hkl
* @since 2023-08-30
*/
@Getter
@Setter
@ApiModel(value = "AnalysisBatchUnitDeviceWork对象", description = "动静态分析-分析批次-单元设备派工表")
public class AnalysisBatchUnitDeviceWorkVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("分析批次单元设备id")
@TableField("analysis_batch_unit_device_id")
private String analysisBatchUnitDeviceId;
@ApiModelProperty("分析批次号")
@TableField("analysis_batch_code")
private String analysisBatchCode;
@ApiModelProperty("分析批id")
@TableField("analysis_batch_id")
private String analysisBatchId;
@ApiModelProperty("单元设备id")
@TableField("unit_id")
private String unitId;
@ApiModelProperty("单元设备code")
@TableField("unit_code")
private String unitCode;
@ApiModelProperty("设备单元类型1-钢轨,2-曲线,3-竖曲线,4-道岔")
@TableField("unit_type")
private Integer unitType;
@ApiModelProperty("设备单元类型名称")
@TableField("unit_type_name")
private String unitTypeName;
@ApiModelProperty("派工原因")
@TableField("work_reason")
private Integer workReason;
@ApiModelProperty("备注")
@TableField("remark")
private String remark;
}
package org.jeecg.modules.dynamicStaticAnalysis.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigTqiLimit;
/**
* <p>
* 动静态分析-配置-TQI管理标准顺质量指数 服务类
* </p>
*
* @author hkl
* @since 2023-09-15
*/
public interface IConfigTqiLimitService extends IService<ConfigTqiLimit> {
}
package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigTqiLimit;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigTqiLimitMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigTqiLimitService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.dynamicStaticAnalysis.vo.ConfigTqiLimitVO;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
* 动静态分析-配置-TQI管理标准顺质量指数 服务实现类
* </p>
*
* @author hkl
* @since 2023-09-15
*/
@Service
public class ConfigTqiLimitServiceImpl extends ServiceImpl<ConfigTqiLimitMapper, ConfigTqiLimit> implements IConfigTqiLimitService {
}
package org.jeecg.modules.dynamicStaticAnalysis.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigTqiLimit;
import java.util.List;
@Data
@ApiModel(value = "ConfigTqiLimitVO对象", description = "动静态分析-检查批次VO")
public class ConfigTqiLimitVO {
@ApiModelProperty("超标类型 1-超标≤10% 2-超标≤20% 3-超标>20%")
@TableField("over_standard_type")
private Integer overStandardType;
@ApiModelProperty("评价等级中文说明")
@TableField("over_standard_type_str")
private String overStandardTypeStr;
@ApiModelProperty("对应权值")
private List<ConfigTqiLimit> configTqiLimits;
}
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