703a92e8 by chentao

no message

1 parent 5134eab3
...@@ -23,46 +23,13 @@ public class AtLeastOneNonNullValidator implements ConstraintValidator<AtLeastOn ...@@ -23,46 +23,13 @@ public class AtLeastOneNonNullValidator implements ConstraintValidator<AtLeastOn
23 @Override 23 @Override
24 public boolean isValid(CourseBo object, ConstraintValidatorContext context) { 24 public boolean isValid(CourseBo object, ConstraintValidatorContext context) {
25 if(object.getType().equals("2D")){ 25 if(object.getType().equals("2D")){
26 if(object.getTwoDimensionalType().equals("0")){ 26 return StringUtils.isNotBlank(object.getTwoDimensionalOssId());
27 return StringUtils.isNotBlank(object.getTwoDimensionalOssId());
28 }
29 else if(object.getTwoDimensionalType().equals("1")){
30 return StringUtils.isNotBlank(object.getTwoDimensionalUrl());
31 }
32 else{
33 return false;
34 }
35 } 27 }
36 else if(object.getType().equals("3D")){ 28 else if(object.getType().equals("3D")){
37 if(object.getThreeDimensionalType().equals("0")){ 29 return StringUtils.isNotBlank(object.getThreeDimensionalOssId());
38 return StringUtils.isNotBlank(object.getThreeDimensionalOssId());
39 }
40 else if(object.getThreeDimensionalType().equals("1")){
41 return StringUtils.isNotBlank(object.getThreeDimensionalUrl());
42 }
43 else{
44 return false;
45 }
46 } 30 }
47 else if(object.getType().equals("2D、3D") || object.getType().equals("3D、2D")){ 31 else if(object.getType().equals("2D、3D") || object.getType().equals("3D、2D")){
48 if(StringUtils.isBlank(object.getTwoDimensionalType()) || StringUtils.isBlank(object.getThreeDimensionalType())){ 32 return StringUtils.isNotBlank(object.getTwoDimensionalOssId()) && StringUtils.isNotBlank(object.getThreeDimensionalOssId());
49 return false;
50 }
51 if(object.getTwoDimensionalType().equals("0")){
52 if(object.getThreeDimensionalType().equals("0")){
53 return StringUtils.isNotBlank(object.getTwoDimensionalOssId()) && StringUtils.isNotBlank(object.getThreeDimensionalOssId());
54 }
55 else if(object.getThreeDimensionalType().equals("1")){
56 return StringUtils.isNotBlank(object.getTwoDimensionalOssId()) && StringUtils.isNotBlank(object.getThreeDimensionalUrl());
57 }
58 }
59 else if(object.getTwoDimensionalType().equals("1")) {
60 if (object.getThreeDimensionalType().equals("0")) {
61 return StringUtils.isNotBlank(object.getTwoDimensionalUrl()) && StringUtils.isNotBlank(object.getThreeDimensionalOssId());
62 } else if (object.getThreeDimensionalType().equals("1")) {
63 return StringUtils.isNotBlank(object.getTwoDimensionalUrl()) && StringUtils.isNotBlank(object.getThreeDimensionalUrl());
64 }
65 }
66 } 33 }
67 return false; 34 return false;
68 } 35 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!