diff --git a/src/main/java/com/bsd/cases/controller/CaseContentController.java b/src/main/java/com/bsd/cases/controller/CaseContentController.java index acadb1e..c6ad8e5 100644 --- a/src/main/java/com/bsd/cases/controller/CaseContentController.java +++ b/src/main/java/com/bsd/cases/controller/CaseContentController.java @@ -46,4 +46,24 @@ public class CaseContentController { } return ajaxResult; } + + @RequestMapping("/get-content-detail-by-category-id") + public AjaxResult getContentDetailByContentId(@RequestBody AjaxRequest ajaxRequest, HttpServletRequest request) { + AjaxResult ajaxResult = new AjaxResult(); + JSONObject data = ajaxRequest.getData(); + if (null == data){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("data missing"); + }else { + Long contentId = data.getLong("contentId"); + if (null == contentId){ + ajaxResult.setRetcode(AjaxResult.FAILED); + ajaxResult.setRetmsg("文章id不可为空"); + }else { + ajaxResult.setRetcode(AjaxResult.SUCCESS); + ajaxResult.setData(contentService.getContentDetailByContentId(contentId)); + } + } + return ajaxResult; + } } diff --git a/src/main/java/com/bsd/cases/model/CaseStore.java b/src/main/java/com/bsd/cases/model/CaseStore.java new file mode 100644 index 0000000..02b4f6b --- /dev/null +++ b/src/main/java/com/bsd/cases/model/CaseStore.java @@ -0,0 +1,22 @@ +package com.bsd.cases.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("case_store") +public class CaseStore extends BaseEntity{ + + private Long companyId; + + private String companyCode; + + private String companyName; + + private String storeId; + + private String storeName; + +} diff --git a/src/main/java/com/bsd/cases/model/CaseUsers.java b/src/main/java/com/bsd/cases/model/CaseUsers.java new file mode 100644 index 0000000..1048269 --- /dev/null +++ b/src/main/java/com/bsd/cases/model/CaseUsers.java @@ -0,0 +1,37 @@ +package com.bsd.cases.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("case_users") +public class CaseUsers extends BaseEntity{ + + private String userName; + + private String userNo; + + private String openId; + + private String mobile; + + private String userImage; + + private String password; + + private Long companyId; + + private String companyCode; + + private String companyName; + + private Long storeId; + + private String storeCode; + + private String storeName; + + private Integer role; +} diff --git a/src/main/java/com/bsd/cases/model/case_company.java b/src/main/java/com/bsd/cases/model/case_company.java new file mode 100644 index 0000000..fa10e9b --- /dev/null +++ b/src/main/java/com/bsd/cases/model/case_company.java @@ -0,0 +1,17 @@ +package com.bsd.cases.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("case_company") +public class case_company extends BaseEntity{ + + private Integer areaId; + + private String companyId; + + private String companyName; +} diff --git a/src/main/java/com/bsd/cases/service/CaseContentService.java b/src/main/java/com/bsd/cases/service/CaseContentService.java index dc766de..23db41b 100644 --- a/src/main/java/com/bsd/cases/service/CaseContentService.java +++ b/src/main/java/com/bsd/cases/service/CaseContentService.java @@ -1,10 +1,13 @@ package com.bsd.cases.service; import com.alibaba.fastjson.JSONObject; +import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; import java.util.List; public interface CaseContentService extends BaseService { JSONObject getContentListByCategoryId(Long categoryId, Integer pageNum, Integer pageSize); + + CaseContentDetailVo getContentDetailByContentId(Long contentId); } diff --git a/src/main/java/com/bsd/cases/service/CaseUsersService.java b/src/main/java/com/bsd/cases/service/CaseUsersService.java new file mode 100644 index 0000000..b085f26 --- /dev/null +++ b/src/main/java/com/bsd/cases/service/CaseUsersService.java @@ -0,0 +1,11 @@ +package com.bsd.cases.service; + +import com.bsd.cases.model.CaseUsers; +import com.bsd.cases.util.CommonMapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface CaseUsersService extends CommonMapper { + + +} 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 6921fe2..5f923b4 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseContentServiceImpl.java @@ -3,12 +3,11 @@ package com.bsd.cases.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bsd.cases.constants.Constants; -import com.bsd.cases.mapper.CaseContentMapper; -import com.bsd.cases.mapper.CaseContentStaticalMapper; -import com.bsd.cases.model.CaseContent; -import com.bsd.cases.model.CaseContentStatical; +import com.bsd.cases.mapper.*; +import com.bsd.cases.model.*; import com.bsd.cases.service.CaseContentService; import com.bsd.cases.util.PageUtils; +import com.bsd.cases.vo.CaseContentDetailVo; import com.bsd.cases.vo.CaseContentVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +23,13 @@ public class CaseContentServiceImpl extends BaseServiceImpl caseContentAttachmentList = caseContentAttachmentMapper.select(findCaseContentAttachment); + caseContentDetailVo.setCaseContentAttachmentList(caseContentAttachmentList); + CaseContentMaterial findCaseContentMaterial = new CaseContentMaterial(); + findCaseContentMaterial.setContentId(contentId); + findCaseContentMaterial.setState(Constants.STATE_VALID); + List caseContentMaterialList = caseContentMaterialMapper.select(findCaseContentMaterial); + caseContentDetailVo.setCaseContentMaterialList(caseContentMaterialList); + CaseContentStatical findCaseContentStatical = new CaseContentStatical(); + findCaseContentStatical.setContentId(contentId); + findCaseContentStatical.setState(Constants.STATE_VALID); + CaseContentStatical caseContentStatical = caseContentStaticalMapper.selectOne(findCaseContentStatical); + caseContentDetailVo.setScore(caseContentStatical.getScore()); + return caseContentDetailVo; + } } diff --git a/src/main/java/com/bsd/cases/vo/CaseContentDetailVo.java b/src/main/java/com/bsd/cases/vo/CaseContentDetailVo.java new file mode 100644 index 0000000..fe2a9fe --- /dev/null +++ b/src/main/java/com/bsd/cases/vo/CaseContentDetailVo.java @@ -0,0 +1,31 @@ +package com.bsd.cases.vo; + +import com.bsd.cases.model.CaseContentAttachment; +import com.bsd.cases.model.CaseContentMaterial; +import lombok.Data; + +import java.util.List; + +@Data +public class CaseContentDetailVo { + + private Long id; + + private String contentTitle; + + private Double score; + //二级 + private Long categoryId; + //二级 + private String categoryName; + + private String url; + + private String content; + + private List caseContentMaterialList; + + private List caseContentAttachmentList; + + private Boolean isLike; +}