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
7bdb2750
Commit
7bdb2750
authored
Jun 27, 2023
by
周昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、开发接口获取任务管理列表
parent
718fb005
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
106 additions
and
1 deletion
+106
-1
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
...oft/censoftrongtong/controller/RiskPlanAppController.java
+22
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppListDto.java
...ensoft/censoftrongtong/domain/dto/RiskPlanAppListDto.java
+28
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java
...va/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java
+4
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java
...com/censoft/censoftrongtong/service/IRiskPlanService.java
+4
-0
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
...oft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
+17
-0
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
...gtong/src/main/resources/mapper/system/RiskPlanMapper.xml
+24
-1
ruoyi-common/pom.xml
ruoyi-common/pom.xml
+7
-0
No files found.
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @
7bdb2750
...
...
@@ -3,6 +3,8 @@ 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.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
;
...
...
@@ -13,8 +15,10 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* 计划app端接口
*
...
...
@@ -82,4 +86,22 @@ public class RiskPlanAppController extends BaseController {
riskPlan
.
setCreateDeptId
(
getDeptId
());
return
R
.
ok
(
riskPlanService
.
saveRiskPlan
(
riskPlan
));
}
/**
* 任务管理列表
*
* @param status 状态
* @real_return {@link R<List<RiskPlanAppListDto>>}
*/
@GetMapping
(
"/create/list"
)
public
R
<
List
<
RiskPlanAppListDto
>>
getRiskPlanAppListDtoListByCreateUser
(
String
status
){
List
<
RiskPlanStatusType
>
statusList
;
if
(
"running"
.
equals
(
status
)){
statusList
=
Arrays
.
asList
(
RiskPlanStatusType
.
WAIT_START
,
RiskPlanStatusType
.
RUNNING
);
}
else
{
statusList
=
Arrays
.
asList
(
RiskPlanStatusType
.
WAIT_FINISH
,
RiskPlanStatusType
.
FINISH
,
RiskPlanStatusType
.
WAIT_ADJUST
,
RiskPlanStatusType
.
REVOKE
);
}
return
R
.
ok
(
riskPlanService
.
getRiskPlanAppListDtoList
(
statusList
,
getUserId
()));
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppListDto.java
0 → 100644
View file @
7bdb2750
package
com
.
censoft
.
censoftrongtong
.
domain
.
dto
;
import
lombok.Data
;
import
java.util.Date
;
/**
* @author 周昊
* @desc ...
* @date 2023-06-27 14:45:45
*/
@Data
public
class
RiskPlanAppListDto
{
/** id */
private
Long
id
;
/** 计划名称 */
private
String
name
;
/** 发起时间 */
private
Date
startTime
;
/** 状态 */
private
String
status
;
/** 处理人员 */
private
String
leaderUserName
;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java
View file @
7bdb2750
package
com
.
censoft
.
censoftrongtong
.
mapper
;
import
com.censoft.censoftrongtong.domain.RiskPlan
;
import
com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -59,4 +61,6 @@ public interface RiskPlanMapper
* @return 结果
*/
public
int
deleteRiskPlanByIds
(
Long
[]
ids
);
List
<
RiskPlanAppListDto
>
getRiskPlanAppListDtoList
(
@Param
(
"statusStringList"
)
List
<
String
>
statusStringList
,
@Param
(
"userId"
)
Long
userId
);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java
View file @
7bdb2750
package
com
.
censoft
.
censoftrongtong
.
service
;
import
com.censoft.censoftrongtong.domain.RiskPlan
;
import
com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto
;
import
com.censoft.censoftrongtong.enums.RiskPlanStatusType
;
import
java.util.List
;
...
...
@@ -61,4 +63,6 @@ public interface IRiskPlanService
public
int
deleteRiskPlanById
(
Long
id
);
int
saveRiskPlan
(
RiskPlan
riskPlan
);
List
<
RiskPlanAppListDto
>
getRiskPlanAppListDtoList
(
List
<
RiskPlanStatusType
>
statusList
,
Long
userId
);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
View file @
7bdb2750
...
...
@@ -4,9 +4,11 @@ import java.text.SimpleDateFormat;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Random
;
import
java.util.stream.Collectors
;
import
com.censoft.censoftrongtong.domain.RiskPlan
;
import
com.censoft.censoftrongtong.domain.RiskPlanTask
;
import
com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto
;
import
com.censoft.censoftrongtong.enums.RiskPlanStatusType
;
import
com.censoft.censoftrongtong.mapper.RiskPlanMapper
;
import
com.censoft.censoftrongtong.service.IRiskPlanService
;
...
...
@@ -128,6 +130,21 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
return
i
;
}
@Override
public
List
<
RiskPlanAppListDto
>
getRiskPlanAppListDtoList
(
List
<
RiskPlanStatusType
>
statusList
,
Long
userId
)
{
//枚举类转化为数据库存的状态值
List
<
String
>
statusStringList
=
statusList
.
stream
()
.
map
(
RiskPlanStatusType:
:
getStatus
)
.
collect
(
Collectors
.
toList
());
//查询并把状态值转化为状态名称
return
riskPlanMapper
.
getRiskPlanAppListDtoList
(
statusStringList
,
userId
).
stream
().
map
(
dto
->
{
String
status
=
RiskPlanStatusType
.
getTitleByStatus
(
dto
.
getStatus
());
dto
.
setStatus
(
status
);
return
dto
;
}).
collect
(
Collectors
.
toList
());
}
private
String
getNo
()
{
Random
random
=
new
Random
();
int
randomNumber
=
random
.
nextInt
(
1000
);
// 生成0到999之间的随机数
...
...
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @
7bdb2750
...
...
@@ -51,7 +51,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include
refid=
"selectRiskPlanVo"
/>
where id = #{id}
</select>
<select
id=
"getRiskPlanAppListDtoList"
resultType=
"com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto"
>
SELECT
rp.id,
rp.`name`,
rp.start_time AS startTime,
rp.`status`,
su.nick_name AS leaderUserName
FROM
risk_plan rp
LEFT JOIN sys_user su ON su.user_id = rp.leader_user_id
<where>
<if
test=
"userId != null"
>
and rp.create_user_id = #{userId}
</if>
<if
test=
"statusStringList != null and statusStringList.size >0"
>
and rp.`status` in
<foreach
collection=
"statusStringList"
item=
"status"
open=
"("
separator=
","
close=
")"
>
#{status}
</foreach>
</if>
</where>
ORDER BY
rp.start_time DESC
</select>
<insert
id=
"insertRiskPlan"
parameterType=
"com.censoft.censoftrongtong.domain.RiskPlan"
useGeneratedKeys=
"true"
keyProperty=
"id"
>
insert into risk_plan
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
...
...
ruoyi-common/pom.xml
View file @
7bdb2750
...
...
@@ -126,6 +126,13 @@
<artifactId>
javax.servlet-api
</artifactId>
</dependency>
<!-- lombok -->
<dependency>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<version>
1.16.18
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
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