Commit d187f4d4 authored by chenzhao's avatar chenzhao

修改bug

parent a047eb78
......@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -132,9 +133,11 @@ public class FirefightersThoughtController extends BaseController {
if(redisUtils.hasKey(RedisKey.THOUGHT_ID+id)){
Object obj= redisUtils.get(RedisKey.THOUGHT_ID+id);
Map<String, Object> mainMap = Bean.BeantoMap(obj);
((Map<String,Object>) obj).put("attachments", sourceFileService.getAttachments(id));
/*Map<String, Object> mainMap = Bean.BeantoMap(obj);
mainMap.put("attachments", sourceFileService.getAttachments(id));
return ResponseHelper.buildResponse(mainMap);
return ResponseHelper.buildResponse(mainMap);*/
return ResponseHelper.buildResponse((Map<String,Object>) obj );
}else{ FirefightersThought firefightersThought= iFirefightersThoughtService.getById(id);
redisUtils.set(RedisKey.THOUGHT_ID+id, JSON.toJSON(firefightersThought),time);
Map<String, Object> mainMap = Bean.BeantoMap(firefightersThought);
......
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