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
80e253d0
Commit
80e253d0
authored
Jun 27, 2023
by
周昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、开发接口获取自身部门及以下的项目
2、开发接口获取项目下的楼宇
parent
217789be
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
108 additions
and
1 deletion
+108
-1
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
...oft/censoftrongtong/controller/RiskPlanAppController.java
+57
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerProjectMapper.java
...m/censoft/censoftrongtong/mapper/LedgerProjectMapper.java
+2
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerBuildingService.java
...nsoft/censoftrongtong/service/ILedgerBuildingService.java
+2
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java
...ensoft/censoftrongtong/service/ILedgerProjectService.java
+8
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java
...nsoftrongtong/service/impl/LedgerBuildingServiceImpl.java
+8
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerProjectServiceImpl.java
...ensoftrongtong/service/impl/LedgerProjectServiceImpl.java
+6
-0
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
...src/main/resources/mapper/system/LedgerBuildingMapper.xml
+1
-0
censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml
.../src/main/resources/mapper/system/LedgerProjectMapper.xml
+23
-1
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/application.yml
+1
-0
No files found.
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
0 → 100644
View file @
80e253d0
package
com
.
censoft
.
censoftrongtong
.
controller
;
import
com.censoft.censoftrongtong.domain.LedgerBuilding
;
import
com.censoft.censoftrongtong.domain.LedgerProject
;
import
com.censoft.censoftrongtong.service.ILedgerBuildingService
;
import
com.censoft.censoftrongtong.service.ILedgerProjectService
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.R
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
* 计划app端接口
*
* @author censoft
* @date 2023-06-27
* @module 融通项目
*/
@RestController
@RequestMapping
(
"/app-api/risk/plan"
)
public
class
RiskPlanAppController
extends
BaseController
{
@Resource
private
ILedgerProjectService
ledgerProjectService
;
@Resource
private
ILedgerBuildingService
ledgerBuildingService
;
/**
* 获取自身部门及以下的项目
*
* @param ledgerProject 查询Dto
* @real_return {@link R<List<LedgerProject>>}
*/
@GetMapping
(
"/project/list"
)
public
R
<
List
<
LedgerProject
>>
getProjectList
(
LedgerProject
ledgerProject
){
//添加自身及以下部门筛选
ledgerProject
.
setDeptId
(
getLoginUser
().
getDeptId
());
return
R
.
ok
(
ledgerProjectService
.
getProjectListByDeptId
(
ledgerProject
));
}
/**
* 获取项目下的楼宇
*
* @param projectId 项目id
* @real_return {@link R<List<LedgerProject>>}
*/
@GetMapping
(
"/building/list/{projectId}"
)
public
R
<
List
<
LedgerBuilding
>>
getBuildingListByProjectId
(
@PathVariable
Long
projectId
){
return
R
.
ok
(
ledgerBuildingService
.
getBuildingListByProjectId
(
projectId
));
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerProjectMapper.java
View file @
80e253d0
...
@@ -59,4 +59,6 @@ public interface LedgerProjectMapper
...
@@ -59,4 +59,6 @@ public interface LedgerProjectMapper
* @return 结果
* @return 结果
*/
*/
public
int
deleteLedgerProjectByIds
(
Long
[]
ids
);
public
int
deleteLedgerProjectByIds
(
Long
[]
ids
);
List
<
LedgerProject
>
getProjectListByDeptId
(
LedgerProject
ledgerProject
);
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerBuildingService.java
View file @
80e253d0
...
@@ -59,4 +59,6 @@ public interface ILedgerBuildingService
...
@@ -59,4 +59,6 @@ public interface ILedgerBuildingService
* @return 结果
* @return 结果
*/
*/
public
int
deleteLedgerBuildingById
(
Long
id
);
public
int
deleteLedgerBuildingById
(
Long
id
);
List
<
LedgerBuilding
>
getBuildingListByProjectId
(
Long
projectId
);
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerProjectService.java
View file @
80e253d0
...
@@ -59,4 +59,12 @@ public interface ILedgerProjectService
...
@@ -59,4 +59,12 @@ public interface ILedgerProjectService
* @return 结果
* @return 结果
*/
*/
public
int
deleteLedgerProjectById
(
Long
id
);
public
int
deleteLedgerProjectById
(
Long
id
);
/**
* 查询自身及以下项目列表
*
* @param ledgerProject 基础数据-项目
* @return 基础数据-项目集合
*/
public
List
<
LedgerProject
>
getProjectListByDeptId
(
LedgerProject
ledgerProject
);
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerBuildingServiceImpl.java
View file @
80e253d0
...
@@ -94,4 +94,12 @@ public class LedgerBuildingServiceImpl implements ILedgerBuildingService
...
@@ -94,4 +94,12 @@ public class LedgerBuildingServiceImpl implements ILedgerBuildingService
{
{
return
ledgerBuildingMapper
.
deleteLedgerBuildingById
(
id
);
return
ledgerBuildingMapper
.
deleteLedgerBuildingById
(
id
);
}
}
@Override
public
List
<
LedgerBuilding
>
getBuildingListByProjectId
(
Long
projectId
)
{
LedgerBuilding
query
=
new
LedgerBuilding
();
query
.
setProjectId
(
projectId
);
query
.
setStatus
(
"0"
);
return
selectLedgerBuildingList
(
query
);
}
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerProjectServiceImpl.java
View file @
80e253d0
...
@@ -5,6 +5,7 @@ import java.util.List;
...
@@ -5,6 +5,7 @@ import java.util.List;
import
com.censoft.censoftrongtong.domain.LedgerProject
;
import
com.censoft.censoftrongtong.domain.LedgerProject
;
import
com.censoft.censoftrongtong.mapper.LedgerProjectMapper
;
import
com.censoft.censoftrongtong.mapper.LedgerProjectMapper
;
import
com.censoft.censoftrongtong.service.ILedgerProjectService
;
import
com.censoft.censoftrongtong.service.ILedgerProjectService
;
import
com.ruoyi.common.annotation.DataScope
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.DateUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -94,4 +95,9 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService
...
@@ -94,4 +95,9 @@ public class LedgerProjectServiceImpl implements ILedgerProjectService
{
{
return
ledgerProjectMapper
.
deleteLedgerProjectById
(
id
);
return
ledgerProjectMapper
.
deleteLedgerProjectById
(
id
);
}
}
@Override
public
List
<
LedgerProject
>
getProjectListByDeptId
(
LedgerProject
ledgerProject
)
{
return
ledgerProjectMapper
.
getProjectListByDeptId
(
ledgerProject
);
}
}
}
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
View file @
80e253d0
...
@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"area != null "
>
and area = #{area}
</if>
<if
test=
"area != null "
>
and area = #{area}
</if>
<if
test=
"address != null and address != ''"
>
and address = #{address}
</if>
<if
test=
"address != null and address != ''"
>
and address = #{address}
</if>
<if
test=
"status != null and status != ''"
>
and status = #{status}
</if>
<if
test=
"status != null and status != ''"
>
and status = #{status}
</if>
and del_flag = '0'
</where>
</where>
</select>
</select>
...
...
censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml
View file @
80e253d0
...
@@ -41,7 +41,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -41,7 +41,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include
refid=
"selectLedgerProjectVo"
/>
<include
refid=
"selectLedgerProjectVo"
/>
where id = #{id}
where id = #{id}
</select>
</select>
<select
id=
"getProjectListByDeptId"
parameterType=
"com.censoft.censoftrongtong.domain.LedgerProject"
resultMap=
"LedgerProjectResult"
>
SELECT
lp.id,
lp.NAME,
lp.type,
lp.dept_id,
lp.city,
lp.address,
lp.source,
lp.STATUS,
lp.del_flag,
lp.create_by,
lp.create_time,
lp.update_by,
lp.update_time
FROM
ledger_project lp
WHERE
( lp.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR find_in_set( #{deptId}, ancestors ) ) )
AND lp.STATUS = '0' AND lp.del_flag = '0'
</select>
<insert
id=
"insertLedgerProject"
parameterType=
"com.censoft.censoftrongtong.domain.LedgerProject"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
<insert
id=
"insertLedgerProject"
parameterType=
"com.censoft.censoftrongtong.domain.LedgerProject"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
insert into ledger_project
insert into ledger_project
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
...
ruoyi-admin/src/main/resources/application.yml
View file @
80e253d0
...
@@ -37,6 +37,7 @@ server:
...
@@ -37,6 +37,7 @@ server:
logging
:
logging
:
level
:
level
:
com.ruoyi
:
debug
com.ruoyi
:
debug
com.censoft
:
debug
org.springframework
:
warn
org.springframework
:
warn
# 用户配置
# 用户配置
...
...
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