Commit c063a4bb authored by hkl's avatar hkl

feat:1.动静态分析-配置调整

parent c5394326
...@@ -29,7 +29,8 @@ public class CodeGenerate { ...@@ -29,7 +29,8 @@ public class CodeGenerate {
// 表名 // 表名
String[] tables = { String[] tables = {
"t_dsa_config_grade_limit", "t_dsa_config_allow_value",
"t_dsa_config_dispatching",
}; };
......
package org.jeecg.modules.dynamicStaticAnalysis.controller; package org.jeecg.modules.dynamicStaticAnalysis.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -12,18 +11,12 @@ import org.jeecg.common.system.base.controller.JeecgController; ...@@ -12,18 +11,12 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchUnitDeviceDTO; import org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchUnitDeviceDTO;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevice; import org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevice;
import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceService; import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchUnitDeviceService;
import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchQueryVO;
import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO; import org.jeecg.modules.dynamicStaticAnalysis.vo.AnalysisBatchUnitDeviceVO;
import org.jeecg.modules.dynamicStaticAnalysis.vo.CheckBatchVO;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* <p> * <p>
* 动静态分析-分析批次-单元设备 前端控制器 * 动静态分析-分析批次-单元设备 前端控制器
......
...@@ -6,14 +6,12 @@ import io.swagger.annotations.Api; ...@@ -6,14 +6,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.deviceAsset.entity.CurveManagement; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigAllowValue;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AllowValueConfig; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigAllowValueService;
import org.jeecg.modules.dynamicStaticAnalysis.service.IAllowValueConfigService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import java.util.List; import java.util.List;
/** /**
...@@ -22,22 +20,20 @@ import java.util.List; ...@@ -22,22 +20,20 @@ import java.util.List;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@RestController @RestController
@RequestMapping("/dynamicStaticAnalysis/allowValueConfig") @RequestMapping("/dynamicStaticAnalysis/allowValueConfig")
@Api(tags = "动静态分析-参数配置-容许值差") @Api(tags = "动静态分析-参数配置-容许值差")
public class AllowValueConfigController extends JeecgController<AllowValueConfig, IAllowValueConfigService> { public class ConfigAllowValueController extends JeecgController<ConfigAllowValue, IConfigAllowValueService> {
@AutoLog(value = "动静态分析-参数配置-容许值差-查询一条记录") @AutoLog(value = "动静态分析-参数配置-容许值差-查询一条记录")
@ApiOperation(value = "动静态分析-参数配置-容许值差-查询一条记录", notes = "动静态分析-参数配置-容许值差-查询一条记录") @ApiOperation(value = "动静态分析-参数配置-容许值差-查询一条记录", notes = "动静态分析-参数配置-容许值差-查询一条记录")
@GetMapping(value = "/getOneRecord") @GetMapping(value = "/getOneRecord")
public Result<AllowValueConfig> getOneRecord() { public Result<ConfigAllowValue> getOneRecord() {
List<AllowValueConfig> list = this.service.list(); List<ConfigAllowValue> list = this.service.list();
if (ObjectUtil.isEmpty(list)) { if (ObjectUtil.isEmpty(list)) {
AllowValueConfig oneRecord = new AllowValueConfig(); ConfigAllowValue oneRecord = new ConfigAllowValue();
oneRecord.setId(UUIDGenerator.generate()); oneRecord.setId(UUIDGenerator.generate());
oneRecord.setBigTrackGauge(0); oneRecord.setBigTrackGauge(0);
oneRecord.setSmallTrackGauge(0); oneRecord.setSmallTrackGauge(0);
...@@ -59,7 +55,7 @@ public class AllowValueConfigController extends JeecgController<AllowValueConfig ...@@ -59,7 +55,7 @@ public class AllowValueConfigController extends JeecgController<AllowValueConfig
@AutoLog(value = "动静态分析-参数配置-容许值差-编辑") @AutoLog(value = "动静态分析-参数配置-容许值差-编辑")
@ApiOperation(value = "动静态分析-参数配置-容许值差-编辑", notes = "动静态分析-参数配置-容许值差-编辑") @ApiOperation(value = "动静态分析-参数配置-容许值差-编辑", notes = "动静态分析-参数配置-容许值差-编辑")
@PostMapping(value = "/updateRecord") @PostMapping(value = "/updateRecord")
public Result<String> updateRecord(@RequestBody AllowValueConfig allowValueConfig) { public Result<String> updateRecord(@RequestBody ConfigAllowValue allowValueConfig) {
this.service.updateById(allowValueConfig); this.service.updateById(allowValueConfig);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
......
...@@ -7,8 +7,8 @@ import org.jeecg.common.api.vo.Result; ...@@ -7,8 +7,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.dynamicStaticAnalysis.entity.DispatchingConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDispatching;
import org.jeecg.modules.dynamicStaticAnalysis.service.IDispatchingConfigService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigDispatchingService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
...@@ -19,17 +19,18 @@ import java.util.List; ...@@ -19,17 +19,18 @@ import java.util.List;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@RestController @RestController
@RequestMapping("/dynamicStaticAnalysis/dispatchingConfig") @RequestMapping("/dynamicStaticAnalysis/dispatchingConfig")
@Api(tags = "动静态分析-参数配置-派工配置") @Api(tags = "动静态分析-参数配置-容许值差")
public class DispatchingConfigController extends JeecgController<DispatchingConfig, IDispatchingConfigService> { public class ConfigDispatchingController extends JeecgController<ConfigDispatching, IConfigDispatchingService> {
@AutoLog(value = "动静态分析-参数配置-派工配置-查询所有参数") @AutoLog(value = "动静态分析-参数配置-派工配置-查询所有参数")
@ApiOperation(value = "动静态分析-参数配置-派工配置-查询所有参数", notes = "动静态分析-参数配置-派工配置-查询所有参数") @ApiOperation(value = "动静态分析-参数配置-派工配置-查询所有参数", notes = "动静态分析-参数配置-派工配置-查询所有参数")
@GetMapping(value = "/listRecord") @GetMapping(value = "/listRecord")
public Result<List<DispatchingConfig>> listRecord() { public Result<List<ConfigDispatching>> listRecord() {
return Result.OK(this.service.list()); return Result.OK(this.service.list());
} }
...@@ -37,7 +38,7 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf ...@@ -37,7 +38,7 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf
@AutoLog(value = "动静态分析-参数配置-派工配置-新增") @AutoLog(value = "动静态分析-参数配置-派工配置-新增")
@ApiOperation(value = "动静态分析-参数配置-派工配置-新增", notes = "动静态分析-参数配置-派工配置-新增") @ApiOperation(value = "动静态分析-参数配置-派工配置-新增", notes = "动静态分析-参数配置-派工配置-新增")
@PostMapping(value = "/saveRecord") @PostMapping(value = "/saveRecord")
public Result<String> saveRecord(@RequestBody DispatchingConfig record) { public Result<String> saveRecord(@RequestBody ConfigDispatching record) {
record.setId(UUIDGenerator.generate()); record.setId(UUIDGenerator.generate());
this.service.save(record); this.service.save(record);
return Result.OK("操作成功"); return Result.OK("操作成功");
...@@ -47,9 +48,8 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf ...@@ -47,9 +48,8 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf
@AutoLog(value = "动静态分析-参数配置-派工配置-批量更新") @AutoLog(value = "动静态分析-参数配置-派工配置-批量更新")
@ApiOperation(value = "动静态分析-参数配置-派工配置-批量更新", notes = "动静态分析-参数配置-派工配置-批量更新") @ApiOperation(value = "动静态分析-参数配置-派工配置-批量更新", notes = "动静态分析-参数配置-派工配置-批量更新")
@PostMapping(value = "/batchUpdateRecord") @PostMapping(value = "/batchUpdateRecord")
public Result<String> batchUpdateRecord(@RequestBody List<DispatchingConfig> records) { public Result<String> batchUpdateRecord(@RequestBody List<ConfigDispatching> records) {
this.service.updateBatchById(records); this.service.updateBatchById(records);
return Result.OK("操作成功"); return Result.OK("操作成功");
} }
} }
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigInstrumentCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigInstrumentCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigInstrumentCheckService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigInstrumentCheckService;
...@@ -30,15 +31,13 @@ public class ConfigInstrumentCheckController extends JeecgController<ConfigInstr ...@@ -30,15 +31,13 @@ public class ConfigInstrumentCheckController extends JeecgController<ConfigInstr
@AutoLog(value = "动静态分析-配置参数-添乘仪检查超限权值-获取记录") @AutoLog(value = "动静态分析-配置参数-添乘仪检查超限权值-获取记录")
@ApiOperation(value = "动静态分析-配置参数-添乘仪检查超限权值-获取记录", notes = "动静态分析-配置参数-添乘仪检查超限权值-获取记录") @ApiOperation(value = "动静态分析-配置参数-添乘仪检查超限权值-获取记录", notes = "动静态分析-配置参数-添乘仪检查超限权值-获取记录")
@GetMapping(value = "/oneRecord") @GetMapping(value = "/listRecord")
public Result<ConfigInstrumentCheck> oneRecord() { public Result<List<ConfigInstrumentCheck>> listRecord() {
ConfigInstrumentCheck oneRecord = this.service.lambdaQuery() List<ConfigInstrumentCheck> records = this.service.listRecord();
.eq(ConfigInstrumentCheck::getDelFlag, 0) return Result.OK(records);
.last("limit 1")
.one();
return Result.OK(oneRecord);
} }
@AutoLog(value = "动静态分析-配置参数-添乘仪检查超限权值-更新参数") @AutoLog(value = "动静态分析-配置参数-添乘仪检查超限权值-更新参数")
@ApiOperation(value = "动静态分析-配置参数-添乘仪检查超限权值-更新参数", notes = "动静态分析-配置参数-添乘仪检查超限权值-更新参数") @ApiOperation(value = "动静态分析-配置参数-添乘仪检查超限权值-更新参数", notes = "动静态分析-配置参数-添乘仪检查超限权值-更新参数")
@PostMapping(value = "/updateRecord") @PostMapping(value = "/updateRecord")
......
...@@ -7,9 +7,12 @@ import org.jeecg.common.api.vo.Result; ...@@ -7,9 +7,12 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigLabourCheckService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigLabourCheckService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-人工检查超限权值 前端控制器 * 动静态分析-配置-人工检查超限权值 前端控制器
...@@ -25,13 +28,10 @@ public class ConfigLabourCheckController extends JeecgController<ConfigLabourChe ...@@ -25,13 +28,10 @@ public class ConfigLabourCheckController extends JeecgController<ConfigLabourChe
@AutoLog(value = "动静态分析-配置参数-人工检查超限权值-获取记录") @AutoLog(value = "动静态分析-配置参数-人工检查超限权值-获取记录")
@ApiOperation(value = "动静态分析-配置参数-人工检查超限权值-获取记录", notes = "动静态分析-配置参数-人工检查超限权值-获取记录") @ApiOperation(value = "动静态分析-配置参数-人工检查超限权值-获取记录", notes = "动静态分析-配置参数-人工检查超限权值-获取记录")
@GetMapping(value = "/oneRecord") @GetMapping(value = "/listRecord")
public Result<ConfigLabourCheck> oneRecord() { public Result<List<ConfigLabourCheck>> listRecord() {
ConfigLabourCheck oneRecord = this.service.lambdaQuery() List<ConfigLabourCheck> records = this.service.listRecord();
.eq(ConfigLabourCheck::getDelFlag, 0) return Result.OK(records);
.last("limit 1")
.one();
return Result.OK(oneRecord);
} }
@AutoLog(value = "动静态分析-配置参数-人工检查超限权值-更新参数") @AutoLog(value = "动静态分析-配置参数-人工检查超限权值-更新参数")
......
...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*; ...@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-轨检仪检查超限权值 前端控制器 * 动静态分析-配置-轨检仪检查超限权值 前端控制器
...@@ -24,16 +26,12 @@ import org.jeecg.common.system.base.controller.JeecgController; ...@@ -24,16 +26,12 @@ import org.jeecg.common.system.base.controller.JeecgController;
@RequestMapping("/dynamicStaticAnalysis/configRailDeviceCheck") @RequestMapping("/dynamicStaticAnalysis/configRailDeviceCheck")
@Api(tags = "动静态分析-配置参数-轨检仪检查超限权值") @Api(tags = "动静态分析-配置参数-轨检仪检查超限权值")
public class ConfigRailDeviceCheckController extends JeecgController<ConfigRailDeviceCheck, IConfigRailDeviceCheckService> { public class ConfigRailDeviceCheckController extends JeecgController<ConfigRailDeviceCheck, IConfigRailDeviceCheckService> {
@AutoLog(value = "动静态分析-配置参数-轨检仪检查超限权值-获取记录")
@AutoLog(value = "动静态分析-配置参数-人工检查超限权值-获取记录") @ApiOperation(value = "动静态分析-配置参数-轨检仪检查超限权值-获取记录", notes = "动静态分析-配置参数-轨检仪检查超限权值-获取记录")
@ApiOperation(value = "动静态分析-配置参数-人工检查超限权值-获取记录", notes = "动静态分析-配置参数-人工检查超限权值-获取记录") @GetMapping(value = "/listRecord")
@GetMapping(value = "/oneRecord") public Result<List<ConfigRailDeviceCheck>> listRecord() {
public Result<ConfigRailDeviceCheck> oneRecord() { List<ConfigRailDeviceCheck> records = this.service.listRecord();
ConfigRailDeviceCheck oneRecord = this.service.lambdaQuery() return Result.OK(records);
.eq(ConfigRailDeviceCheck::getDelFlag, 0)
.last("limit 1")
.one();
return Result.OK(oneRecord);
} }
@AutoLog(value = "动静态分析-配置参数-人工检查超限权值-更新参数") @AutoLog(value = "动静态分析-配置参数-人工检查超限权值-更新参数")
......
...@@ -16,13 +16,13 @@ import lombok.Setter; ...@@ -16,13 +16,13 @@ import lombok.Setter;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@Getter @Getter
@Setter @Setter
@TableName("t_dsa_allow_value_config") @TableName("t_dsa_config_allow_value")
@ApiModel(value = "AllowValueConfig对象", description = "动静态分析-参数配置-容许值差") @ApiModel(value = "ConfigAllowValue对象", description = "动静态分析-参数配置-容许值差")
public class AllowValueConfig implements Serializable { public class ConfigAllowValue implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -16,13 +16,13 @@ import lombok.Setter; ...@@ -16,13 +16,13 @@ import lombok.Setter;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@Getter @Getter
@Setter @Setter
@TableName("t_dsa_dispatching_config") @TableName("t_dsa_config_dispatching")
@ApiModel(value = "DispatchingConfig对象", description = "动静态分析-参数配置-派工配置") @ApiModel(value = "ConfigDispatching对象", description = "动静态分析-参数配置-派工配置")
public class DispatchingConfig implements Serializable { public class ConfigDispatching implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -54,7 +54,7 @@ public class DispatchingConfig implements Serializable { ...@@ -54,7 +54,7 @@ public class DispatchingConfig implements Serializable {
@TableField("reason_label") @TableField("reason_label")
private String reasonLabel; private String reasonLabel;
@ApiModelProperty("派工") @ApiModelProperty("派工code")
@TableField("reason_value") @TableField("reason_value")
private String reasonValue; private String reasonValue;
......
...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity; ...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
...@@ -46,6 +48,22 @@ public class ConfigInstrumentCheck implements Serializable { ...@@ -46,6 +48,22 @@ public class ConfigInstrumentCheck implements Serializable {
@TableField("update_time") @TableField("update_time")
private Date updateTime; private Date updateTime;
@ApiModelProperty("速度下限")
@TableField("speed_min")
private Integer speedMin;
@ApiModelProperty("速度上限")
@TableField("speed_max")
private Integer speedMax;
@ApiModelProperty("数据字典值")
@TableField("dict_value")
private String dictValue;
@ApiModelProperty("数据字典标签")
@TableField("dict_label")
private String dictLabel;
@ApiModelProperty("钢轨") @ApiModelProperty("钢轨")
@TableField("rail") @TableField("rail")
private String rail; private String rail;
......
...@@ -48,6 +48,22 @@ public class ConfigLabourCheck implements Serializable { ...@@ -48,6 +48,22 @@ public class ConfigLabourCheck implements Serializable {
@TableField("update_time") @TableField("update_time")
private Date updateTime; private Date updateTime;
@ApiModelProperty("数据字典值")
@TableField("dict_value")
private String dictValue;
@ApiModelProperty("数据字典标签")
@TableField("dict_label")
private String dictLabel;
@ApiModelProperty("速度下限")
@TableField("speed_min")
private Integer speedMin;
@ApiModelProperty("速度上限")
@TableField("speed_max")
private Integer speedMax;
@ApiModelProperty("钢轨") @ApiModelProperty("钢轨")
@TableField("rail") @TableField("rail")
private String rail; private String rail;
......
...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity; ...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
...@@ -46,6 +48,22 @@ public class ConfigRailDeviceCheck implements Serializable { ...@@ -46,6 +48,22 @@ public class ConfigRailDeviceCheck implements Serializable {
@TableField("update_time") @TableField("update_time")
private Date updateTime; private Date updateTime;
@ApiModelProperty("数据字典值")
@TableField("dict_value")
private String dictValue;
@ApiModelProperty("数据字典标签")
@TableField("dict_label")
private String dictLabel;
@ApiModelProperty("速度下限")
@TableField("speed_min")
private Integer speedMin;
@ApiModelProperty("速度上限")
@TableField("speed_max")
private Integer speedMax;
@ApiModelProperty("钢轨") @ApiModelProperty("钢轨")
@TableField("rail") @TableField("rail")
private String rail; private String rail;
......
...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity; ...@@ -3,8 +3,10 @@ package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
...@@ -46,10 +48,6 @@ public class ConfigRailVehicleCheck implements Serializable { ...@@ -46,10 +48,6 @@ public class ConfigRailVehicleCheck implements Serializable {
@TableField("update_time") @TableField("update_time")
private Date updateTime; private Date updateTime;
@ApiModelProperty("速度等级")
@TableField("speed_expression")
private String speedExpression;
@ApiModelProperty("数据字典值") @ApiModelProperty("数据字典值")
@TableField("dict_value") @TableField("dict_value")
private String dictValue; private String dictValue;
......
package org.jeecg.modules.dynamicStaticAnalysis.mapper; package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AllowValueConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigAllowValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
public interface AllowValueConfigMapper extends BaseMapper<AllowValueConfig> { public interface ConfigAllowValueMapper extends BaseMapper<ConfigAllowValue> {
} }
package org.jeecg.modules.dynamicStaticAnalysis.mapper; package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.DispatchingConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDispatching;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
public interface DispatchingConfigMapper extends BaseMapper<DispatchingConfig> { public interface ConfigDispatchingMapper extends BaseMapper<ConfigDispatching> {
} }
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.AllowValueConfigMapper"> <mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigAllowValueMapper">
</mapper> </mapper>
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.DispatchingConfigMapper"> <mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDispatchingMapper">
</mapper> </mapper>
package org.jeecg.modules.dynamicStaticAnalysis.service; package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AllowValueConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigAllowValue;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
public interface IAllowValueConfigService extends IService<AllowValueConfig> { public interface IConfigAllowValueService extends IService<ConfigAllowValue> {
} }
package org.jeecg.modules.dynamicStaticAnalysis.service; package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.DispatchingConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDispatching;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
public interface IDispatchingConfigService extends IService<DispatchingConfig> { public interface IConfigDispatchingService extends IService<ConfigDispatching> {
} }
...@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service; ...@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-人工检查超限权值 服务类 * 动静态分析-配置-人工检查超限权值 服务类
...@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IConfigLabourCheckService extends IService<ConfigLabourCheck> { public interface IConfigLabourCheckService extends IService<ConfigLabourCheck> {
List<ConfigLabourCheck> listRecord();
} }
...@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service; ...@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-轨检仪检查超限权值 服务类 * 动静态分析-配置-轨检仪检查超限权值 服务类
...@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/ */
public interface IConfigRailDeviceCheckService extends IService<ConfigRailDeviceCheck> { public interface IConfigRailDeviceCheckService extends IService<ConfigRailDeviceCheck> {
List<ConfigRailDeviceCheck> listRecord();
} }
package org.jeecg.modules.dynamicStaticAnalysis.service.impl; package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.AllowValueConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigAllowValue;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.AllowValueConfigMapper; import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigAllowValueMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IAllowValueConfigService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigAllowValueService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service; ...@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@Service @Service
public class AllowValueConfigServiceImpl extends ServiceImpl<AllowValueConfigMapper, AllowValueConfig> implements IAllowValueConfigService { public class ConfigAllowValueServiceImpl extends ServiceImpl<ConfigAllowValueMapper, ConfigAllowValue> implements IConfigAllowValueService {
} }
package org.jeecg.modules.dynamicStaticAnalysis.service.impl; package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.DispatchingConfig; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDispatching;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.DispatchingConfigMapper; import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDispatchingMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IDispatchingConfigService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigDispatchingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service; ...@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
* </p> * </p>
* *
* @author hkl * @author hkl
* @since 2023-07-25 * @since 2023-08-03
*/ */
@Service @Service
public class DispatchingConfigServiceImpl extends ServiceImpl<DispatchingConfigMapper, DispatchingConfig> implements IDispatchingConfigService { public class ConfigDispatchingServiceImpl extends ServiceImpl<ConfigDispatchingMapper, ConfigDispatching> implements IConfigDispatchingService {
} }
package org.jeecg.modules.dynamicStaticAnalysis.service.impl; package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigLabourCheckMapper; import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigLabourCheckMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigLabourCheckService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigLabourCheckService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-人工检查超限权值 服务实现类 * 动静态分析-配置-人工检查超限权值 服务实现类
...@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
@Service @Service
public class ConfigLabourCheckServiceImpl extends ServiceImpl<ConfigLabourCheckMapper, ConfigLabourCheck> implements IConfigLabourCheckService { public class ConfigLabourCheckServiceImpl extends ServiceImpl<ConfigLabourCheckMapper, ConfigLabourCheck> implements IConfigLabourCheckService {
@Override
public List<ConfigLabourCheck> listRecord() {
List<ConfigLabourCheck> records = this.lambdaQuery().eq(ConfigLabourCheck::getDelFlag, "0").list();
return records;
}
} }
package org.jeecg.modules.dynamicStaticAnalysis.service.impl; package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck; import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigRailDeviceCheckMapper; import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigRailDeviceCheckMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigRailDeviceCheckService; import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigRailDeviceCheckService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 动静态分析-配置-轨检仪检查超限权值 服务实现类 * 动静态分析-配置-轨检仪检查超限权值 服务实现类
...@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
@Service @Service
public class ConfigRailDeviceCheckServiceImpl extends ServiceImpl<ConfigRailDeviceCheckMapper, ConfigRailDeviceCheck> implements IConfigRailDeviceCheckService { public class ConfigRailDeviceCheckServiceImpl extends ServiceImpl<ConfigRailDeviceCheckMapper, ConfigRailDeviceCheck> implements IConfigRailDeviceCheckService {
@Override
public List<ConfigRailDeviceCheck> listRecord() {
List<ConfigRailDeviceCheck> records = this.lambdaQuery().eq(ConfigRailDeviceCheck::getDelFlag, "0").list();
return records;
}
} }
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