Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
RuoYi-Vue-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
融通安全管理系统
RuoYi-Vue-master
Commits
325054ac
Commit
325054ac
authored
Jun 28, 2023
by
周昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、开发接口根据楼宇id获取楼层列表
2、开发接口根据楼层id获取房间列表
parent
1a62d29e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
80 additions
and
10 deletions
+80
-10
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
...oft/censoftrongtong/controller/RiskPlanAppController.java
+30
-6
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java
...n/java/com/censoft/censoftrongtong/domain/LedgerRoom.java
+11
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java
.../com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java
+2
-1
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerFloorService.java
.../censoft/censoftrongtong/service/ILedgerFloorService.java
+2
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java
...m/censoft/censoftrongtong/service/ILedgerRoomService.java
+4
-1
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerFloorServiceImpl.java
.../censoftrongtong/service/impl/LedgerFloorServiceImpl.java
+8
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java
...t/censoftrongtong/service/impl/LedgerRoomServiceImpl.java
+12
-2
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/application.yml
+2
-0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
...rc/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+9
-0
No files found.
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @
325054ac
package
com
.
censoft
.
censoftrongtong
.
controller
;
import
com.censoft.censoftrongtong.domain.LedgerBuilding
;
import
com.censoft.censoftrongtong.domain.LedgerProject
;
import
com.censoft.censoftrongtong.domain.RiskPlan
;
import
com.censoft.censoftrongtong.domain.*
;
import
com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto
;
import
com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto
;
import
com.censoft.censoftrongtong.enums.RiskPlanStatusType
;
import
com.censoft.censoftrongtong.service.ILedgerBuildingService
;
import
com.censoft.censoftrongtong.service.ILedgerProjectService
;
import
com.censoft.censoftrongtong.service.IRiskPlanService
;
import
com.censoft.censoftrongtong.service.*
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.R
;
...
...
@@ -37,6 +33,12 @@ public class RiskPlanAppController extends BaseController {
@Resource
private
ILedgerBuildingService
ledgerBuildingService
;
@Resource
private
ILedgerFloorService
ledgerFloorService
;
@Resource
private
ILedgerRoomService
ledgerRoomService
;
@Resource
private
IRiskPlanService
riskPlanService
;
...
...
@@ -137,4 +139,26 @@ public class RiskPlanAppController extends BaseController {
public
R
<
List
<
LedgerBuilding
>>
getBuildingListByPlanId
(
@PathVariable
(
"planId"
)
Long
planId
){
return
R
.
ok
(
riskPlanService
.
getBuildingListByPlanId
(
planId
));
}
/**
* 根据楼宇id获取楼层列表
*
* @param buildingId 楼宇id
* @real_return {@link R<List<LedgerFloor>>}
*/
@GetMapping
(
"/floor/list/{buildingId}"
)
public
R
<
List
<
LedgerFloor
>>
getFloorListByBuildingId
(
@PathVariable
(
"buildingId"
)
Long
buildingId
){
return
R
.
ok
(
ledgerFloorService
.
getFloorListByBuildingId
(
buildingId
));
}
/**
* 根据楼层id获取房间列表
*
* @param floorId 楼宇id
* @real_return {@link R<List<LedgerRoom>>}
*/
@GetMapping
(
"/room/list/{floorId}"
)
public
R
<
List
<
LedgerRoom
>>
getRoomListByBuildingId
(
@PathVariable
(
"floorId"
)
Long
floorId
){
return
R
.
ok
(
ledgerRoomService
.
getRoomListByBuildingId
(
floorId
));
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java
View file @
325054ac
package
com
.
censoft
.
censoftrongtong
.
domain
;
import
java.math.BigDecimal
;
import
com.baomidou.mybatisplus.annotation.*
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
com.ruoyi.common.annotation.Excel
;
...
...
@@ -12,34 +14,43 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-06-26
*/
@TableName
(
"ledger_room"
)
public
class
LedgerRoom
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
@TableId
(
type
=
IdType
.
AUTO
)
private
Long
id
;
/** 楼层id */
@Excel
(
name
=
"楼层id"
)
@TableField
(
"floor_id"
)
private
Long
floorId
;
/** 房间名称 */
@Excel
(
name
=
"房间名称"
)
@TableField
(
"name"
)
private
String
name
;
/** 房间编号 */
@Excel
(
name
=
"房间编号"
)
@TableField
(
"number"
)
private
String
number
;
/** 房间面积 */
@Excel
(
name
=
"房间面积"
)
@TableField
(
"area"
)
private
BigDecimal
area
;
/** 状态(0正常 1停用) */
@Excel
(
name
=
"状态"
,
readConverterExp
=
"0=正常,1=停用"
)
@TableField
(
"status"
)
private
String
status
;
/** 删除标志(0代表存在 1代表删除) */
@TableField
(
"del_flag"
)
@TableLogic
private
String
delFlag
;
public
void
setId
(
Long
id
)
...
...
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java
View file @
325054ac
package
com
.
censoft
.
censoftrongtong
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.censoft.censoftrongtong.domain.LedgerRoom
;
import
java.util.List
;
...
...
@@ -10,7 +11,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-06-26
*/
public
interface
LedgerRoomMapper
public
interface
LedgerRoomMapper
extends
BaseMapper
<
LedgerRoom
>
{
/**
* 查询基础数据-楼层
...
...
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerFloorService.java
View file @
325054ac
...
...
@@ -59,4 +59,6 @@ public interface ILedgerFloorService
* @return 结果
*/
public
int
deleteLedgerFloorById
(
Long
id
);
List
<
LedgerFloor
>
getFloorListByBuildingId
(
Long
buildingId
);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java
View file @
325054ac
package
com
.
censoft
.
censoftrongtong
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.censoft.censoftrongtong.domain.LedgerRoom
;
import
java.util.List
;
...
...
@@ -10,7 +11,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-06-26
*/
public
interface
ILedgerRoomService
public
interface
ILedgerRoomService
extends
IService
<
LedgerRoom
>
{
/**
* 查询基础数据-楼层
...
...
@@ -59,4 +60,6 @@ public interface ILedgerRoomService
* @return 结果
*/
public
int
deleteLedgerRoomById
(
Long
id
);
List
<
LedgerRoom
>
getRoomListByBuildingId
(
Long
floorId
);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerFloorServiceImpl.java
View file @
325054ac
...
...
@@ -94,4 +94,12 @@ public class LedgerFloorServiceImpl implements ILedgerFloorService
{
return
ledgerFloorMapper
.
deleteLedgerFloorById
(
id
);
}
@Override
public
List
<
LedgerFloor
>
getFloorListByBuildingId
(
Long
buildingId
)
{
LedgerFloor
query
=
new
LedgerFloor
();
query
.
setBuildingId
(
buildingId
);
query
.
setStatus
(
"0"
);
return
selectLedgerFloorList
(
query
);
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java
View file @
325054ac
...
...
@@ -2,6 +2,9 @@ package com.censoft.censoftrongtong.service.impl;
import
java.util.List
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.censoft.censoftrongtong.domain.LedgerRoom
;
import
com.censoft.censoftrongtong.mapper.LedgerRoomMapper
;
import
com.censoft.censoftrongtong.service.ILedgerRoomService
;
...
...
@@ -16,8 +19,7 @@ import org.springframework.stereotype.Service;
* @date 2023-06-26
*/
@Service
public
class
LedgerRoomServiceImpl
implements
ILedgerRoomService
{
public
class
LedgerRoomServiceImpl
extends
ServiceImpl
<
LedgerRoomMapper
,
LedgerRoom
>
implements
ILedgerRoomService
{
@Autowired
private
LedgerRoomMapper
ledgerRoomMapper
;
...
...
@@ -94,4 +96,12 @@ public class LedgerRoomServiceImpl implements ILedgerRoomService
{
return
ledgerRoomMapper
.
deleteLedgerRoomById
(
id
);
}
@Override
public
List
<
LedgerRoom
>
getRoomListByBuildingId
(
Long
floorId
)
{
LambdaQueryWrapper
<
LedgerRoom
>
wrapper
=
new
LambdaQueryWrapper
<
LedgerRoom
>()
.
eq
(
LedgerRoom:
:
getFloorId
,
floorId
)
.
eq
(
LedgerRoom:
:
getStatus
,
"0"
);
return
list
(
wrapper
);
}
}
ruoyi-admin/src/main/resources/application.yml
View file @
325054ac
...
...
@@ -116,6 +116,8 @@ mybatis-plus:
mapperLocations
:
classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
# configLocation: classpath:mybatis/mybatis-config.xml
logic-delete-value
:
1
# 逻辑已删除值(默认为 1)
logic-not-delete-value
:
0
# 逻辑未删除值(默认为 0)
# PageHelper分页插件
pagehelper
:
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View file @
325054ac
...
...
@@ -4,6 +4,8 @@ import java.io.Serializable;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.Map
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
...
...
@@ -19,27 +21,34 @@ public class BaseEntity implements Serializable
/** 搜索值 */
@JsonIgnore
@TableField
(
exist
=
false
)
private
String
searchValue
;
/** 创建者 */
@TableField
(
"create_by"
)
private
String
createBy
;
/** 创建时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@TableField
(
"create_time"
)
private
Date
createTime
;
/** 更新者 */
@TableField
(
"update_by"
)
private
String
updateBy
;
/** 更新时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@TableField
(
"update_time"
)
private
Date
updateTime
;
/** 备注 */
@TableField
(
"remark"
)
private
String
remark
;
/** 请求参数 */
@JsonInclude
(
JsonInclude
.
Include
.
NON_EMPTY
)
@TableField
(
exist
=
false
)
private
Map
<
String
,
Object
>
params
;
public
String
getSearchValue
()
...
...
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