diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index 0ec9b31..2a8d7d3 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; @CrossOrigin @RestController @@ -52,7 +53,7 @@ public class CaseContentController { } @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(); JSONObject data = ajaxRequest.getData(); if (null == data){ diff --git a/src/main/java/com/bsd/cases/model/CaseContent.java b/src/main/java/com/bsd/cases/model/CaseContent.java index dce59e2..1a0936a 100644 --- a/src/main/java/com/bsd/cases/model/CaseContent.java +++ b/src/main/java/com/bsd/cases/model/CaseContent.java @@ -13,7 +13,7 @@ public class CaseContent extends BaseEntity { private String url; - private String content; + private byte[] content; private Long categoryId; } diff --git a/src/main/java/com/bsd/cases/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java index 2b9a5bb..8b66777 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentService.java @@ -9,12 +9,13 @@ import com.bsd.cases.vo.CaseContentDetailBakVo; import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; +import java.io.UnsupportedEncodingException; import java.util.List; public interface CaseContentService extends BaseService { JSONObject getContentListByCategoryId(Long categoryId, Integer pageNum, Integer pageSize); - CaseContentDetailVo getContentDetailByContentId(Long contentId); + CaseContentDetailVo getContentDetailByContentId(Long contentId) throws UnsupportedEncodingException; AjaxResult saveContent(JSONObject jsonObject); @@ -30,5 +31,5 @@ public interface CaseContentService extends BaseService searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum); - CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId); + CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) throws UnsupportedEncodingException; } diff --git a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java index 0ee4052..079ad0c 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java @@ -7,7 +7,6 @@ import com.bsd.cases.mapper.*; import com.bsd.cases.model.*; import com.bsd.cases.service.CaseContentService; import com.bsd.cases.service.CaseUsersService; -import com.bsd.cases.util.AjaxRequest; import com.bsd.cases.util.AjaxResult; import com.bsd.cases.util.PageAjax; 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.CaseContentVo; import com.github.pagehelper.PageHelper; -import com.sun.org.apache.bcel.internal.generic.NEW; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -52,24 +51,25 @@ public class CaseContentServiceImpl extends BaseServiceImpl caseContentList = caseContentMapper.select(findCaseContent); - JSONObject pageJson = PageUtils.page(caseContentList,pageNum,pageSize); + JSONObject pageJson = PageUtils.page(caseContentList, pageNum, pageSize); JSONArray jsonArray = pageJson.getJSONArray("list"); caseContentList = JSONObject.parseArray(JSONObject.toJSONString(jsonArray), CaseContent.class); List caseContentVoList = new ArrayList<>(); - for (CaseContent caseContent:caseContentList){ + for (CaseContent caseContent : caseContentList) { CaseContentVo caseContentVo = new CaseContentVo(); CaseContentStatical findCaseContentStatical = new CaseContentStatical(); findCaseContentStatical.setState(Constants.STATE_VALID); @@ -86,22 +86,23 @@ public class CaseContentServiceImpl extends BaseServiceImpl0){ + if (contentMaterialJson != null && contentAttachmentJson.size() > 0) { CaseContentMaterial findCaseContentMaterial = new CaseContentMaterial(); findCaseContentMaterial.setContentId(contentId); findCaseContentMaterial.setState(Constants.STATE_VALID); List caseContentMaterialList = caseContentMaterialMapper.select(findCaseContentMaterial); - for (CaseContentMaterial caseContentMaterial:caseContentMaterialList){ + for (CaseContentMaterial caseContentMaterial : caseContentMaterialList) { caseContentMaterial.setState(Constants.STATE_INVALID); caseContentMaterial.setUpdateDateTime(new Date()); caseContentMaterialMapper.updateByPrimaryKeySelective(caseContentMaterial); } } - if (contentAttachmentJson !=null && contentAttachmentJson.size()>0 ){ + if (contentAttachmentJson != null && contentAttachmentJson.size() > 0) { CaseContentAttachment findCaseContentAttachment = new CaseContentAttachment(); findCaseContentAttachment.setContentId(contentId); findCaseContentAttachment.setState(Constants.STATE_VALID); List caseContentAttachmentList = caseContentAttachmentMapper.select(findCaseContentAttachment); - for (CaseContentAttachment caseContentAttachment:caseContentAttachmentList){ + for (CaseContentAttachment caseContentAttachment : caseContentAttachmentList) { caseContentAttachment.setState(Constants.STATE_INVALID); caseContentAttachment.setUpdateDateTime(new Date()); caseContentAttachmentMapper.updateByPrimaryKeySelective(caseContentAttachment); @@ -268,9 +271,9 @@ public class CaseContentServiceImpl extends BaseServiceImpl0){ + if (contentMaterialJson != null && contentAttachmentJson.size() > 0) { List caseContentMaterialList = new ArrayList<>(); - for (int i = 0;i0 ){ + if (contentAttachmentJson != null && contentAttachmentJson.size() > 0) { List caseContentAttachmentList = new ArrayList<>(); - for (int i = 0;i searchBakContentByParam(String name, Long level1, Long level2, Long level3,Integer pageNum) { + public PageAjax searchBakContentByParam(String name, Long level1, Long level2, Long level3, Integer pageNum) { PageHelper.startPage(pageNum, Constants.PAGE_SIZE); - List caseContentBakVoList = caseContentMapper.searchBak(name,level1,level2,level3); + List caseContentBakVoList = caseContentMapper.searchBak(name, level1, level2, level3); PageAjax pageAjax = new PageAjax<>(caseContentBakVoList); return pageAjax; } @Override - public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) { + public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) throws UnsupportedEncodingException { CaseContent caseContent = caseContentMapper.selectByPrimaryKey(contentId); CaseContentDetailBakVo caseContentDetailBakVo = new CaseContentDetailBakVo(); caseContentDetailBakVo.setId(contentId); caseContentDetailBakVo.setCategoryId(caseContent.getCategoryId()); - caseContentDetailBakVo.setContent(caseContent.getContent()); + String content = new String(caseContent.getContent(), "UTF-8"); + caseContentDetailBakVo.setContentStr(content); caseContentDetailBakVo.setContentTitle(caseContent.getContentTitle()); caseContentDetailBakVo.setUrl(caseContent.getUrl()); caseContentDetailBakVo.setState(caseContent.getState()); diff --git a/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java b/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java index 057f7b8..37311c5 100644 --- a/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java +++ b/src/main/java/com/bsd/cases/vo/CaseContentDetailBakVo.java @@ -10,6 +10,8 @@ import java.util.List; @Data public class CaseContentDetailBakVo extends CaseContent { + private String contentStr; + private List caseContentMaterialList; private List caseContentAttachmentList;