Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZTGK
hzsomms
Commits
c063a4bb
Commit
c063a4bb
authored
1 year ago
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.动静态分析-配置调整
parent
c5394326
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
180 additions
and
81 deletions
+180
-81
CodeGenerate.java
...em/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
+2
-1
AnalysisBatchUnitDeviceController.java
...nalysis/controller/AnalysisBatchUnitDeviceController.java
+0
-7
ConfigAllowValueController.java
...StaticAnalysis/controller/ConfigAllowValueController.java
+9
-13
ConfigDispatchingController.java
...taticAnalysis/controller/ConfigDispatchingController.java
+9
-9
ConfigInstrumentCheckController.java
...cAnalysis/controller/ConfigInstrumentCheckController.java
+6
-7
ConfigLabourCheckController.java
...taticAnalysis/controller/ConfigLabourCheckController.java
+7
-7
ConfigRailDeviceCheckController.java
...cAnalysis/controller/ConfigRailDeviceCheckController.java
+8
-10
ConfigAllowValue.java
...odules/dynamicStaticAnalysis/entity/ConfigAllowValue.java
+4
-4
ConfigDispatching.java
...dules/dynamicStaticAnalysis/entity/ConfigDispatching.java
+5
-5
ConfigInstrumentCheck.java
...s/dynamicStaticAnalysis/entity/ConfigInstrumentCheck.java
+18
-0
ConfigLabourCheck.java
...dules/dynamicStaticAnalysis/entity/ConfigLabourCheck.java
+16
-0
ConfigRailDeviceCheck.java
...s/dynamicStaticAnalysis/entity/ConfigRailDeviceCheck.java
+18
-0
ConfigRailVehicleCheck.java
.../dynamicStaticAnalysis/entity/ConfigRailVehicleCheck.java
+2
-4
ConfigAllowValueMapper.java
.../dynamicStaticAnalysis/mapper/ConfigAllowValueMapper.java
+3
-3
ConfigDispatchingMapper.java
...dynamicStaticAnalysis/mapper/ConfigDispatchingMapper.java
+3
-3
ConfigAllowValueMapper.xml
...namicStaticAnalysis/mapper/xml/ConfigAllowValueMapper.xml
+1
-1
ConfigDispatchingMapper.xml
...amicStaticAnalysis/mapper/xml/ConfigDispatchingMapper.xml
+1
-1
IConfigAllowValueService.java
...namicStaticAnalysis/service/IConfigAllowValueService.java
+3
-3
IConfigDispatchingService.java
...amicStaticAnalysis/service/IConfigDispatchingService.java
+3
-3
IConfigLabourCheckService.java
...amicStaticAnalysis/service/IConfigLabourCheckService.java
+3
-0
IConfigRailDeviceCheckService.java
...StaticAnalysis/service/IConfigRailDeviceCheckService.java
+3
-0
ConfigAllowValueServiceImpl.java
...ticAnalysis/service/impl/ConfigAllowValueServiceImpl.java
+20
-0
ConfigDispatchingServiceImpl.java
...icAnalysis/service/impl/ConfigDispatchingServiceImpl.java
+20
-0
ConfigLabourCheckServiceImpl.java
...icAnalysis/service/impl/ConfigLabourCheckServiceImpl.java
+8
-0
ConfigRailDeviceCheckServiceImpl.java
...alysis/service/impl/ConfigRailDeviceCheckServiceImpl.java
+8
-0
No files found.
jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
View file @
c063a4bb
...
...
@@ -29,7 +29,8 @@ public class CodeGenerate {
// 表名
String
[]
tables
=
{
"t_dsa_config_grade_limit"
,
"t_dsa_config_allow_value"
,
"t_dsa_config_dispatching"
,
};
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/AnalysisBatchUnitDeviceController.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
controller
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
...
...
@@ -12,18 +11,12 @@ import org.jeecg.common.system.base.controller.JeecgController;
import
org.jeecg.modules.dynamicStaticAnalysis.dto.AnalysisBatchUnitDeviceDTO
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.AnalysisBatchUnitDevice
;
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.CheckBatchVO
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* <p>
* 动静态分析-分析批次-单元设备 前端控制器
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/
AllowValueConfig
Controller.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/
ConfigAllowValue
Controller.java
View file @
c063a4bb
...
...
@@ -6,14 +6,12 @@ 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.system.base.controller.JeecgController
;
import
org.jeecg.common.util.UUIDGenerator
;
import
org.jeecg.modules.deviceAsset.entity.CurveManagement
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.AllowValueConfig
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.IAllowValueConfigService
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigAllowValue
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.IConfigAllowValueService
;
import
org.springframework.web.bind.annotation.*
;
import
org.jeecg.common.system.base.controller.JeecgController
;
import
java.util.List
;
/**
...
...
@@ -22,22 +20,20 @@ import java.util.List;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@RestController
@RequestMapping
(
"/dynamicStaticAnalysis/allowValueConfig"
)
@Api
(
tags
=
"动静态分析-参数配置-容许值差"
)
public
class
AllowValueConfigController
extends
JeecgController
<
AllowValueConfig
,
IAllowValueConfigService
>
{
public
class
ConfigAllowValueController
extends
JeecgController
<
ConfigAllowValue
,
IConfigAllowValueService
>
{
@AutoLog
(
value
=
"动静态分析-参数配置-容许值差-查询一条记录"
)
@ApiOperation
(
value
=
"动静态分析-参数配置-容许值差-查询一条记录"
,
notes
=
"动静态分析-参数配置-容许值差-查询一条记录"
)
@GetMapping
(
value
=
"/getOneRecord"
)
public
Result
<
AllowValueConfig
>
getOneRecord
()
{
List
<
AllowValueConfig
>
list
=
this
.
service
.
list
();
public
Result
<
ConfigAllowValue
>
getOneRecord
()
{
List
<
ConfigAllowValue
>
list
=
this
.
service
.
list
();
if
(
ObjectUtil
.
isEmpty
(
list
))
{
AllowValueConfig
oneRecord
=
new
AllowValueConfig
();
ConfigAllowValue
oneRecord
=
new
ConfigAllowValue
();
oneRecord
.
setId
(
UUIDGenerator
.
generate
());
oneRecord
.
setBigTrackGauge
(
0
);
oneRecord
.
setSmallTrackGauge
(
0
);
...
...
@@ -59,7 +55,7 @@ public class AllowValueConfigController extends JeecgController<AllowValueConfig
@AutoLog
(
value
=
"动静态分析-参数配置-容许值差-编辑"
)
@ApiOperation
(
value
=
"动静态分析-参数配置-容许值差-编辑"
,
notes
=
"动静态分析-参数配置-容许值差-编辑"
)
@PostMapping
(
value
=
"/updateRecord"
)
public
Result
<
String
>
updateRecord
(
@RequestBody
AllowValueConfig
allowValueConfig
)
{
public
Result
<
String
>
updateRecord
(
@RequestBody
ConfigAllowValue
allowValueConfig
)
{
this
.
service
.
updateById
(
allowValueConfig
);
return
Result
.
OK
(
"编辑成功!"
);
}
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/
DispatchingConfi
gController.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/
ConfigDispatchin
gController.java
View file @
c063a4bb
...
...
@@ -7,8 +7,8 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.base.controller.JeecgController
;
import
org.jeecg.common.util.UUIDGenerator
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
DispatchingConfi
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
DispatchingConfi
gService
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
ConfigDispatchin
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
ConfigDispatchin
gService
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
...
...
@@ -19,17 +19,18 @@ import java.util.List;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@RestController
@RequestMapping
(
"/dynamicStaticAnalysis/dispatchingConfig"
)
@Api
(
tags
=
"动静态分析-参数配置-派工配置"
)
public
class
DispatchingConfigController
extends
JeecgController
<
DispatchingConfig
,
IDispatchingConfigService
>
{
@Api
(
tags
=
"动静态分析-参数配置-容许值差"
)
public
class
ConfigDispatchingController
extends
JeecgController
<
ConfigDispatching
,
IConfigDispatchingService
>
{
@AutoLog
(
value
=
"动静态分析-参数配置-派工配置-查询所有参数"
)
@ApiOperation
(
value
=
"动静态分析-参数配置-派工配置-查询所有参数"
,
notes
=
"动静态分析-参数配置-派工配置-查询所有参数"
)
@GetMapping
(
value
=
"/listRecord"
)
public
Result
<
List
<
DispatchingConfi
g
>>
listRecord
()
{
public
Result
<
List
<
ConfigDispatchin
g
>>
listRecord
()
{
return
Result
.
OK
(
this
.
service
.
list
());
}
...
...
@@ -37,7 +38,7 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf
@AutoLog
(
value
=
"动静态分析-参数配置-派工配置-新增"
)
@ApiOperation
(
value
=
"动静态分析-参数配置-派工配置-新增"
,
notes
=
"动静态分析-参数配置-派工配置-新增"
)
@PostMapping
(
value
=
"/saveRecord"
)
public
Result
<
String
>
saveRecord
(
@RequestBody
DispatchingConfi
g
record
)
{
public
Result
<
String
>
saveRecord
(
@RequestBody
ConfigDispatchin
g
record
)
{
record
.
setId
(
UUIDGenerator
.
generate
());
this
.
service
.
save
(
record
);
return
Result
.
OK
(
"操作成功"
);
...
...
@@ -47,9 +48,8 @@ public class DispatchingConfigController extends JeecgController<DispatchingConf
@AutoLog
(
value
=
"动静态分析-参数配置-派工配置-批量更新"
)
@ApiOperation
(
value
=
"动静态分析-参数配置-派工配置-批量更新"
,
notes
=
"动静态分析-参数配置-派工配置-批量更新"
)
@PostMapping
(
value
=
"/batchUpdateRecord"
)
public
Result
<
String
>
batchUpdateRecord
(
@RequestBody
List
<
DispatchingConfi
g
>
records
)
{
public
Result
<
String
>
batchUpdateRecord
(
@RequestBody
List
<
ConfigDispatchin
g
>
records
)
{
this
.
service
.
updateBatchById
(
records
);
return
Result
.
OK
(
"操作成功"
);
}
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/ConfigInstrumentCheckController.java
View file @
c063a4bb
...
...
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
import
org.jeecg.common.api.vo.Result
;
import
org.jeecg.common.aspect.annotation.AutoLog
;
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.ConfigRailVehicleCheck
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.IConfigInstrumentCheckService
;
...
...
@@ -30,15 +31,13 @@ public class ConfigInstrumentCheckController extends JeecgController<ConfigInstr
@AutoLog
(
value
=
"动静态分析-配置参数-添乘仪检查超限权值-获取记录"
)
@ApiOperation
(
value
=
"动静态分析-配置参数-添乘仪检查超限权值-获取记录"
,
notes
=
"动静态分析-配置参数-添乘仪检查超限权值-获取记录"
)
@GetMapping
(
value
=
"/oneRecord"
)
public
Result
<
ConfigInstrumentCheck
>
oneRecord
()
{
ConfigInstrumentCheck
oneRecord
=
this
.
service
.
lambdaQuery
()
.
eq
(
ConfigInstrumentCheck:
:
getDelFlag
,
0
)
.
last
(
"limit 1"
)
.
one
();
return
Result
.
OK
(
oneRecord
);
@GetMapping
(
value
=
"/listRecord"
)
public
Result
<
List
<
ConfigInstrumentCheck
>>
listRecord
()
{
List
<
ConfigInstrumentCheck
>
records
=
this
.
service
.
listRecord
();
return
Result
.
OK
(
records
);
}
@AutoLog
(
value
=
"动静态分析-配置参数-添乘仪检查超限权值-更新参数"
)
@ApiOperation
(
value
=
"动静态分析-配置参数-添乘仪检查超限权值-更新参数"
,
notes
=
"动静态分析-配置参数-添乘仪检查超限权值-更新参数"
)
@PostMapping
(
value
=
"/updateRecord"
)
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/ConfigLabourCheckController.java
View file @
c063a4bb
...
...
@@ -7,9 +7,12 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.base.controller.JeecgController
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailVehicleCheck
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.IConfigLabourCheckService
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-人工检查超限权值 前端控制器
...
...
@@ -25,13 +28,10 @@ public class ConfigLabourCheckController extends JeecgController<ConfigLabourChe
@AutoLog
(
value
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
)
@ApiOperation
(
value
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
,
notes
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
)
@GetMapping
(
value
=
"/oneRecord"
)
public
Result
<
ConfigLabourCheck
>
oneRecord
()
{
ConfigLabourCheck
oneRecord
=
this
.
service
.
lambdaQuery
()
.
eq
(
ConfigLabourCheck:
:
getDelFlag
,
0
)
.
last
(
"limit 1"
)
.
one
();
return
Result
.
OK
(
oneRecord
);
@GetMapping
(
value
=
"/listRecord"
)
public
Result
<
List
<
ConfigLabourCheck
>>
listRecord
()
{
List
<
ConfigLabourCheck
>
records
=
this
.
service
.
listRecord
();
return
Result
.
OK
(
records
);
}
@AutoLog
(
value
=
"动静态分析-配置参数-人工检查超限权值-更新参数"
)
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/ConfigRailDeviceCheckController.java
View file @
c063a4bb
...
...
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.*;
import
org.jeecg.common.system.base.controller.JeecgController
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-轨检仪检查超限权值 前端控制器
...
...
@@ -24,16 +26,12 @@ import org.jeecg.common.system.base.controller.JeecgController;
@RequestMapping
(
"/dynamicStaticAnalysis/configRailDeviceCheck"
)
@Api
(
tags
=
"动静态分析-配置参数-轨检仪检查超限权值"
)
public
class
ConfigRailDeviceCheckController
extends
JeecgController
<
ConfigRailDeviceCheck
,
IConfigRailDeviceCheckService
>
{
@AutoLog
(
value
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
)
@ApiOperation
(
value
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
,
notes
=
"动静态分析-配置参数-人工检查超限权值-获取记录"
)
@GetMapping
(
value
=
"/oneRecord"
)
public
Result
<
ConfigRailDeviceCheck
>
oneRecord
()
{
ConfigRailDeviceCheck
oneRecord
=
this
.
service
.
lambdaQuery
()
.
eq
(
ConfigRailDeviceCheck:
:
getDelFlag
,
0
)
.
last
(
"limit 1"
)
.
one
();
return
Result
.
OK
(
oneRecord
);
@AutoLog
(
value
=
"动静态分析-配置参数-轨检仪检查超限权值-获取记录"
)
@ApiOperation
(
value
=
"动静态分析-配置参数-轨检仪检查超限权值-获取记录"
,
notes
=
"动静态分析-配置参数-轨检仪检查超限权值-获取记录"
)
@GetMapping
(
value
=
"/listRecord"
)
public
Result
<
List
<
ConfigRailDeviceCheck
>>
listRecord
()
{
List
<
ConfigRailDeviceCheck
>
records
=
this
.
service
.
listRecord
();
return
Result
.
OK
(
records
);
}
@AutoLog
(
value
=
"动静态分析-配置参数-人工检查超限权值-更新参数"
)
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/
AllowValueConfig
.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/
ConfigAllowValue
.java
View file @
c063a4bb
...
...
@@ -16,13 +16,13 @@ import lombok.Setter;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@Getter
@Setter
@TableName
(
"t_dsa_
allow_value_config
"
)
@ApiModel
(
value
=
"
AllowValueConfig
对象"
,
description
=
"动静态分析-参数配置-容许值差"
)
public
class
AllowValueConfig
implements
Serializable
{
@TableName
(
"t_dsa_
config_allow_value
"
)
@ApiModel
(
value
=
"
ConfigAllowValue
对象"
,
description
=
"动静态分析-参数配置-容许值差"
)
public
class
ConfigAllowValue
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/
DispatchingConfi
g.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/
ConfigDispatchin
g.java
View file @
c063a4bb
...
...
@@ -16,13 +16,13 @@ import lombok.Setter;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@Getter
@Setter
@TableName
(
"t_dsa_
dispatching_confi
g"
)
@ApiModel
(
value
=
"
DispatchingConfi
g对象"
,
description
=
"动静态分析-参数配置-派工配置"
)
public
class
DispatchingConfi
g
implements
Serializable
{
@TableName
(
"t_dsa_
config_dispatchin
g"
)
@ApiModel
(
value
=
"
ConfigDispatchin
g对象"
,
description
=
"动静态分析-参数配置-派工配置"
)
public
class
ConfigDispatchin
g
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -54,7 +54,7 @@ public class DispatchingConfig implements Serializable {
@TableField
(
"reason_label"
)
private
String
reasonLabel
;
@ApiModelProperty
(
"派工
值
"
)
@ApiModelProperty
(
"派工
code
"
)
@TableField
(
"reason_value"
)
private
String
reasonValue
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigInstrumentCheck.java
View file @
c063a4bb
...
...
@@ -3,8 +3,10 @@ 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
;
...
...
@@ -46,6 +48,22 @@ public class ConfigInstrumentCheck implements Serializable {
@TableField
(
"update_time"
)
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
(
"钢轨"
)
@TableField
(
"rail"
)
private
String
rail
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigLabourCheck.java
View file @
c063a4bb
...
...
@@ -48,6 +48,22 @@ public class ConfigLabourCheck implements Serializable {
@TableField
(
"update_time"
)
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
(
"钢轨"
)
@TableField
(
"rail"
)
private
String
rail
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigRailDeviceCheck.java
View file @
c063a4bb
...
...
@@ -3,8 +3,10 @@ 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
;
...
...
@@ -46,6 +48,22 @@ public class ConfigRailDeviceCheck implements Serializable {
@TableField
(
"update_time"
)
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
(
"钢轨"
)
@TableField
(
"rail"
)
private
String
rail
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigRailVehicleCheck.java
View file @
c063a4bb
...
...
@@ -3,8 +3,10 @@ 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
;
...
...
@@ -46,10 +48,6 @@ public class ConfigRailVehicleCheck implements Serializable {
@TableField
(
"update_time"
)
private
Date
updateTime
;
@ApiModelProperty
(
"速度等级"
)
@TableField
(
"speed_expression"
)
private
String
speedExpression
;
@ApiModelProperty
(
"数据字典值"
)
@TableField
(
"dict_value"
)
private
String
dictValue
;
...
...
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/
AllowValueConfig
Mapper.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/
ConfigAllowValue
Mapper.java
View file @
c063a4bb
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
;
/**
...
...
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
public
interface
AllowValueConfigMapper
extends
BaseMapper
<
AllowValueConfig
>
{
public
interface
ConfigAllowValueMapper
extends
BaseMapper
<
ConfigAllowValue
>
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/
DispatchingConfi
gMapper.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/
ConfigDispatchin
gMapper.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
mapper
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
DispatchingConfi
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
ConfigDispatchin
g
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
...
...
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
public
interface
DispatchingConfigMapper
extends
BaseMapper
<
DispatchingConfi
g
>
{
public
interface
ConfigDispatchingMapper
extends
BaseMapper
<
ConfigDispatchin
g
>
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/
AllowValueConfig
Mapper.xml
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/
ConfigAllowValue
Mapper.xml
View file @
c063a4bb
<?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.
AllowValueConfig
Mapper"
>
<mapper
namespace=
"org.jeecg.modules.dynamicStaticAnalysis.mapper.
ConfigAllowValue
Mapper"
>
</mapper>
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/
DispatchingConfi
gMapper.xml
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/
ConfigDispatchin
gMapper.xml
View file @
c063a4bb
<?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.
DispatchingConfi
gMapper"
>
<mapper
namespace=
"org.jeecg.modules.dynamicStaticAnalysis.mapper.
ConfigDispatchin
gMapper"
>
</mapper>
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/I
AllowValueConfig
Service.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/I
ConfigAllowValue
Service.java
View file @
c063a4bb
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
;
/**
...
...
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
public
interface
I
AllowValueConfigService
extends
IService
<
AllowValueConfig
>
{
public
interface
I
ConfigAllowValueService
extends
IService
<
ConfigAllowValue
>
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/I
DispatchingConfi
gService.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/I
ConfigDispatchin
gService.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
service
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
DispatchingConfi
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
ConfigDispatchin
g
;
import
com.baomidou.mybatisplus.extension.service.IService
;
/**
...
...
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
public
interface
I
DispatchingConfigService
extends
IService
<
DispatchingConfi
g
>
{
public
interface
I
ConfigDispatchingService
extends
IService
<
ConfigDispatchin
g
>
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigLabourCheckService.java
View file @
c063a4bb
...
...
@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigLabourCheck
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-人工检查超限权值 服务类
...
...
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public
interface
IConfigLabourCheckService
extends
IService
<
ConfigLabourCheck
>
{
List
<
ConfigLabourCheck
>
listRecord
();
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigRailDeviceCheckService.java
View file @
c063a4bb
...
...
@@ -3,6 +3,8 @@ package org.jeecg.modules.dynamicStaticAnalysis.service;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigRailDeviceCheck
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-轨检仪检查超限权值 服务类
...
...
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public
interface
IConfigRailDeviceCheckService
extends
IService
<
ConfigRailDeviceCheck
>
{
List
<
ConfigRailDeviceCheck
>
listRecord
();
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/
AllowValueConfig
ServiceImpl.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/
ConfigAllowValue
ServiceImpl.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
service
.
impl
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
AllowValueConfig
;
import
org.jeecg.modules.dynamicStaticAnalysis.mapper.
AllowValueConfig
Mapper
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
AllowValueConfig
Service
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
ConfigAllowValue
;
import
org.jeecg.modules.dynamicStaticAnalysis.mapper.
ConfigAllowValue
Mapper
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
ConfigAllowValue
Service
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
...
...
@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@Service
public
class
AllowValueConfigServiceImpl
extends
ServiceImpl
<
AllowValueConfigMapper
,
AllowValueConfig
>
implements
IAllowValueConfig
Service
{
public
class
ConfigAllowValueServiceImpl
extends
ServiceImpl
<
ConfigAllowValueMapper
,
ConfigAllowValue
>
implements
IConfigAllowValue
Service
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/
DispatchingConfi
gServiceImpl.java
→
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/
ConfigDispatchin
gServiceImpl.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
service
.
impl
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
DispatchingConfi
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.mapper.
DispatchingConfi
gMapper
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
DispatchingConfi
gService
;
import
org.jeecg.modules.dynamicStaticAnalysis.entity.
ConfigDispatchin
g
;
import
org.jeecg.modules.dynamicStaticAnalysis.mapper.
ConfigDispatchin
gMapper
;
import
org.jeecg.modules.dynamicStaticAnalysis.service.I
ConfigDispatchin
gService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
...
...
@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author hkl
* @since 2023-0
7-25
* @since 2023-0
8-03
*/
@Service
public
class
DispatchingConfigServiceImpl
extends
ServiceImpl
<
DispatchingConfigMapper
,
DispatchingConfig
>
implements
IDispatchingConfi
gService
{
public
class
ConfigDispatchingServiceImpl
extends
ServiceImpl
<
ConfigDispatchingMapper
,
ConfigDispatching
>
implements
IConfigDispatchin
gService
{
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigLabourCheckServiceImpl.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
service
.
impl
;
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.service.IConfigLabourCheckService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-人工检查超限权值 服务实现类
...
...
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
@Service
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
;
}
}
This diff is collapsed.
Click to expand it.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigRailDeviceCheckServiceImpl.java
View file @
c063a4bb
package
org
.
jeecg
.
modules
.
dynamicStaticAnalysis
.
service
.
impl
;
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.service.IConfigRailDeviceCheckService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* <p>
* 动静态分析-配置-轨检仪检查超限权值 服务实现类
...
...
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
@Service
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
;
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment