Browse Source

编辑题目优化

master
yanyan 3 years ago
parent
commit
8bd4183896
  1. 3
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java
  2. 3
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java
  3. 23
      lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java

3
lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneQuestionController.java

@ -191,8 +191,7 @@ public class SceneQuestionController extends BaseController {
@PostMapping("/addSaveNew")
@ResponseBody
public ZDResponse addSaveNew(@RequestParam("file") MultipartFile[] files, SceneQuestion sceneQuestion) {
return sceneQuestionService.editSceneQuestion(files, sceneQuestion) > 0
? ZDResponse.success() : ZDResponse.error("新增失败");
return sceneQuestionService.editSceneQuestion(files, sceneQuestion);
}
// @RequiresPermissions("project:question:bind")

3
lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneQuestionService.java

@ -1,5 +1,6 @@
package com.zdxt.knowledge.service;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.zdxtFile.AttFileRespDTO;
import com.zdxt.knowledge.domain.SceneQuestion;
import org.springframework.web.multipart.MultipartFile;
@ -47,7 +48,7 @@ public interface ISceneQuestionService
* @param sceneQuestion 场景题目
* @return 结果
*/
public int editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion);
public ZDResponse editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion);
/**
* 修改场景题目

23
lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneQuestionServiceImpl.java

@ -2,7 +2,6 @@ package com.zdxt.knowledge.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.druid.sql.visitor.functions.If;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@ -13,6 +12,7 @@ import com.zdxt.auth.feign.FileUploadApi;
import com.zdxt.auth.feign.RoleApi;
import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.feign.ZdxtFileCommonApi;
import com.zdxt.common.ZDResponse;
import com.zdxt.common.util.Convert;
import com.zdxt.common.util.DateUtils;
import com.zdxt.common.util.StringUtils;
@ -42,7 +42,8 @@ import java.util.stream.Collectors;
public class SceneQuestionServiceImpl implements ISceneQuestionService {
@Autowired
private SceneQuestionMapper sceneQuestionMapper;
@Autowired private ISceneRoleService iSceneRoleService;
@Autowired
private ISceneRoleService iSceneRoleService;
@Autowired
private UserApi userApi;
@Autowired
@ -99,12 +100,15 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
* @return 结果
*/
@Override
public int editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion) {
public ZDResponse editSceneQuestion(MultipartFile[] files, SceneQuestion sceneQuestion) {
int result;
if (ObjectUtil.isEmpty(files) || files.length > 1) {
return -1;
if (!ObjectUtil.isEmpty(files) && files.length > 1) {
return ZDResponse.error("只允许上传一个视频");
}
String uploadFilePath = null;
if (!ObjectUtil.isEmpty(files) && files.length == 1) {
uploadFilePath = fileUploadApi.upload(files[0]);
}
String uploadFilePath = fileUploadApi.upload(files[0]);
UserBean userBean = userApi.getCurrentUser();
SceneQuestion questionEntity = sceneQuestionMapper.selectSceneQuestionById(sceneQuestion.getGuid());
if (Objects.isNull(questionEntity)) {
@ -123,8 +127,13 @@ public class SceneQuestionServiceImpl implements ISceneQuestionService {
zdxtFileCommonApi.deleteZdxtFileByIds(sceneQuestion.getGuid());
}
// 上传文件,并在附件表中添加记录
if (result > 0 && !ObjectUtil.isEmpty(files)) {
zdxtFileCommonApi.insertZdxtFile(files[0], sceneQuestion.getGuid() + "", uploadFilePath);
return result;
return ZDResponse.success();
} else if (result > 0) {
return ZDResponse.success();
}
return ZDResponse.error("失败");
}
/**

Loading…
Cancel
Save