end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

团队重构

master
陈裕财 3 years ago
parent
e97d6e7bc4
commit
b1c32fb0a2
3 changed files with 63 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
  2. 45
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
  3. 40
      xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java

27
xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java
View File

@ -279,7 +279,9 @@ public class XmTestCaseController {
}
}
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
if(!isPm && !StringUtils.hasText(xmTestCase.getCuserid())){
if(isPm){
can=xmTestCasesDb;
}else{
for (XmTestCase xmTestCaseDb : xmTestCasesDb) {
Tips tips2 = new Tips("检查通过");
tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestCaseDb.getCuserid(),xmTestCaseDb.getCusername(),null);
@ -344,15 +346,20 @@ public class XmTestCaseController {
List<XmTestCase> can=new ArrayList<>();
List<XmTestCase> no=new ArrayList<>();
Map<String, Tips> noTipsMap=new HashMap<>();
for (XmTestCase data : datasDb) {
if(isPm){
can.add(data);
}else{
tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
noTipsMap.put(tips.getMsg(),tips);
no.add(data);
}
}
if(isPm){
can=datasDb;
}else {
for (XmTestCase data : datasDb) {
tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(tips.isOk()){
can.add(data);
}else {
noTipsMap.put(tips.getMsg(),tips);
no.add(data);
}
}
}
List<String> msgs=new ArrayList<>();
if(can.size()>0){
xmTestCaseService.batchDelete(can);

45
xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
View File

@ -266,10 +266,10 @@ public class XmTestCasedbController {
List<XmTestCasedb> can=new ArrayList<>();
List<XmTestCasedb> no=new ArrayList<>();
Set<String> noTips=new HashSet<>();
for (XmTestCasedb data : xmTestCasedbsDb) {
if(isPm){
can.add(data);
}else{
if(isPm){
can=xmTestCasedbsDb;
}else {
for (XmTestCasedb data : xmTestCasedbsDb) {
tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(!tips.isOk()){
no.add(data);
@ -278,7 +278,9 @@ public class XmTestCasedbController {
can.add(data);
}
}
}
if(can.size()>0){
xmTestCasedbMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList()));
xmTestCasedbService.editSomeFields(xmTestCasedbMap);
@ -320,26 +322,33 @@ public class XmTestCasedbController {
return failed("data-0","请上送待删除数据列表");
}
List<XmTestCasedb> datasDb=xmTestCasedbService.selectListByIds(xmTestCasedbs.stream().map(i-> i.getId() ).collect(Collectors.toList()));
if(datasDb==null || datasDb.size()==0){
return failed("data-0","测试库已不存在");
}
XmTestCasedb xmTestCasedbDb=datasDb.get(0);
if(datasDb.stream().filter(k->!k.getProductId().equals(xmTestCasedbDb.getProductId())).findAny().isPresent()){
return failed("data-0","批量处理只能在同一个产品下进行");
}
User user=LoginUtils.getCurrentUserInfo();
XmProduct xmProductDb=productService.getProductFromCache(xmTestCasedbDb.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb,user.getUserid());
List<XmTestCasedb> can=new ArrayList<>();
List<XmTestCasedb> no=new ArrayList<>();
Set<String> noTips=new HashSet<>();
User user=LoginUtils.getCurrentUserInfo();
for (XmTestCasedb data : datasDb) {
XmProduct xmProductDb=productService.getProductFromCache(data.getProductId());
boolean isPm=groupService.checkUserIsProductAdm(xmProductDb, user.getUserid());
if(isPm){
can.add(data);
}else{
if(isPm){
can=datasDb;
}else {
for (XmTestCasedb data : datasDb) {
tips=productQxService.checkProductQx(null,xmProductDb,1,user,data.getCuserid(),data.getCusername(),data.getCbranchId());
if(!tips.isOk()){
no.add(data);
noTips.add(tips.getMsg());
if(!tips.isOk()){
no.add(data);
noTips.add(tips.getMsg());
}else{
can.add(data);
can.add(data);
}
}
}
}
}
List<String> msgs=new ArrayList<>();
if(can.size()>0){
xmTestCasedbService.batchDelete(can);

40
xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
View File

@ -287,20 +287,18 @@ public class XmTestPlanController {
List<XmTestPlan> can=new ArrayList<>();
List<XmTestPlan> no=new ArrayList<>();
Set<String> noTips=new HashSet<>();
for (XmTestPlan xmTestPlanDb : xmTestPlansDb) {
Tips tips2 = new Tips("检查通过");
if(isPm){
can.add(xmTestPlanDb);
}else{
tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(!tips2.isOk()){
no.add(xmTestPlanDb);
noTips.add(tips2.getMsg());
}else{
can.add(xmTestPlanDb);
}
}
if(isPm){
can=xmTestPlansDb;
}else {
for (XmTestPlan xmTestPlanDb : xmTestPlansDb) {
Tips tips2 =productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(!tips2.isOk()){
no.add(xmTestPlanDb);
noTips.add(tips2.getMsg());
}else{
can.add(xmTestPlanDb);
}
}
}
if(can.size()>0){
xmTestPlanMap.put("ids",can.stream().map(i->i.getId()).collect(Collectors.toList()));
@ -353,21 +351,21 @@ public class XmTestPlanController {
List<XmTestPlan> can=new ArrayList<>();
List<XmTestPlan> no=new ArrayList<>();
Set<String> noTips=new HashSet<>();
for (XmTestPlan xmTestPlanDb : datasDb) {
Tips tips2 = new Tips("检查通过");
if(isPm){
can.add(xmTestPlanDb);
}else{
tips2=productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(isPm){
can=datasDb;
}else {
for (XmTestPlan xmTestPlanDb : datasDb) {
Tips tips2 =productQxService.checkProductQx(null,xmProductDb,1,user,xmTestPlanDb.getCuserid(),xmTestPlanDb.getCusername(),xmTestPlanDb.getCbranchId());
if(!tips2.isOk()){
no.add(xmTestPlanDb);
noTips.add(tips2.getMsg());
}else{
can.add(xmTestPlanDb);
}
}
}
}
List<String> msgs=new ArrayList<>();
if(can.size()>0){
xmTestPlanService.batchDelete(can);

Write Preview
Loading…
Cancel
Save