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
a69dce74
Commit
a69dce74
authored
Jul 12, 2024
by
史志龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
需求7,8提交--shizhilong
parent
d1086e37
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
545 additions
and
10 deletions
+545
-10
CodeGenerate.java
...em/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
+3
-4
CorrugationRecordController.java
...les/checkData/controller/CorrugationRecordController.java
+56
-0
RailWearRecordController.java
...odules/checkData/controller/RailWearRecordController.java
+4
-2
CorrugationRecordDTO.java
...org/jeecg/modules/checkData/dto/CorrugationRecordDTO.java
+83
-0
CorrugationRecord.java
...org/jeecg/modules/checkData/entity/CorrugationRecord.java
+104
-0
CorrugationRecordMapper.java
...ecg/modules/checkData/mapper/CorrugationRecordMapper.java
+27
-0
RailWearRecordMapper.java
.../jeecg/modules/checkData/mapper/RailWearRecordMapper.java
+3
-1
CorrugationRecordMapper.xml
.../modules/checkData/mapper/xml/CorrugationRecordMapper.xml
+46
-0
ICorrugationRecordService.java
.../modules/checkData/service/ICorrugationRecordService.java
+28
-0
IRailWearRecordService.java
...ecg/modules/checkData/service/IRailWearRecordService.java
+3
-1
CorrugationRecordServiceImpl.java
.../checkData/service/impl/CorrugationRecordServiceImpl.java
+37
-0
RailWearRecordServiceImpl.java
...les/checkData/service/impl/RailWearRecordServiceImpl.java
+3
-1
CorrugationRecordDetailVO.java
...jeecg/modules/checkData/vo/CorrugationRecordDetailVO.java
+50
-0
CorrugationRecordVO.java
...a/org/jeecg/modules/checkData/vo/CorrugationRecordVO.java
+97
-0
application-dev.yml
jeecg-module-system/src/main/resources/application-dev.yml
+1
-1
No files found.
jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
View file @
a69dce74
...
@@ -13,7 +13,7 @@ import java.util.HashMap;
...
@@ -13,7 +13,7 @@ import java.util.HashMap;
import
java.util.Map
;
import
java.util.Map
;
public
class
CodeGenerate
{
public
class
CodeGenerate
{
public
static
String
url
=
"jdbc:mysql://47.94.207.62:3306/hzgw
2
?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull"
;
public
static
String
url
=
"jdbc:mysql://47.94.207.62:3306/hzgw
_test
?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull"
;
public
static
String
username
=
"root"
;
public
static
String
username
=
"root"
;
public
static
String
password
=
"superAdmin&321"
;
public
static
String
password
=
"superAdmin&321"
;
...
@@ -25,12 +25,11 @@ public class CodeGenerate {
...
@@ -25,12 +25,11 @@ public class CodeGenerate {
String
outputDir
=
projectPath
+
"\\jeecg-module-system\\src\\main\\java\\"
;
String
outputDir
=
projectPath
+
"\\jeecg-module-system\\src\\main\\java\\"
;
// 模块名
// 模块名
String
moduleName
=
"
dynamicStaticAnalysis
"
;
String
moduleName
=
"
corrugationRecord
"
;
// 表名
// 表名
String
[]
tables
=
{
String
[]
tables
=
{
"t_dsa_analysis_over_report_check_unit_device_map"
,
"t_ek_corrugation_record"
"t_dsa_analysis_tqi_report_check_unit_device_map"
,
};
};
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/CorrugationRecordController.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
controller
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
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.checkData.dto.CorrugationRecordDTO
;
import
org.jeecg.modules.checkData.dto.RailWearRecordDTO
;
import
org.jeecg.modules.checkData.entity.CorrugationRecord
;
import
org.jeecg.modules.checkData.service.ICorrugationRecordService
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
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
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表 前端控制器
* </p>
*
* @author hkl
* @since 2024-07-11
*/
@RestController
@RequestMapping
(
"/checkData/corrugationRecord"
)
public
class
CorrugationRecordController
extends
JeecgController
<
CorrugationRecord
,
ICorrugationRecordService
>
{
@AutoLog
(
value
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表-分页列表查询"
)
@ApiOperation
(
value
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表-分页列表查询"
,
notes
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表-分页列表查询"
)
@GetMapping
(
value
=
"/list"
)
public
Result
<
IPage
<
CorrugationRecordVO
>>
queryPageList
(
@RequestParam
(
name
=
"pageNo"
,
defaultValue
=
"1"
)
Integer
pageNo
,
@RequestParam
(
name
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
pageSize
,
CorrugationRecordDTO
dto
)
{
Page
<
CorrugationRecordVO
>
pageData
=
new
Page
<>(
pageNo
,
pageSize
);
pageData
=
this
.
service
.
queryPageList
(
pageData
,
dto
);
return
Result
.
OK
(
pageData
);
}
@AutoLog
(
value
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表检查详情页面"
)
@ApiOperation
(
value
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表检查详情页面"
,
notes
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表检查详情页面"
)
@GetMapping
(
value
=
"/getDetail"
)
public
Result
<
List
<
CorrugationRecordDetailVO
>>
getDetail
(
@ApiParam
(
"id"
)
String
id
)
{
List
<
CorrugationRecordDetailVO
>
data
=
this
.
service
.
getDetail
(
id
);
return
Result
.
OK
(
data
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RailWearRecordController.java
View file @
a69dce74
...
@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -19,6 +19,8 @@ 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
;
/**
/**
* <p>
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 前端控制器
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 前端控制器
...
@@ -47,8 +49,8 @@ public class RailWearRecordController extends JeecgController<RailWearRecord, IR
...
@@ -47,8 +49,8 @@ public class RailWearRecordController extends JeecgController<RailWearRecord, IR
@AutoLog
(
value
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
)
@AutoLog
(
value
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
)
@ApiOperation
(
value
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
,
notes
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
)
@ApiOperation
(
value
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
,
notes
=
"检查数据-设备检查记录数据-钢轨伤损情况检查详情页面"
)
@GetMapping
(
value
=
"/getDetail"
)
@GetMapping
(
value
=
"/getDetail"
)
public
Result
<
RailWearRecordDetailVO
>
getDetail
(
@ApiParam
(
"id"
)
String
id
)
{
public
Result
<
List
<
RailWearRecordDetailVO
>
>
getDetail
(
@ApiParam
(
"id"
)
String
id
)
{
RailWearRecordDetailVO
data
=
this
.
service
.
getDetail
(
id
);
List
<
RailWearRecordDetailVO
>
data
=
this
.
service
.
getDetail
(
id
);
return
Result
.
OK
(
data
);
return
Result
.
OK
(
data
);
}
}
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dto/CorrugationRecordDTO.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
dto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表
* </p>
*
* @author hkl
* @since 2024-07-11
*/
@Getter
@Setter
@ApiModel
(
value
=
"CorrugationRecord对象"
,
description
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表 "
)
public
class
CorrugationRecordDTO
{
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
recordsMasterCheckId
;
@ApiModelProperty
(
"检查设备id"
)
private
String
deviceProjectId
;
@ApiModelProperty
(
"检查设备Code"
)
private
String
deviceProjectCode
;
@ApiModelProperty
(
"检查设备类型(1-钢轨,2-曲线,3-竖曲线,4-道岔)"
)
private
Integer
deviceProjectType
;
@ApiModelProperty
(
"曲线半径"
)
private
BigDecimal
curveRadius
;
@ApiModelProperty
(
"曲线超高"
)
private
BigDecimal
superHigh
;
@ApiModelProperty
(
"曲线长度"
)
private
BigDecimal
curveLen
;
@ApiModelProperty
(
"检查项目-波段-谷深(10-30)"
)
private
BigDecimal
checkBandOne
;
@ApiModelProperty
(
"检查项目-波段-谷深(30-100)"
)
private
BigDecimal
checkBandTwo
;
@ApiModelProperty
(
"检查项目-波段-谷深(100-300)"
)
private
BigDecimal
checkBandThree
;
@ApiModelProperty
(
"检查项目-波段-谷深(300-1000)"
)
private
BigDecimal
checkBandFour
;
@ApiModelProperty
(
"超限记录"
)
private
String
overrunInfo
;
@ApiModelProperty
(
"是否删除(0:未删除,1:已删除)"
)
private
String
delFlag
;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/CorrugationRecord.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表
* </p>
*
* @author hkl
* @since 2024-07-11
*/
@Getter
@Setter
@TableName
(
"t_ek_corrugation_record"
)
@ApiModel
(
value
=
"CorrugationRecord对象"
,
description
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表 "
)
public
class
CorrugationRecord
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
(
"设备检查记录主表id"
)
@TableField
(
"records_master_check_id"
)
private
String
recordsMasterCheckId
;
@ApiModelProperty
(
"检查设备id"
)
@TableField
(
"device_project_id"
)
private
String
deviceProjectId
;
@ApiModelProperty
(
"检查设备Code"
)
@TableField
(
"device_project_code"
)
private
String
deviceProjectCode
;
@ApiModelProperty
(
"检查设备类型(1-钢轨,2-曲线,3-竖曲线,4-道岔)"
)
@TableField
(
"device_project_type"
)
private
Integer
deviceProjectType
;
@ApiModelProperty
(
"曲线半径"
)
@TableField
(
"curve_radius"
)
private
BigDecimal
curveRadius
;
@ApiModelProperty
(
"曲线超高"
)
@TableField
(
"super_high"
)
private
BigDecimal
superHigh
;
@ApiModelProperty
(
"曲线长度"
)
@TableField
(
"curve_len"
)
private
BigDecimal
curveLen
;
@ApiModelProperty
(
"检查项目-波段-谷深(10-30)"
)
@TableField
(
"check_band_one"
)
private
BigDecimal
checkBandOne
;
@ApiModelProperty
(
"检查项目-波段-谷深(30-100)"
)
@TableField
(
"check_band_two"
)
private
BigDecimal
checkBandTwo
;
@ApiModelProperty
(
"检查项目-波段-谷深(100-300)"
)
@TableField
(
"check_band_three"
)
private
BigDecimal
checkBandThree
;
@ApiModelProperty
(
"检查项目-波段-谷深(300-1000)"
)
@TableField
(
"check_band_four"
)
private
BigDecimal
checkBandFour
;
@ApiModelProperty
(
"超限记录"
)
@TableField
(
"overrun_info"
)
private
String
overrunInfo
;
@ApiModelProperty
(
"是否删除(0:未删除,1:已删除)"
)
@TableField
(
"del_flag"
)
private
String
delFlag
;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/CorrugationRecordMapper.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.jeecg.modules.checkData.dto.CorrugationRecordDTO
;
import
org.jeecg.modules.checkData.dto.RailWearRecordDTO
;
import
org.jeecg.modules.checkData.entity.CorrugationRecord
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
java.util.List
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表 Mapper 接口
* </p>
*
* @author hkl
* @since 2024-07-11
*/
public
interface
CorrugationRecordMapper
extends
BaseMapper
<
CorrugationRecord
>
{
Page
<
CorrugationRecordVO
>
queryPageList
(
Page
<
CorrugationRecordVO
>
pageData
,
CorrugationRecordDTO
dto
);
List
<
CorrugationRecordDetailVO
>
getDetail
(
String
id
);
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/RailWearRecordMapper.java
View file @
a69dce74
...
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 Mapper 接口
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 Mapper 接口
...
@@ -19,5 +21,5 @@ public interface RailWearRecordMapper extends BaseMapper<RailWearRecord> {
...
@@ -19,5 +21,5 @@ public interface RailWearRecordMapper extends BaseMapper<RailWearRecord> {
Page
<
RailWearRecordVO
>
queryPageList
(
Page
<
RailWearRecordVO
>
pageData
,
RailWearRecordDTO
dto
);
Page
<
RailWearRecordVO
>
queryPageList
(
Page
<
RailWearRecordVO
>
pageData
,
RailWearRecordDTO
dto
);
RailWearRecordDetailVO
getDetail
(
String
id
);
List
<
RailWearRecordDetailVO
>
getDetail
(
String
id
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/CorrugationRecordMapper.xml
0 → 100644
View file @
a69dce74
<?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.checkData.mapper.CorrugationRecordMapper"
>
<select
id=
"queryPageList"
resultType=
"org.jeecg.modules.checkData.vo.CorrugationRecordVO"
>
SELECT
t1.id,
t2.id recordsMasterCheckId,
t2.ek_code,
t2.work_code,
t2.check_time,
t2.check_by,
t2.verify_by,
t2.verify_time,
t2.subway_section_id,
t2.subway_section_name,
t2.light_rail_id,
t2.light_rail_name,
t2.line_alias_id,
t2.line_alias_name,
t2.starting_mileage,
t2.end_mileage,
t2.remark
FROM
t_ek_corrugation_record t1
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id and t2.del_flag = '0'
WHERE t1.del_flag = '0'
<if
test=
"dto.ekCode != null and dto.ekCode != ''"
>
AND t2.ek_code like concat('%',#{dto.ekCode},'%')
</if>
<if
test=
"dto.startTime != null"
>
AND t2.check_time >= #{dto.startTime}
</if>
<if
test=
"dto.endTime != null"
>
AND t2.check_time
<![CDATA[ <= ]]>
DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
</select>
<select
id=
"getDetail"
resultType=
"org.jeecg.modules.checkData.vo.CorrugationRecordDetailVO"
>
SELECT
t1.*
FROM
t_ek_corrugation_record t1
where t1.id = #{id}
</select>
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/ICorrugationRecordService.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
org.jeecg.modules.checkData.dto.CorrugationRecordDTO
;
import
org.jeecg.modules.checkData.dto.RailWearRecordDTO
;
import
org.jeecg.modules.checkData.entity.CorrugationRecord
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
java.util.List
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表 服务类
* </p>
*
* @author hkl
* @since 2024-07-11
*/
public
interface
ICorrugationRecordService
extends
IService
<
CorrugationRecord
>
{
Page
<
CorrugationRecordVO
>
queryPageList
(
Page
<
CorrugationRecordVO
>
pageData
,
CorrugationRecordDTO
dto
);
List
<
CorrugationRecordDetailVO
>
getDetail
(
String
id
);
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/IRailWearRecordService.java
View file @
a69dce74
...
@@ -7,6 +7,8 @@ import org.jeecg.modules.checkData.entity.RailWearRecord;
...
@@ -7,6 +7,8 @@ import org.jeecg.modules.checkData.entity.RailWearRecord;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务类
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务类
...
@@ -19,5 +21,5 @@ public interface IRailWearRecordService extends IService<RailWearRecord> {
...
@@ -19,5 +21,5 @@ public interface IRailWearRecordService extends IService<RailWearRecord> {
Page
<
RailWearRecordVO
>
queryPageList
(
Page
<
RailWearRecordVO
>
pageData
,
RailWearRecordDTO
dto
);
Page
<
RailWearRecordVO
>
queryPageList
(
Page
<
RailWearRecordVO
>
pageData
,
RailWearRecordDTO
dto
);
RailWearRecordDetailVO
getDetail
(
String
id
);
List
<
RailWearRecordDetailVO
>
getDetail
(
String
id
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/impl/CorrugationRecordServiceImpl.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.jeecg.modules.checkData.dto.CorrugationRecordDTO
;
import
org.jeecg.modules.checkData.dto.RailWearRecordDTO
;
import
org.jeecg.modules.checkData.entity.CorrugationRecord
;
import
org.jeecg.modules.checkData.mapper.CorrugationRecordMapper
;
import
org.jeecg.modules.checkData.service.ICorrugationRecordService
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.CorrugationRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordDetailVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表 服务实现类
* </p>
*
* @author hkl
* @since 2024-07-11
*/
@Service
public
class
CorrugationRecordServiceImpl
extends
ServiceImpl
<
CorrugationRecordMapper
,
CorrugationRecord
>
implements
ICorrugationRecordService
{
@Override
public
Page
<
CorrugationRecordVO
>
queryPageList
(
Page
<
CorrugationRecordVO
>
pageData
,
CorrugationRecordDTO
dto
)
{
return
this
.
baseMapper
.
queryPageList
(
pageData
,
dto
);
}
@Override
public
List
<
CorrugationRecordDetailVO
>
getDetail
(
String
id
)
{
return
this
.
baseMapper
.
getDetail
(
id
);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/service/impl/RailWearRecordServiceImpl.java
View file @
a69dce74
...
@@ -10,6 +10,8 @@ import org.jeecg.modules.checkData.vo.RailWearRecordDetailVO;
...
@@ -10,6 +10,8 @@ import org.jeecg.modules.checkData.vo.RailWearRecordDetailVO;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
org.jeecg.modules.checkData.vo.RailWearRecordVO
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务实现类
* 检查数据-设备检查记录数据-钢轨伤损情况检查表 服务实现类
...
@@ -27,7 +29,7 @@ public class RailWearRecordServiceImpl extends ServiceImpl<RailWearRecordMapper,
...
@@ -27,7 +29,7 @@ public class RailWearRecordServiceImpl extends ServiceImpl<RailWearRecordMapper,
}
}
@Override
@Override
public
RailWearRecordDetailVO
getDetail
(
String
id
)
{
public
List
<
RailWearRecordDetailVO
>
getDetail
(
String
id
)
{
return
this
.
baseMapper
.
getDetail
(
id
);
return
this
.
baseMapper
.
getDetail
(
id
);
}
}
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/CorrugationRecordDetailVO.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
@ApiModel
(
value
=
"RailWearRecordDetailVO对象"
,
description
=
"钢轨伤损情况检查详情"
)
public
class
CorrugationRecordDetailVO
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"主键"
)
private
String
id
;
@ApiModelProperty
(
"检查设备id"
)
private
String
deviceProjectId
;
@ApiModelProperty
(
"检查设备code"
)
private
String
deviceProjectCode
;
@ApiModelProperty
(
"检查设备类型(1-钢轨,2-曲线,3-竖曲线,4-道岔)"
)
private
Integer
deviceProjectType
;
@ApiModelProperty
(
"曲线半径"
)
private
BigDecimal
curveRadius
;
@ApiModelProperty
(
"曲线超高"
)
private
BigDecimal
superHigh
;
@ApiModelProperty
(
"曲线长度"
)
private
BigDecimal
curveLen
;
@ApiModelProperty
(
"检查项目-波段-谷深(10-30)"
)
private
BigDecimal
checkBandOne
;
@ApiModelProperty
(
"检查项目-波段-谷深(30-100)"
)
private
BigDecimal
checkBandTwo
;
@ApiModelProperty
(
"检查项目-波段-谷深(100-300)"
)
private
BigDecimal
checkBandThree
;
@ApiModelProperty
(
"检查项目-波段-谷深(300-1000)"
)
private
BigDecimal
checkBandFour
;
@ApiModelProperty
(
"超限记录"
)
private
String
overrunInfo
;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/CorrugationRecordVO.java
0 → 100644
View file @
a69dce74
package
org
.
jeecg
.
modules
.
checkData
.
vo
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
* <p>
* 检查数据-设备检查记录数据-钢轨波磨设备检查记录表
* </p>
*
* @author hkl
* @since 2024-07-11
*/
@Getter
@Setter
@ApiModel
(
value
=
"CorrugationRecord对象"
,
description
=
"检查数据-设备检查记录数据-钢轨波磨设备检查记录表 "
)
public
class
CorrugationRecordVO
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
"id"
)
private
String
id
;
@ApiModelProperty
(
"设备检查记录主表id"
)
private
String
recordsMasterCheckId
;
@ApiModelProperty
(
"检查批次号"
)
private
String
ekCode
;
@ApiModelProperty
(
"工单编号"
)
private
String
workCode
;
@ApiModelProperty
(
"检查区间id"
)
private
String
subwaySectionId
;
@ApiModelProperty
(
"检查区间名称"
)
private
String
subwaySectionName
;
@ApiModelProperty
(
"所属线路id"
)
private
String
lightRailId
;
@ApiModelProperty
(
"所属线路名称"
)
private
String
lightRailName
;
@ApiModelProperty
(
"所属线别id"
)
private
String
lineAliasId
;
@ApiModelProperty
(
"所属线别名称"
)
private
String
lineAliasName
;
@ApiModelProperty
(
"车站id"
)
private
String
stationId
;
@ApiModelProperty
(
"车站名称"
)
private
String
stationName
;
@ApiModelProperty
(
"创建人"
)
private
String
createBy
;
@ApiModelProperty
(
"创建日期"
)
private
Date
createTime
;
@ApiModelProperty
(
"更新人"
)
private
String
updateBy
;
@ApiModelProperty
(
"更新时间"
)
private
Date
updateTime
;
@ApiModelProperty
(
"检查日期"
)
private
Date
checkTime
;
@ApiModelProperty
(
"检查人"
)
private
String
checkBy
;
@ApiModelProperty
(
"审核人姓名"
)
private
String
verifyBy
;
@ApiModelProperty
(
"审核时间"
)
private
Date
verifyTime
;
@ApiModelProperty
(
"起点里程"
)
private
BigDecimal
startingMileage
;
@ApiModelProperty
(
"终点里程"
)
private
BigDecimal
endMileage
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
}
jeecg-module-system/src/main/resources/application-dev.yml
View file @
a69dce74
...
@@ -131,7 +131,7 @@ spring:
...
@@ -131,7 +131,7 @@ spring:
connectionProperties
:
druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
connectionProperties
:
druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource
:
datasource
:
master
:
master
:
url
:
jdbc:mysql://47.94.207.62:3306/hzgw_
prod
?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
url
:
jdbc:mysql://47.94.207.62:3306/hzgw_
test
?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
username
:
root
username
:
root
password
:
superAdmin&321
password
:
superAdmin&321
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
...
...
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