master
zyy 5 years ago
parent d3244a3306
commit 29fa4d70ec

@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
@CrossOrigin @CrossOrigin
@RestController @RestController
@ -52,7 +53,7 @@ public class CaseContentController {
} }
@RequestMapping("/get-content-detail-by-category-id") @RequestMapping("/get-content-detail-by-category-id")
public AjaxResult getContentDetailByContentId(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { public AjaxResult getContentDetailByContentId(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) throws UnsupportedEncodingException {
AjaxResult ajaxResult = new AjaxResult(); AjaxResult ajaxResult = new AjaxResult();
JSONObject data = ajaxRequest.getData(); JSONObject data = ajaxRequest.getData();
if (null == data){ if (null == data){

@ -13,7 +13,7 @@ public class CaseContent extends BaseEntity {
private String url; private String url;
private String content; private byte[] content;
private Long categoryId; private Long categoryId;
} }

@ -9,12 +9,13 @@ import com.bsd.cases.vo.CaseContentDetailBakVo;
import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentDetailVo;
import com.bsd.cases.vo.CaseContentVo; import com.bsd.cases.vo.CaseContentVo;
import java.io.UnsupportedEncodingException;
import java.util.List; import java.util.List;
public interface CaseContentService<CaseContent> extends BaseService<CaseContent> { public interface CaseContentService<CaseContent> extends BaseService<CaseContent> {
JSONObject getContentListByCategoryId(Long categoryId, Integer pageNum, Integer pageSize); JSONObject getContentListByCategoryId(Long categoryId, Integer pageNum, Integer pageSize);
CaseContentDetailVo getContentDetailByContentId(Long contentId); CaseContentDetailVo getContentDetailByContentId(Long contentId) throws UnsupportedEncodingException;
AjaxResult saveContent(JSONObject jsonObject); AjaxResult saveContent(JSONObject jsonObject);
@ -30,5 +31,5 @@ public interface CaseContentService<CaseContent> extends BaseService<CaseContent
*/ */
PageAjax<CaseContentBakVo> searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum); PageAjax<CaseContentBakVo> searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum);
CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId); CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) throws UnsupportedEncodingException;
} }

@ -7,7 +7,6 @@ import com.bsd.cases.mapper.*;
import com.bsd.cases.model.*; import com.bsd.cases.model.*;
import com.bsd.cases.service.CaseContentService; import com.bsd.cases.service.CaseContentService;
import com.bsd.cases.service.CaseUsersService; import com.bsd.cases.service.CaseUsersService;
import com.bsd.cases.util.AjaxRequest;
import com.bsd.cases.util.AjaxResult; import com.bsd.cases.util.AjaxResult;
import com.bsd.cases.util.PageAjax; import com.bsd.cases.util.PageAjax;
import com.bsd.cases.util.PageUtils; import com.bsd.cases.util.PageUtils;
@ -16,12 +15,12 @@ import com.bsd.cases.vo.CaseContentDetailBakVo;
import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentDetailVo;
import com.bsd.cases.vo.CaseContentVo; import com.bsd.cases.vo.CaseContentVo;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.sun.org.apache.bcel.internal.generic.NEW;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -52,6 +51,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param categoryId * @param categoryId
* @param pageNum * @param pageNum
* @param pageSize * @param pageSize
@ -97,11 +97,12 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param contentId * @param contentId
* @return * @return
*/ */
@Override @Override
public CaseContentDetailVo getContentDetailByContentId(Long contentId) { public CaseContentDetailVo getContentDetailByContentId(Long contentId) throws UnsupportedEncodingException {
CaseUsers caseUsers = caseUsersService.currentUser(); CaseUsers caseUsers = caseUsersService.currentUser();
CaseContentView newCaseContentView = new CaseContentView(); CaseContentView newCaseContentView = new CaseContentView();
@ -130,7 +131,8 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId); CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId);
CaseContentDetailVo caseContentDetailVo = new CaseContentDetailVo(); CaseContentDetailVo caseContentDetailVo = new CaseContentDetailVo();
caseContentDetailVo.setId(contentId); caseContentDetailVo.setId(contentId);
caseContentDetailVo.setContent(caseContent.getContent()); String content = new String(caseContent.getContent(), "utf8");
caseContentDetailVo.setContent(content);
caseContentDetailVo.setCategoryId(caseContent.getCategoryId()); caseContentDetailVo.setCategoryId(caseContent.getCategoryId());
CaseCategory caseCategory = caseCategoryMapper.selectByPrimaryKey(caseContent.getCategoryId()); CaseCategory caseCategory = caseCategoryMapper.selectByPrimaryKey(caseContent.getCategoryId());
caseContentDetailVo.setCategoryName(caseCategory.getName()); caseContentDetailVo.setCategoryName(caseCategory.getName());
@ -169,6 +171,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@ -208,7 +211,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
CaseContent caseContent = new CaseContent(); CaseContent caseContent = new CaseContent();
caseContent.setContentTitle(contentTitle); caseContent.setContentTitle(contentTitle);
caseContent.setCategoryId(categoryId); caseContent.setCategoryId(categoryId);
caseContent.setContent(content); caseContent.setContent(content.getBytes());
caseContent.setUrl(url); caseContent.setUrl(url);
caseContent.setUpdateDateTime(new Date()); caseContent.setUpdateDateTime(new Date());
caseContentMapper.insert(caseContent); caseContentMapper.insert(caseContent);
@ -236,7 +239,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
caseContent.setUrl(url); caseContent.setUrl(url);
} }
if (StringUtils.isNotEmpty(content)) { if (StringUtils.isNotEmpty(content)) {
caseContent.setContent(content); caseContent.setContent(content.getBytes());
} }
if (null != categoryId) { if (null != categoryId) {
caseContent.setCategoryId(categoryId); caseContent.setCategoryId(categoryId);
@ -316,6 +319,7 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param contentId * @param contentId
* @return * @return
*/ */
@ -345,13 +349,14 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
} }
@Override @Override
public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) { public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) throws UnsupportedEncodingException {
CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId); CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId);
CaseContentDetailBakVo caseContentDetailBakVo = new CaseContentDetailBakVo(); CaseContentDetailBakVo caseContentDetailBakVo = new CaseContentDetailBakVo();
caseContentDetailBakVo.setId(contentId); caseContentDetailBakVo.setId(contentId);
caseContentDetailBakVo.setCategoryId(caseContent.getCategoryId()); caseContentDetailBakVo.setCategoryId(caseContent.getCategoryId());
caseContentDetailBakVo.setContent(caseContent.getContent()); String content = new String(caseContent.getContent(), "UTF-8");
caseContentDetailBakVo.setContentStr(content);
caseContentDetailBakVo.setContentTitle(caseContent.getContentTitle()); caseContentDetailBakVo.setContentTitle(caseContent.getContentTitle());
caseContentDetailBakVo.setUrl(caseContent.getUrl()); caseContentDetailBakVo.setUrl(caseContent.getUrl());
caseContentDetailBakVo.setState(caseContent.getState()); caseContentDetailBakVo.setState(caseContent.getState());

@ -10,6 +10,8 @@ import java.util.List;
@Data @Data
public class CaseContentDetailBakVo extends CaseContent { public class CaseContentDetailBakVo extends CaseContent {
private String contentStr;
private List<CaseContentMaterial> caseContentMaterialList; private List<CaseContentMaterial> caseContentMaterialList;
private List<CaseContentAttachment> caseContentAttachmentList; private List<CaseContentAttachment> caseContentAttachmentList;

Loading…
Cancel
Save