Compare commits

..

No commits in common. 'a9e44bf6afe55e2248c8b27d65e84da90ff28515' and '2ea2957ea5b858ff81169d4a2264422101d6900a' have entirely different histories.

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

@ -9,13 +9,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 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) throws UnsupportedEncodingException; CaseContentDetailVo getContentDetailByContentId(Long contentId);
AjaxResult saveContent(JSONObject jsonObject); AjaxResult saveContent(JSONObject jsonObject);
@ -31,5 +30,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) throws UnsupportedEncodingException; CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId);
} }

@ -7,6 +7,7 @@ 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;
@ -15,12 +16,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;
@ -51,7 +52,6 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param categoryId * @param categoryId
* @param pageNum * @param pageNum
* @param pageSize * @param pageSize
@ -97,12 +97,11 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param contentId * @param contentId
* @return * @return
*/ */
@Override @Override
public CaseContentDetailVo getContentDetailByContentId(Long contentId) throws UnsupportedEncodingException { public CaseContentDetailVo getContentDetailByContentId(Long contentId) {
CaseUsers caseUsers = caseUsersService.currentUser(); CaseUsers caseUsers = caseUsersService.currentUser();
CaseContentView newCaseContentView = new CaseContentView(); CaseContentView newCaseContentView = new CaseContentView();
@ -131,8 +130,7 @@ 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);
String content = new String(caseContent.getContent(), "utf8"); caseContentDetailVo.setContent(caseContent.getContent());
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());
@ -171,7 +169,6 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@ -211,7 +208,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.getBytes()); caseContent.setContent(content);
caseContent.setUrl(url); caseContent.setUrl(url);
caseContent.setCreateDateTime(new Date()); caseContent.setCreateDateTime(new Date());
caseContent.setUpdateDateTime(new Date()); caseContent.setUpdateDateTime(new Date());
@ -240,7 +237,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.getBytes()); caseContent.setContent(content);
} }
if (null != categoryId){ if (null != categoryId){
caseContent.setCategoryId(categoryId); caseContent.setCategoryId(categoryId);
@ -320,7 +317,6 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
/** /**
* *
*
* @param contentId * @param contentId
* @return * @return
*/ */
@ -350,14 +346,13 @@ public class CaseContentServiceImpl extends BaseServiceImpl<CaseContentMapper, C
} }
@Override @Override
public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) throws UnsupportedEncodingException { public CaseContentDetailBakVo getCaseContentDetailBakVoByContentID(Long contentId) {
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());
String content = new String(caseContent.getContent(), "UTF-8"); caseContentDetailBakVo.setContent(caseContent.getContent());
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,8 +10,6 @@ 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