|
@@ -14,7 +14,6 @@ import java.util.Set;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -243,7 +242,7 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
ret = new AnswerImageDto();
|
|
ret = new AnswerImageDto();
|
|
- String url = getImageUrl(score, q);
|
|
|
|
|
|
+ String url = getImageUrl(score.getExamNumber(), q);
|
|
try {
|
|
try {
|
|
String tem = url.split("\\?")[0];
|
|
String tem = url.split("\\?")[0];
|
|
String suff = tem.substring(tem.lastIndexOf(".") + 1).toLowerCase();
|
|
String suff = tem.substring(tem.lastIndexOf(".") + 1).toLowerCase();
|
|
@@ -335,58 +334,27 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
|
|
this.update(wrapper);
|
|
this.update(wrapper);
|
|
}
|
|
}
|
|
|
|
|
|
- private String getImageUrl(StudentScoreEntity score, QuestionEntity q) {
|
|
|
|
- String examNumber = score.getExamNumber();
|
|
|
|
|
|
+ private String getImageUrl(String examNumber, QuestionEntity q) {
|
|
return sysProperty.getImageServer() + "/"
|
|
return sysProperty.getImageServer() + "/"
|
|
+ FileType.SLICE.getPath(q.getExamId(), q.getSubjectCode(), examNumber.substring(0, 5),
|
|
+ FileType.SLICE.getPath(q.getExamId(), q.getSubjectCode(), examNumber.substring(0, 5),
|
|
examNumber.substring(5, 6), examNumber.substring(10, 13), q.getMainNumber(), examNumber,
|
|
examNumber.substring(5, 6), examNumber.substring(10, 13), q.getMainNumber(), examNumber,
|
|
q.getMainNumber(), "jpg");
|
|
q.getMainNumber(), "jpg");
|
|
}
|
|
}
|
|
|
|
|
|
- private static String getSuffix(String input) {
|
|
|
|
- return StringUtils.trimToEmpty(input).substring(Math.max(0, input.length() - 3));
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- private static String getMarkingCloudPath(Object... param) {
|
|
|
|
- return String.format("sheet/%d/%s/%s-%d.%s", param);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
public static void main(String[] args) {
|
|
public static void main(String[] args) {
|
|
- // Pattern pattern =
|
|
|
|
- // Pattern.compile("\\[\\[([0-9](.[0-9]+){0,1})分\\]\\]");
|
|
|
|
- // String d="[[1.1分]]中国共产党是中国特色社会主义事业的坚强领导核心。\n"
|
|
|
|
- // + "[[1.2分]]中国共产党的领导地位是在历史奋斗中形成的。\n"
|
|
|
|
- // + "[[1.3分]]中国共产党领导是人民当家作主的可靠保障。\n"
|
|
|
|
- // + "[[1.4分]]中国共产党领导关系中国特色社会主义的性质、方向和命运。\n"
|
|
|
|
- // + "[[2分]]中国共产党领导是实现中华民族伟大复兴的根本保证。";
|
|
|
|
- // Matcher matcher = pattern.matcher(d);
|
|
|
|
- // int start=0;
|
|
|
|
- // double score=0.0;
|
|
|
|
- // while (matcher.find()) {
|
|
|
|
- // if(start!=0) {
|
|
|
|
- // System.out.println(score+d.substring(start,matcher.start()));
|
|
|
|
- // }
|
|
|
|
- // score=Double.valueOf(matcher.group(1));
|
|
|
|
- // start=matcher.end();
|
|
|
|
- // }
|
|
|
|
- // if(start<d.length()) {
|
|
|
|
- // System.out.println(score+d.substring(start,d.length()));
|
|
|
|
- // }
|
|
|
|
- // String[] items = d.split("\\[\\[[0-9](.[0-9]+){0,1}分\\]\\]");
|
|
|
|
- String code = "2019301151012";
|
|
|
|
- String s = "https://file.markingcloud.com/" + getMarkingCloudPath(725, getSuffix(code), code, 2, "jpg");
|
|
|
|
|
|
+
|
|
|
|
+ String examNumber = "428951242219227";
|
|
|
|
+ QuestionEntity q = new QuestionEntity();
|
|
|
|
+ q.setExamId(1L);
|
|
|
|
+ q.setSubjectCode("2");
|
|
|
|
+ q.setMainNumber(1);
|
|
|
|
+ String s = FileType.SLICE.getPath(q.getExamId(), q.getSubjectCode(), examNumber.substring(0, 5),
|
|
|
|
+ examNumber.substring(5, 6), examNumber.substring(10, 13), q.getMainNumber(), examNumber,
|
|
|
|
+ q.getMainNumber(), "jpg");
|
|
|
|
+ ;
|
|
System.out.println(s);
|
|
System.out.println(s);
|
|
}
|
|
}
|
|
|
|
|
|
- // @Override
|
|
|
|
- // public StudentScoreImageDto pollStudentScoreImage() {
|
|
|
|
- // try {
|
|
|
|
- // return queue.take();
|
|
|
|
- // } catch (InterruptedException e) {
|
|
|
|
- // throw new RuntimeException(e);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
public void ocr(StudentScoreImageDto dto) {
|
|
public void ocr(StudentScoreImageDto dto) {
|
|
try {
|
|
try {
|