Commit e84a45eb authored by alex yao's avatar alex yao

fix: 智能出题 下载文件异常

parent 28dd6696
...@@ -138,6 +138,8 @@ public class ExaminationServiceImpl implements ExaminationService { ...@@ -138,6 +138,8 @@ public class ExaminationServiceImpl implements ExaminationService {
saveExaminationEntity.setLevel(generateExaminationEntity.getLevel()); saveExaminationEntity.setLevel(generateExaminationEntity.getLevel());
saveExaminationEntity.setLanguage(generateExaminationEntity.getLanguage()); saveExaminationEntity.setLanguage(generateExaminationEntity.getLanguage());
saveExaminationEntity.setPositions(generateExaminationEntity.getPositions()); saveExaminationEntity.setPositions(generateExaminationEntity.getPositions());
saveExaminationEntity.setFileUrl(generateExaminationEntity.getFileUrl());
saveExaminationEntity.setContent(generateExaminationEntity.getContent());
saveExaminationEntity.setExaminationDetail(JsonUtils.serialize(examinationDetailEntities)); saveExaminationEntity.setExaminationDetail(JsonUtils.serialize(examinationDetailEntities));
bizExaminationService.save(saveExaminationEntity); bizExaminationService.save(saveExaminationEntity);
} else { } else {
...@@ -148,6 +150,8 @@ public class ExaminationServiceImpl implements ExaminationService { ...@@ -148,6 +150,8 @@ public class ExaminationServiceImpl implements ExaminationService {
updateExaminationEntity.setN(generateExaminationEntity.getN()); updateExaminationEntity.setN(generateExaminationEntity.getN());
updateExaminationEntity.setLevel(generateExaminationEntity.getLevel()); updateExaminationEntity.setLevel(generateExaminationEntity.getLevel());
updateExaminationEntity.setLanguage(generateExaminationEntity.getLanguage()); updateExaminationEntity.setLanguage(generateExaminationEntity.getLanguage());
updateExaminationEntity.setFileUrl(generateExaminationEntity.getFileUrl());
updateExaminationEntity.setContent(generateExaminationEntity.getContent());
updateExaminationEntity.setPositions(generateExaminationEntity.getPositions()); updateExaminationEntity.setPositions(generateExaminationEntity.getPositions());
updateExaminationEntity.setExaminationDetail(JsonUtils.serialize(examinationDetailEntities)); updateExaminationEntity.setExaminationDetail(JsonUtils.serialize(examinationDetailEntities));
bizExaminationService.update(updateExaminationEntity); bizExaminationService.update(updateExaminationEntity);
...@@ -189,6 +193,8 @@ public class ExaminationServiceImpl implements ExaminationService { ...@@ -189,6 +193,8 @@ public class ExaminationServiceImpl implements ExaminationService {
result.setDate(examinationEntity.getModifiedTime()); result.setDate(examinationEntity.getModifiedTime());
result.setTotalScore(examinationEntity.getTotalScore()); result.setTotalScore(examinationEntity.getTotalScore());
result.setPositions(examinationEntity.getPositions()); result.setPositions(examinationEntity.getPositions());
result.setFileUrl(examinationEntity.getFileUrl());
result.setContent(examinationEntity.getContent());
return result; return result;
} }
...@@ -317,7 +323,7 @@ public class ExaminationServiceImpl implements ExaminationService { ...@@ -317,7 +323,7 @@ public class ExaminationServiceImpl implements ExaminationService {
choiceParagraphRun.addBreak(); choiceParagraphRun.addBreak();
} }
} }
File tempFile = File.createTempFile(examinationEntity.getTitle(), ".docx"); File tempFile = File.createTempFile(UUIDTool.getUUID(), ".docx");
try (FileOutputStream out = new FileOutputStream(tempFile)) { try (FileOutputStream out = new FileOutputStream(tempFile)) {
document.write(out); document.write(out);
} }
......
...@@ -20,6 +20,8 @@ public class BizExaminationConvert { ...@@ -20,6 +20,8 @@ public class BizExaminationConvert {
entity.setLanguage(model.getLanguage()); entity.setLanguage(model.getLanguage());
entity.setPositions(model.getPositions()); entity.setPositions(model.getPositions());
entity.setExaminationDetail(model.getExaminationDetail()); entity.setExaminationDetail(model.getExaminationDetail());
entity.setFileUrl(model.getFileUrl());
entity.setContent(model.getContent());
entity.setIsDeleted(model.getIsDeleted()); entity.setIsDeleted(model.getIsDeleted());
entity.setCreator(model.getCreator()); entity.setCreator(model.getCreator());
entity.setCreatedTime(model.getCreatedTime()); entity.setCreatedTime(model.getCreatedTime());
...@@ -42,6 +44,8 @@ public class BizExaminationConvert { ...@@ -42,6 +44,8 @@ public class BizExaminationConvert {
model.setLanguage(entity.getLanguage()); model.setLanguage(entity.getLanguage());
model.setPositions(entity.getPositions()); model.setPositions(entity.getPositions());
model.setExaminationDetail(entity.getExaminationDetail()); model.setExaminationDetail(entity.getExaminationDetail());
model.setFileUrl(entity.getFileUrl());
model.setContent(entity.getContent());
model.setIsDeleted(entity.getIsDeleted()); model.setIsDeleted(entity.getIsDeleted());
model.setCreator(entity.getCreator()); model.setCreator(entity.getCreator());
model.setCreatedTime(entity.getCreatedTime()); model.setCreatedTime(entity.getCreatedTime());
...@@ -64,6 +68,8 @@ public class BizExaminationConvert { ...@@ -64,6 +68,8 @@ public class BizExaminationConvert {
dto.setLanguage(entity.getLanguage()); dto.setLanguage(entity.getLanguage());
dto.setPositions(entity.getPositions()); dto.setPositions(entity.getPositions());
dto.setExaminationDetail(entity.getExaminationDetail()); dto.setExaminationDetail(entity.getExaminationDetail());
dto.setFileUrl(entity.getFileUrl());
dto.setContent(entity.getContent());
dto.setIsDeleted(entity.getIsDeleted()); dto.setIsDeleted(entity.getIsDeleted());
dto.setCreator(entity.getCreator()); dto.setCreator(entity.getCreator());
dto.setCreatedTime(entity.getCreatedTime()); dto.setCreatedTime(entity.getCreatedTime());
...@@ -86,6 +92,8 @@ public class BizExaminationConvert { ...@@ -86,6 +92,8 @@ public class BizExaminationConvert {
entity.setLanguage(dto.getLanguage()); entity.setLanguage(dto.getLanguage());
entity.setPositions(dto.getPositions()); entity.setPositions(dto.getPositions());
entity.setExaminationDetail(dto.getExaminationDetail()); entity.setExaminationDetail(dto.getExaminationDetail());
entity.setFileUrl(dto.getFileUrl());
entity.setContent(dto.getContent());
entity.setIsDeleted(dto.getIsDeleted()); entity.setIsDeleted(dto.getIsDeleted());
entity.setCreator(dto.getCreator()); entity.setCreator(dto.getCreator());
entity.setCreatedTime(dto.getCreatedTime()); entity.setCreatedTime(dto.getCreatedTime());
......
...@@ -135,6 +135,30 @@ public class BizExaminationDto { ...@@ -135,6 +135,30 @@ public class BizExaminationDto {
public void setExaminationDetail(java.lang.String examinationDetail){ public void setExaminationDetail(java.lang.String examinationDetail){
this.examinationDetail = examinationDetail; this.examinationDetail = examinationDetail;
}
/** file_url
*文件地址
*/
private java.lang.String fileUrl;
public java.lang.String getFileUrl(){
return this.fileUrl;
}
public void setFileUrl(java.lang.String fileUrl){
this.fileUrl = fileUrl;
}
/** content
*输入文本
*/
private java.lang.String content;
public java.lang.String getContent(){
return this.content;
}
public void setContent(java.lang.String content){
this.content = content;
} }
/** is_deleted /** is_deleted
*是否删除 Y 是 N 否 *是否删除 Y 是 N 否
......
...@@ -31,6 +31,26 @@ public class ExaminationDto { ...@@ -31,6 +31,26 @@ public class ExaminationDto {
private List<String> questionType; private List<String> questionType;
private String content;
private String fileUrl;
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public List<String> getQuestionType() { public List<String> getQuestionType() {
return questionType; return questionType;
} }
......
...@@ -135,6 +135,30 @@ public class BizExaminationEntity { ...@@ -135,6 +135,30 @@ public class BizExaminationEntity {
public void setExaminationDetail(java.lang.String examinationDetail){ public void setExaminationDetail(java.lang.String examinationDetail){
this.examinationDetail = examinationDetail; this.examinationDetail = examinationDetail;
}
/** file_url
*文件地址
*/
private java.lang.String fileUrl;
public java.lang.String getFileUrl(){
return this.fileUrl;
}
public void setFileUrl(java.lang.String fileUrl){
this.fileUrl = fileUrl;
}
/** content
*输入文本
*/
private java.lang.String content;
public java.lang.String getContent(){
return this.content;
}
public void setContent(java.lang.String content){
this.content = content;
} }
/** is_deleted /** is_deleted
*是否删除 Y 是 N 否 *是否删除 Y 是 N 否
......
...@@ -27,6 +27,26 @@ public class ExaminationEntity { ...@@ -27,6 +27,26 @@ public class ExaminationEntity {
private List<ExaminationDetail> examinationDetails; private List<ExaminationDetail> examinationDetails;
private String content;
private String fileUrl;
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getFileUrl() {
return fileUrl;
}
public void setFileUrl(String fileUrl) {
this.fileUrl = fileUrl;
}
public List<String> getQuestionType() { public List<String> getQuestionType() {
return questionType; return questionType;
} }
......
...@@ -202,6 +202,38 @@ public class BizExaminationModel extends BaseModelClass implements Serializable ...@@ -202,6 +202,38 @@ public class BizExaminationModel extends BaseModelClass implements Serializable
} }
/** file_url
*文件地址
*/
private java.lang.String fileUrl;
@Column(name = "file_url",length = 150)
public java.lang.String getFileUrl(){
return this.fileUrl;
}
public void setFileUrl(java.lang.String fileUrl){
this.fileUrl = fileUrl;
super.addValidField("fileUrl");
}
/** content
*输入文本
*/
private java.lang.String content;
@Column(name = "content",length = 2147483647)
public java.lang.String getContent(){
return this.content;
}
public void setContent(java.lang.String content){
this.content = content;
super.addValidField("content");
}
/** is_deleted /** is_deleted
*是否删除 Y 是 N 否 *是否删除 Y 是 N 否
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment