Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
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
王飞
vehicle-quality-review
Commits
369c11da
Commit
369c11da
authored
Sep 03, 2024
by
宋源硕
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'songyuanshuo' into 'dev'
按照最新版原型增加接口 See merge request
!441
parents
59a1d437
184db4a5
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
356 additions
and
73 deletions
+356
-73
ReviewDetailsMapper.java
...w/src/main/java/com/ruoyi/mapper/ReviewDetailsMapper.java
+3
-0
ReviewStandardMapper.java
.../src/main/java/com/ruoyi/mapper/ReviewStandardMapper.java
+22
-0
ReviewUsecaseMapper.java
...w/src/main/java/com/ruoyi/mapper/ReviewUsecaseMapper.java
+3
-4
ReviewDetailsService.java
...src/main/java/com/ruoyi/service/ReviewDetailsService.java
+7
-0
ReviewStandardService.java
...rc/main/java/com/ruoyi/service/ReviewStandardService.java
+18
-0
ReviewUsecaseService.java
...src/main/java/com/ruoyi/service/ReviewUsecaseService.java
+1
-7
ReviewDetailsServiceImpl.java
...java/com/ruoyi/service/impl/ReviewDetailsServiceImpl.java
+68
-0
ReviewStandardServiceImpl.java
...ava/com/ruoyi/service/impl/ReviewStandardServiceImpl.java
+51
-0
ReviewUsecaseServiceImpl.java
...java/com/ruoyi/service/impl/ReviewUsecaseServiceImpl.java
+9
-38
ReviewSceneChangeTaskController.java
...n/java/com/ruoyi/web/ReviewSceneChangeTaskController.java
+31
-19
DeleteDetailsRequest.java
...main/java/com/ruoyi/web/request/DeleteDetailsRequest.java
+14
-0
GetKeypointListRequest.java
...in/java/com/ruoyi/web/request/GetKeypointListRequest.java
+14
-0
AddDetailsResponse.java
.../main/java/com/ruoyi/web/response/AddDetailsResponse.java
+2
-0
DeleteDetails.java
...w/src/main/java/com/ruoyi/web/response/DeleteDetails.java
+18
-0
DeleteDetailsList.java
...c/main/java/com/ruoyi/web/response/DeleteDetailsList.java
+23
-0
DeleteDetailsResponse.java
...in/java/com/ruoyi/web/response/DeleteDetailsResponse.java
+25
-0
ReviewDetailsMapper.xml
...-review/src/main/resources/mapper/ReviewDetailsMapper.xml
+17
-0
ReviewStandardMapper.xml
...review/src/main/resources/mapper/ReviewStandardMapper.xml
+30
-1
ReviewUsecaseMapper.xml
...-review/src/main/resources/mapper/ReviewUsecaseMapper.xml
+0
-4
No files found.
quality-review/src/main/java/com/ruoyi/mapper/ReviewDetailsMapper.java
View file @
369c11da
...
@@ -6,6 +6,7 @@ import com.ruoyi.domain.ReviewDetails;
...
@@ -6,6 +6,7 @@ import com.ruoyi.domain.ReviewDetails;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.SystemReviewTask
;
import
com.ruoyi.domain.SystemReviewTask
;
import
com.ruoyi.web.request.ReviewFindListRequest
;
import
com.ruoyi.web.request.ReviewFindListRequest
;
import
com.ruoyi.web.response.DeleteDetailsResponse
;
import
com.ruoyi.web.response.ResultCountResponse
;
import
com.ruoyi.web.response.ResultCountResponse
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
@@ -34,4 +35,6 @@ public interface ReviewDetailsMapper extends BaseMapper<ReviewDetails> {
...
@@ -34,4 +35,6 @@ public interface ReviewDetailsMapper extends BaseMapper<ReviewDetails> {
// 查询细则列表
// 查询细则列表
List
<
ReviewDetails
>
findDetailsList
(
ReviewFindListRequest
request
);
List
<
ReviewDetails
>
findDetailsList
(
ReviewFindListRequest
request
);
// 查询细则列表
List
<
DeleteDetailsResponse
>
getDeleteDetailsResponseByStandardId
(
@Param
(
"standardId"
)
Long
standardId
);
}
}
quality-review/src/main/java/com/ruoyi/mapper/ReviewStandardMapper.java
View file @
369c11da
...
@@ -47,8 +47,30 @@ public interface ReviewStandardMapper extends BaseMapper<ReviewStandard> {
...
@@ -47,8 +47,30 @@ public interface ReviewStandardMapper extends BaseMapper<ReviewStandard> {
* */
* */
List
<
ReviewStandardChapterListResponse
>
findChaptersByStandard
(
@Param
(
"request"
)
StandardListNewRequest
request
);
List
<
ReviewStandardChapterListResponse
>
findChaptersByStandard
(
@Param
(
"request"
)
StandardListNewRequest
request
);
// 获取标准信息
ReviewStandardResponseNew
selectReviewStandardById
(
@Param
(
"key"
)
Long
key
);
ReviewStandardResponseNew
selectReviewStandardById
(
@Param
(
"key"
)
Long
key
);
/*
* 查询当前标准下的所有id集合
* */
List
<
Long
>
getIdList
(
@Param
(
"getUseCaseRequestNew"
)
GetUseCaseRequestNew
getUseCaseRequestNew
);
List
<
Long
>
getIdList
(
@Param
(
"getUseCaseRequestNew"
)
GetUseCaseRequestNew
getUseCaseRequestNew
);
/*
* 查询当前标准下的所有要点id集合
* */
List
<
Long
>
getKeypointIdList
(
@Param
(
"getKeypointListRequest"
)
GetKeypointListRequest
getKeypointListRequest
);
/*
* 获取要点id列表
* */
List
<
KeypointList
>
getKeypointListByIdList
(
@Param
(
"idList"
)
List
<
Long
>
idList
);
List
<
Long
>
getDetailsIdList
(
@Param
(
"deleteDetailsRequest"
)
DeleteDetailsRequest
deleteDetailsRequest
);
// 获取所有要点ID列表
List
<
Long
>
getDelKeypointIdList
(
@Param
(
"deleteDetailsRequest"
)
DeleteDetailsRequest
deleteDetailsRequest
);
// 获取与 KeypointList 关联的 DeleteDetails
List
<
DeleteDetails
>
getDeleteDetailsByKeypointId
(
@Param
(
"id"
)
Long
id
);
}
}
quality-review/src/main/java/com/ruoyi/mapper/ReviewUsecaseMapper.java
View file @
369c11da
...
@@ -15,12 +15,11 @@ public interface ReviewUsecaseMapper extends BaseMapper<ReviewUsecase> {
...
@@ -15,12 +15,11 @@ public interface ReviewUsecaseMapper extends BaseMapper<ReviewUsecase> {
ReviewUsecase
getById
(
Long
reviewUsecaseId
);
ReviewUsecase
getById
(
Long
reviewUsecaseId
);
/*
* 查询所有测试用例
* */
List
<
UseCaseResponseDTO
>
getUseCaseList
();
/*
* 查询所有测试用例
* */
List
<
UseCaseResponseDTO
>
getUseCaseListByIdList
(
@Param
(
"idList"
)
List
<
Long
>
idList
);
List
<
UseCaseResponseDTO
>
getUseCaseListByIdList
(
@Param
(
"idList"
)
List
<
Long
>
idList
);
}
}
quality-review/src/main/java/com/ruoyi/service/ReviewDetailsService.java
View file @
369c11da
...
@@ -3,10 +3,17 @@ package com.ruoyi.service;
...
@@ -3,10 +3,17 @@ package com.ruoyi.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruoyi.domain.ReviewDetails
;
import
com.ruoyi.domain.ReviewDetails
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.web.request.DeleteDetailsRequest
;
import
com.ruoyi.web.response.DeleteDetailsResponse
;
import
java.util.List
;
import
java.util.List
;
public
interface
ReviewDetailsService
extends
IService
<
ReviewDetails
>
{
public
interface
ReviewDetailsService
extends
IService
<
ReviewDetails
>
{
List
<
ReviewDetails
>
findByKeyPointsList
(
List
<
ReviewKeyPoint
>
reviewKeyPointList
);
List
<
ReviewDetails
>
findByKeyPointsList
(
List
<
ReviewKeyPoint
>
reviewKeyPointList
);
/*
* 删除细则按钮
* */
List
<
DeleteDetailsResponse
>
getDeleteDetailsResponseList
(
DeleteDetailsRequest
deleteDetailsRequest
);
}
}
quality-review/src/main/java/com/ruoyi/service/ReviewStandardService.java
View file @
369c11da
...
@@ -88,5 +88,23 @@ public interface ReviewStandardService extends IService<ReviewStandard> {
...
@@ -88,5 +88,23 @@ public interface ReviewStandardService extends IService<ReviewStandard> {
* */
* */
ReviewStandardListNewResponse
getListNew
(
StandardListNewRequest
request
);
ReviewStandardListNewResponse
getListNew
(
StandardListNewRequest
request
);
/*
* 查询当前标准下的所有id集合
* */
List
<
Long
>
getIdList
(
GetUseCaseRequestNew
getUseCaseRequestNew
);
List
<
Long
>
getIdList
(
GetUseCaseRequestNew
getUseCaseRequestNew
);
/*
* 查询当前标准下的所有要点id集合
* */
List
<
Long
>
getKeypointIdList
(
GetKeypointListRequest
getKeypointListRequest
);
/*
* 新增细则按钮
* */
List
<
AddDetailsResponse
>
getKeypointListByIds
(
List
<
Long
>
idList
);
/*
* 删除细则按钮
* */
List
<
Long
>
getDetailsIdList
(
DeleteDetailsRequest
deleteDetailsRequest
);
}
}
quality-review/src/main/java/com/ruoyi/service/ReviewUsecaseService.java
View file @
369c11da
...
@@ -12,15 +12,9 @@ import java.util.List;
...
@@ -12,15 +12,9 @@ import java.util.List;
public
interface
ReviewUsecaseService
{
public
interface
ReviewUsecaseService
{
/*
* 查询所有测试用例
* */
List
<
GetUseCaseResponse
>
getUseCaseList
();
/*
/*
* 查询所有测试用例
* 查询所有测试用例
* */
* */
/*List<GetUseCaseResponse> getUseCaseListByIds(List<Long> idList);*/
List
<
GetUseCaseResponse
>
getUseCaseListByIds
(
List
<
Long
>
idList
);
}
}
quality-review/src/main/java/com/ruoyi/service/impl/ReviewDetailsServiceImpl.java
View file @
369c11da
...
@@ -4,11 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -4,11 +4,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.ruoyi.domain.ReviewDetails
;
import
com.ruoyi.domain.ReviewDetails
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.mapper.ReviewDetailsMapper
;
import
com.ruoyi.mapper.ReviewDetailsMapper
;
import
com.ruoyi.mapper.ReviewStandardMapper
;
import
com.ruoyi.service.ReviewDetailsService
;
import
com.ruoyi.service.ReviewDetailsService
;
import
com.ruoyi.service.ReviewStandardService
;
import
com.ruoyi.web.request.DeleteDetailsRequest
;
import
com.ruoyi.web.response.*
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
@Service
@Service
public
class
ReviewDetailsServiceImpl
extends
ServiceImpl
<
ReviewDetailsMapper
,
ReviewDetails
>
implements
ReviewDetailsService
{
public
class
ReviewDetailsServiceImpl
extends
ServiceImpl
<
ReviewDetailsMapper
,
ReviewDetails
>
implements
ReviewDetailsService
{
...
@@ -16,8 +23,69 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R
...
@@ -16,8 +23,69 @@ public class ReviewDetailsServiceImpl extends ServiceImpl<ReviewDetailsMapper, R
@Autowired
@Autowired
private
ReviewDetailsMapper
reviewDetailsMapper
;
private
ReviewDetailsMapper
reviewDetailsMapper
;
@Autowired
private
ReviewStandardMapper
reviewStandardMapper
;
@Override
@Override
public
List
<
ReviewDetails
>
findByKeyPointsList
(
List
<
ReviewKeyPoint
>
reviewKeyPointList
)
{
public
List
<
ReviewDetails
>
findByKeyPointsList
(
List
<
ReviewKeyPoint
>
reviewKeyPointList
)
{
return
reviewDetailsMapper
.
findByKeyPointList
(
reviewKeyPointList
);
return
reviewDetailsMapper
.
findByKeyPointList
(
reviewKeyPointList
);
}
}
/*
* 删除细则按钮
* */
@Override
public
List
<
DeleteDetailsResponse
>
getDeleteDetailsResponseList
(
DeleteDetailsRequest
deleteDetailsRequest
)
{
// 获取所有要点ID列表
List
<
Long
>
idList
=
reviewStandardMapper
.
getDelKeypointIdList
(
deleteDetailsRequest
);
// 获取所有的细则列表
List
<
KeypointList
>
keypointLists
=
reviewStandardMapper
.
getKeypointListByIdList
(
idList
);
// 将要点列表按reviewStandardId分组
Map
<
Long
,
List
<
KeypointList
>>
groupKeypoint
=
keypointLists
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
KeypointList:
:
getReviewStandardId
));
// 创建返回结果列表
List
<
DeleteDetailsResponse
>
deleteDetailsResponseList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
Long
,
List
<
KeypointList
>>
entry
:
groupKeypoint
.
entrySet
())
{
// 获取标准信息
ReviewStandardResponseNew
reviewStandardResponseNew
=
reviewStandardMapper
.
selectReviewStandardById
(
entry
.
getKey
());
// 处理标准信息为null的情况
if
(
reviewStandardResponseNew
==
null
)
{
continue
;
}
// 组装 DeleteDetailsResponse
DeleteDetailsResponse
deleteDetailsResponse
=
new
DeleteDetailsResponse
();
deleteDetailsResponse
.
setId
(
reviewStandardResponseNew
.
getId
());
deleteDetailsResponse
.
setChapter
(
reviewStandardResponseNew
.
getChapter
());
deleteDetailsResponse
.
setText
(
reviewStandardResponseNew
.
getText
());
deleteDetailsResponse
.
setStandardId
(
reviewStandardResponseNew
.
getStandardId
());
deleteDetailsResponse
.
setStandardNo
(
reviewStandardResponseNew
.
getStandardNo
());
// 组装 DeleteDetailsList
List
<
DeleteDetailsList
>
deleteDetailsLists
=
new
ArrayList
<>();
for
(
KeypointList
keypoint
:
entry
.
getValue
())
{
DeleteDetailsList
deleteDetailsList
=
new
DeleteDetailsList
();
deleteDetailsList
.
setId
(
keypoint
.
getId
());
deleteDetailsList
.
setText
(
keypoint
.
getText
());
deleteDetailsList
.
setReviewStandardId
(
keypoint
.
getReviewStandardId
());
// 获取与 KeypointList 关联的 DeleteDetails
List
<
DeleteDetails
>
deleteDetails
=
reviewStandardMapper
.
getDeleteDetailsByKeypointId
(
keypoint
.
getId
());
deleteDetailsList
.
setDeleteDetailsList
(
deleteDetails
);
deleteDetailsLists
.
add
(
deleteDetailsList
);
}
deleteDetailsResponse
.
setDeleteDetailsLists
(
deleteDetailsLists
);
// 添加到返回列表
deleteDetailsResponseList
.
add
(
deleteDetailsResponse
);
}
return
deleteDetailsResponseList
;
}
}
}
quality-review/src/main/java/com/ruoyi/service/impl/ReviewStandardServiceImpl.java
View file @
369c11da
...
@@ -504,8 +504,59 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
...
@@ -504,8 +504,59 @@ public class ReviewStandardServiceImpl extends ServiceImpl<ReviewStandardMapper,
return
response
;
return
response
;
}
}
/*
* 查询当前标准下的所有id集合
* */
@Override
@Override
public
List
<
Long
>
getIdList
(
GetUseCaseRequestNew
getUseCaseRequestNew
)
{
public
List
<
Long
>
getIdList
(
GetUseCaseRequestNew
getUseCaseRequestNew
)
{
return
reviewStandardMapper
.
getIdList
(
getUseCaseRequestNew
);
return
reviewStandardMapper
.
getIdList
(
getUseCaseRequestNew
);
}
}
/*
* 查询当前标准下的所有要点id集合
* */
@Override
public
List
<
Long
>
getKeypointIdList
(
GetKeypointListRequest
getKeypointListRequest
)
{
return
reviewStandardMapper
.
getKeypointIdList
(
getKeypointListRequest
);
}
@Override
public
List
<
AddDetailsResponse
>
getKeypointListByIds
(
List
<
Long
>
idList
)
{
//获取所有要点
List
<
KeypointList
>
keypointLists
=
reviewStandardMapper
.
getKeypointListByIdList
(
idList
);
//按reviewStandard 分组
Map
<
Long
,
List
<
KeypointList
>>
groupKeypoint
=
keypointLists
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
KeypointList:
:
getReviewStandardId
));
//创建返回结果列表
List
<
AddDetailsResponse
>
addDetailsResponseList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
Long
,
List
<
KeypointList
>>
entry
:
groupKeypoint
.
entrySet
())
{
//获取标准信息
ReviewStandardResponseNew
reviewStandardResponseNew
=
reviewStandardMapper
.
selectReviewStandardById
(
entry
.
getKey
());
//处理标准信息为null的情况
if
(
reviewStandardResponseNew
==
null
){
continue
;
}
//组装
AddDetailsResponse
addDetailsResponse
=
new
AddDetailsResponse
();
addDetailsResponse
.
setChapter
(
reviewStandardResponseNew
.
getChapter
());
addDetailsResponse
.
setId
(
reviewStandardResponseNew
.
getId
());
addDetailsResponse
.
setText
(
reviewStandardResponseNew
.
getText
());
addDetailsResponse
.
setStandardId
(
reviewStandardResponseNew
.
getStandardId
());
addDetailsResponse
.
setStandardNo
(
reviewStandardResponseNew
.
getStandardNo
());
addDetailsResponse
.
setKeypointList
(
entry
.
getValue
());
//添加到返回列表
addDetailsResponseList
.
add
(
addDetailsResponse
);
}
return
addDetailsResponseList
;
}
@Override
public
List
<
Long
>
getDetailsIdList
(
DeleteDetailsRequest
deleteDetailsRequest
)
{
return
reviewStandardMapper
.
getDetailsIdList
(
deleteDetailsRequest
);
}
}
}
quality-review/src/main/java/com/ruoyi/service/impl/ReviewUsecaseServiceImpl.java
View file @
369c11da
...
@@ -25,41 +25,15 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
...
@@ -25,41 +25,15 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
@Autowired
@Autowired
private
ReviewStandardMapper
reviewStandardMapper
;
private
ReviewStandardMapper
reviewStandardMapper
;
/*
/*
* 查询所有测试用例
* 查询所有测试用例
* */
* */
@Override
@Override
public
List
<
GetUseCaseResponse
>
getUseCaseList
()
{
//获取所有用例列表
List
<
UseCaseResponseDTO
>
useCaseResponseDTOList
=
reviewUsecaseMapper
.
getUseCaseList
();
// 按照 standardId 对用例进行分组
Map
<
Long
,
List
<
UseCaseResponseDTO
>>
groupedUseCases
=
useCaseResponseDTOList
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
UseCaseResponseDTO:
:
getReviewStandardId
));
// 将分组后的数据封装到 GetUseCaseResponse 列表中
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
Long
,
List
<
UseCaseResponseDTO
>>
entry
:
groupedUseCases
.
entrySet
())
{
// 获取标准信息
ReviewStandardResponseNew
reviewStandardResponse
=
reviewStandardMapper
.
selectReviewStandardById
(
entry
.
getKey
());
System
.
out
.
println
(
reviewStandardResponse
+
"=========="
);
// 创建 GetUseCaseResponse 对象
GetUseCaseResponse
getUseCaseResponse
=
new
GetUseCaseResponse
();
getUseCaseResponse
.
setText
(
reviewStandardResponse
.
getText
());
getUseCaseResponse
.
setStandardId
(
reviewStandardResponse
.
getStandardId
());
// 设置标准ID
getUseCaseResponse
.
setStandardNo
(
reviewStandardResponse
.
getStandardNo
());
// 设置标准编号
getUseCaseResponse
.
setUseCaseResponseDTOList
(
entry
.
getValue
());
// 设置用例列表
// 添加到返回列表
getUseCaseResponseList
.
add
(
getUseCaseResponse
);
}
return
getUseCaseResponseList
;
}
/* @Override
public
List
<
GetUseCaseResponse
>
getUseCaseListByIds
(
List
<
Long
>
idList
)
{
public
List
<
GetUseCaseResponse
>
getUseCaseListByIds
(
List
<
Long
>
idList
)
{
if
(
idList
.
size
()
==
0
){
return
new
ArrayList
<>();
}
//获取所有测试用例
//获取所有测试用例
List
<
UseCaseResponseDTO
>
useCaseResponseDTOList
=
reviewUsecaseMapper
.
getUseCaseListByIdList
(
idList
);
List
<
UseCaseResponseDTO
>
useCaseResponseDTOList
=
reviewUsecaseMapper
.
getUseCaseListByIdList
(
idList
);
// 按 reviewStandardId 分组
// 按 reviewStandardId 分组
...
@@ -69,7 +43,7 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
...
@@ -69,7 +43,7 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
new
ArrayList
<>();
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
new
ArrayList
<>();
for
(
Map
.
Entry
<
Long
,
List
<
UseCaseResponseDTO
>>
entry
:
groupedUseCases
.
entrySet
())
{
for
(
Map
.
Entry
<
Long
,
List
<
UseCaseResponseDTO
>>
entry
:
groupedUseCases
.
entrySet
())
{
// 获取标准信息
// 获取标准信息
ReviewStandardResponse reviewStandardResponse = reviewStandardMapper.selectReviewStandardById(entry.getKey());
ReviewStandardResponse
New
reviewStandardResponse
=
reviewStandardMapper
.
selectReviewStandardById
(
entry
.
getKey
());
// 处理标准信息为 null 的情况
// 处理标准信息为 null 的情况
if
(
reviewStandardResponse
==
null
)
{
if
(
reviewStandardResponse
==
null
)
{
...
@@ -79,18 +53,15 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
...
@@ -79,18 +53,15 @@ public class ReviewUsecaseServiceImpl implements ReviewUsecaseService {
// 组装 GetUseCaseResponse 对象
// 组装 GetUseCaseResponse 对象
GetUseCaseResponse
getUseCaseResponse
=
new
GetUseCaseResponse
();
GetUseCaseResponse
getUseCaseResponse
=
new
GetUseCaseResponse
();
getUseCaseResponse
.
setId
(
reviewStandardResponse
.
getId
());
getUseCaseResponse
.
setText
(
reviewStandardResponse
.
getText
());
getUseCaseResponse
.
setStandardId
(
reviewStandardResponse
.
getStandardId
());
getUseCaseResponse
.
setStandardId
(
reviewStandardResponse
.
getStandardId
());
getUseCaseResponse
.
setStandardNo
(
reviewStandardResponse
.
getStandardNo
());
getUseCaseResponse
.
setStandardNo
(
reviewStandardResponse
.
getStandardNo
());
getUseCaseResponse
.
setUseCaseResponseDTOList
(
entry
.
getValue
());
getUseCaseResponse
.
setUseCaseResponseDTOList
(
entry
.
getValue
());
// 获取第一个 UseCaseResponseDTO 作为示例,来填充其他字段
UseCaseResponseDTO exampleDTO = entry.getValue().get(0);
getUseCaseResponse.setId(exampleDTO.getId());
getUseCaseResponse.setText(exampleDTO.getUsecaseDescribe());
// 添加到返回列表
// 添加到返回列表
getUseCaseResponseList
.
add
(
getUseCaseResponse
);
getUseCaseResponseList
.
add
(
getUseCaseResponse
);
}
}
return
null
;
return
getUseCaseResponseList
;
}
*/
}
}
}
quality-review/src/main/java/com/ruoyi/web/ReviewSceneChangeTaskController.java
View file @
369c11da
...
@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
...
@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.ReviewKeyPoint
;
import
com.ruoyi.domain.ReviewSceneChangeTask
;
import
com.ruoyi.domain.ReviewSceneChangeTask
;
import
com.ruoyi.mapper.ReviewUsecaseMapper
;
import
com.ruoyi.mapper.ReviewUsecaseMapper
;
import
com.ruoyi.service.ReviewDetailsService
;
import
com.ruoyi.service.ReviewSceneChangeTaskService
;
import
com.ruoyi.service.ReviewSceneChangeTaskService
;
import
com.ruoyi.service.ReviewStandardService
;
import
com.ruoyi.service.ReviewStandardService
;
import
com.ruoyi.service.ReviewUsecaseService
;
import
com.ruoyi.service.ReviewUsecaseService
;
...
@@ -43,6 +44,9 @@ public class ReviewSceneChangeTaskController extends BaseController {
...
@@ -43,6 +44,9 @@ public class ReviewSceneChangeTaskController extends BaseController {
@Autowired
@Autowired
private
ReviewStandardService
reviewStandardService
;
private
ReviewStandardService
reviewStandardService
;
@Autowired
private
ReviewDetailsService
reviewDetailsService
;
@ApiOperation
(
"新建场景变更任务"
)
@ApiOperation
(
"新建场景变更任务"
)
@Trace
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
...
@@ -237,24 +241,11 @@ public class ReviewSceneChangeTaskController extends BaseController {
...
@@ -237,24 +241,11 @@ public class ReviewSceneChangeTaskController extends BaseController {
Long
id
=
Long
.
parseLong
(
request
.
getId
());
Long
id
=
Long
.
parseLong
(
request
.
getId
());
return
R
.
ok
(
reviewSceneChangeTaskService
.
getReviewerOpinion
(
id
));
return
R
.
ok
(
reviewSceneChangeTaskService
.
getReviewerOpinion
(
id
));
}
}
/*
* 查询所有测试用例
* */
@ApiOperation
(
"查询所有测试用例"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"查询所有测试用例"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/getUseCaseList"
)
public
R
<
List
<
GetUseCaseResponse
>>
getUseCaseList
(){
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
reviewUsecaseService
.
getUseCaseList
();
return
R
.
ok
(
getUseCaseResponseList
);
}
/*
/*
* 查询测试用例
* 查询测试用例
* */
* */
/*
@ApiOperation("查询所有测试用例")
@ApiOperation
(
"查询所有测试用例"
)
@Trace
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"查询所有测试用例"
,
businessType
=
BusinessType
.
UPDATE
)
@Log
(
title
=
"查询所有测试用例"
,
businessType
=
BusinessType
.
UPDATE
)
...
@@ -262,13 +253,34 @@ public class ReviewSceneChangeTaskController extends BaseController {
...
@@ -262,13 +253,34 @@ public class ReviewSceneChangeTaskController extends BaseController {
public
R
<
List
<
GetUseCaseResponse
>>
getUseCaseListAll
(
@RequestBody
GetUseCaseRequestNew
GetUseCaseRequestNew
){
public
R
<
List
<
GetUseCaseResponse
>>
getUseCaseListAll
(
@RequestBody
GetUseCaseRequestNew
GetUseCaseRequestNew
){
List
<
Long
>
idList
=
reviewStandardService
.
getIdList
(
GetUseCaseRequestNew
);
List
<
Long
>
idList
=
reviewStandardService
.
getIdList
(
GetUseCaseRequestNew
);
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
reviewUsecaseService
.
getUseCaseListByIds
(
idList
);
List
<
GetUseCaseResponse
>
getUseCaseResponseList
=
reviewUsecaseService
.
getUseCaseListByIds
(
idList
);
return R.ok();
return
R
.
ok
(
getUseCaseResponseList
);
}*/
}
/*
/*
* 新增细则按钮
* 新增细则按钮
* */
* */
/*public R<List<AddDetailsResponse>> getDetailsListNew(){
@ApiOperation
(
"新增细则按钮"
)
return R.ok();
@Trace
}*/
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"新增细则按钮"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/getKeypointListAll"
)
public
R
<
List
<
AddDetailsResponse
>>
getDetailsListNew
(
@RequestBody
GetKeypointListRequest
getKeypointListRequest
){
List
<
Long
>
idList
=
reviewStandardService
.
getKeypointIdList
(
getKeypointListRequest
);
List
<
AddDetailsResponse
>
addDetailsResponseList
=
reviewStandardService
.
getKeypointListByIds
(
idList
);
return
R
.
ok
(
addDetailsResponseList
);
}
/*
* 删除细则按钮
* */
@ApiOperation
(
"删除细则按钮"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"删除细则按钮"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/deleteKeypointListAll"
)
public
R
<
List
<
DeleteDetailsResponse
>>
deleteKeypointListAll
(
@RequestBody
DeleteDetailsRequest
deleteDetailsRequest
){
List
<
DeleteDetailsResponse
>
responseList
=
reviewDetailsService
.
getDeleteDetailsResponseList
(
deleteDetailsRequest
);
return
R
.
ok
(
responseList
);
}
}
}
quality-review/src/main/java/com/ruoyi/web/request/DeleteDetailsRequest.java
0 → 100644
View file @
369c11da
package
com
.
ruoyi
.
web
.
request
;
import
io.swagger.annotations.ApiModel
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"DeleteDetailsRequest"
,
description
=
"获取细则列表请求request"
)
public
class
DeleteDetailsRequest
{
private
Long
standardId
;
private
String
standardNo
;
private
String
type
;
}
quality-review/src/main/java/com/ruoyi/web/request/GetKeypointListRequest.java
0 → 100644
View file @
369c11da
package
com
.
ruoyi
.
web
.
request
;
import
io.swagger.annotations.ApiModel
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"GetKeypointListRequest"
,
description
=
"获取要点列表请求request"
)
public
class
GetKeypointListRequest
{
private
Long
standardId
;
private
String
standardNo
;
private
String
type
;
}
quality-review/src/main/java/com/ruoyi/web/response/AddDetailsResponse.java
View file @
369c11da
...
@@ -10,6 +10,8 @@ import java.util.List;
...
@@ -10,6 +10,8 @@ import java.util.List;
@Data
@Data
public
class
AddDetailsResponse
{
public
class
AddDetailsResponse
{
@ApiModelProperty
(
"id"
)
private
Long
id
;
@ApiModelProperty
(
"章节"
)
@ApiModelProperty
(
"章节"
)
private
String
chapter
;
private
String
chapter
;
@ApiModelProperty
(
"标准内容"
)
@ApiModelProperty
(
"标准内容"
)
...
...
quality-review/src/main/java/com/ruoyi/web/response/DeleteDetails.java
0 → 100644
View file @
369c11da
package
com
.
ruoyi
.
web
.
response
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"DeleteDetails"
,
description
=
"新增细则按钮响应数据"
)
@Data
public
class
DeleteDetails
{
@ApiModelProperty
(
"要点id"
)
private
Long
id
;
@ApiModelProperty
(
"要点内容"
)
private
String
text
;
@ApiModelProperty
(
"标准id"
)
private
Long
reviewKeypointId
;
}
quality-review/src/main/java/com/ruoyi/web/response/DeleteDetailsList.java
0 → 100644
View file @
369c11da
package
com
.
ruoyi
.
web
.
response
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
@ApiModel
(
value
=
"DeleteDetailsList"
,
description
=
"新增细则按钮响应数据"
)
@Data
public
class
DeleteDetailsList
{
@ApiModelProperty
(
"要点id"
)
private
Long
id
;
@ApiModelProperty
(
"要点内容"
)
private
String
text
;
@ApiModelProperty
(
"标准id"
)
private
Long
reviewStandardId
;
@ApiModelProperty
(
"细则集合"
)
private
List
<
DeleteDetails
>
deleteDetailsList
;
}
quality-review/src/main/java/com/ruoyi/web/response/DeleteDetailsResponse.java
0 → 100644
View file @
369c11da
package
com
.
ruoyi
.
web
.
response
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
@ApiModel
(
value
=
"DeleteDetailsResponse"
,
description
=
"删除细则按钮响应数据"
)
@Data
public
class
DeleteDetailsResponse
{
@ApiModelProperty
(
"id"
)
private
Long
id
;
@ApiModelProperty
(
"章节"
)
private
String
chapter
;
@ApiModelProperty
(
"标准内容"
)
private
String
text
;
@ApiModelProperty
(
"标准id"
)
private
Long
standardId
;
@ApiModelProperty
(
"标准编号"
)
private
String
standardNo
;
@ApiModelProperty
(
"标准下details集合"
)
private
List
<
DeleteDetailsList
>
deleteDetailsLists
;
}
quality-review/src/main/resources/mapper/ReviewDetailsMapper.xml
View file @
369c11da
...
@@ -83,4 +83,21 @@
...
@@ -83,4 +83,21 @@
</if>
</if>
</where>
</where>
</select>
</select>
<select
id=
"getDeleteDetailsResponseByStandardId"
resultType=
"com.ruoyi.web.response.DeleteDetailsResponse"
>
select
s.id,
s.chapter,
s.text,
s.standard_id as standardId,
s.standard_no as standardNo
FROM
t_review_standard s
JOIN
t_review_keypoint k on s.id
JOIN
t_review_details d on k.id
where s.standard_id = #{standardId}
</select>
</mapper>
</mapper>
quality-review/src/main/resources/mapper/ReviewStandardMapper.xml
View file @
369c11da
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
AND standard_id = #{request.standardId}
AND standard_id = #{request.standardId}
</select>
</select>
<select
id=
"selectReviewStandardById"
resultType=
"com.ruoyi.web.response.ReviewStandardResponseNew"
>
<select
id=
"selectReviewStandardById"
resultType=
"com.ruoyi.web.response.ReviewStandardResponseNew"
>
select
standard_id,standard_no,text
select
id,standard_id,standard_no,text,chapter
from t_review_standard
from t_review_standard
where id = #{key}
where id = #{key}
</select>
</select>
...
@@ -129,5 +129,34 @@
...
@@ -129,5 +129,34 @@
from t_review_standard
from t_review_standard
where standard_no = #{getUseCaseRequestNew.standardNo} and type = #{getUseCaseRequestNew.type} and standard_id = #{getUseCaseRequestNew.standardId}
where standard_no = #{getUseCaseRequestNew.standardNo} and type = #{getUseCaseRequestNew.type} and standard_id = #{getUseCaseRequestNew.standardId}
</select>
</select>
<select
id=
"getKeypointIdList"
resultType=
"java.lang.Long"
>
select id
from t_review_standard
where standard_no = #{getKeypointListRequest.standardNo} and standard_id = #{getKeypointListRequest.standardId} and type = #{getKeypointListRequest.type}
</select>
<select
id=
"getKeypointListByIdList"
resultType=
"com.ruoyi.web.response.KeypointList"
>
select
id,text,review_standard_id
from t_review_keypoint
where t_review_keypoint.review_standard_id IN
<foreach
item=
"id"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</select>
<select
id=
"getDetailsIdList"
resultType=
"java.lang.Long"
>
select review_keypoint_id
from t_review_details
</select>
<select
id=
"getDelKeypointIdList"
resultType=
"java.lang.Long"
>
select id
from t_review_standard
where standard_no = #{deleteDetailsRequest.standardNo} and standard_id = #{deleteDetailsRequest.standardId} and type = #{deleteDetailsRequest.type}
</select>
<select
id=
"getDeleteDetailsByKeypointId"
resultType=
"com.ruoyi.web.response.DeleteDetails"
>
select id, text, review_keypoint_id
from t_review_details
where review_keypoint_id = #{id}
</select>
</mapper>
</mapper>
quality-review/src/main/resources/mapper/ReviewUsecaseMapper.xml
View file @
369c11da
...
@@ -14,10 +14,6 @@
...
@@ -14,10 +14,6 @@
from t_review_usecase
from t_review_usecase
where id = #{id}
where id = #{id}
</select>
</select>
<select
id=
"getUseCaseList"
resultType=
"com.ruoyi.web.response.UseCaseResponseDTO"
>
select *
from t_review_usecase
</select>
<select
id=
"getUseCaseListByIdList"
resultType=
"com.ruoyi.web.response.UseCaseResponseDTO"
>
<select
id=
"getUseCaseListByIdList"
resultType=
"com.ruoyi.web.response.UseCaseResponseDTO"
>
SELECT
SELECT
...
...
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