diff --git a/src/main/java/com/peanut/modules/book/controller/ChineseMedicineResearchController.java b/src/main/java/com/peanut/modules/book/controller/ChineseMedicineResearchController.java index e6aa04cd..2b107a1f 100644 --- a/src/main/java/com/peanut/modules/book/controller/ChineseMedicineResearchController.java +++ b/src/main/java/com/peanut/modules/book/controller/ChineseMedicineResearchController.java @@ -4,16 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.peanut.common.utils.R; import com.peanut.modules.book.entity.ChineseMedicineResearch; -import com.peanut.modules.book.entity.MedicaldesRecord; import com.peanut.modules.book.service.ChineseMedicineResearchService; -import com.peanut.modules.book.service.MedicaldesRecordService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.List; import java.util.Map; diff --git a/src/main/java/com/peanut/modules/book/controller/GeneralArticleController.java b/src/main/java/com/peanut/modules/book/controller/GeneralArticleController.java new file mode 100644 index 00000000..f39443ea --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/GeneralArticleController.java @@ -0,0 +1,57 @@ +package com.peanut.modules.book.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.GeneralArticle; +import com.peanut.modules.book.service.GeneralArticleService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + +@Slf4j +@RestController +@RequestMapping("book/generalArticle") +public class GeneralArticleController { + + @Autowired + private GeneralArticleService generalArticleService; + + /** + * 文章列表分页 + */ + @RequestMapping(path = "/articleByPage") + public R articleByPage(@RequestBody Map map) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (StringUtils.isNotEmpty(map.get("type").toString())){ + wrapper.eq(GeneralArticle::getType,map.get("type")); + } + wrapper.orderByAsc(GeneralArticle::getSort); + Page page = generalArticleService.page(new Page<>( + Long.parseLong(map.get("current").toString()), Long.parseLong(map.get("limit").toString())),wrapper); + return R.ok().put("result", page); + } + + @RequestMapping(path = "/getArticleById") + public R getArticleById(String id) { + return R.ok().put("result",generalArticleService.getById(id)); + } + + @RequestMapping(path = "/saveOrUpdateArticle") + public R saveOrUpdateArticle(@RequestBody GeneralArticle article) { + generalArticleService.saveOrUpdate(article); + return R.ok(); + } + + @RequestMapping(path = "/delArticle") + public R delArticle(String id) { + generalArticleService.removeById(id); + return R.ok(); + } + +} diff --git a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java index e9b77804..451d70b5 100644 --- a/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java +++ b/src/main/java/com/peanut/modules/book/controller/MedicaldesController.java @@ -28,8 +28,6 @@ import java.util.Map; @RequestMapping("book/medicaldes") public class MedicaldesController { - @Autowired - private MedicaldesRecordService recordService; @Autowired private MedicaldesLightService lightService; @Autowired @@ -355,49 +353,4 @@ public class MedicaldesController { return R.ok(); } - /** - * 吴门纪实列表 - */ - @RequestMapping(path = "/recordByType") - public R recordByType(String type) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - if (StringUtils.isNotEmpty(type)){ - wrapper.eq(MedicaldesRecord::getType,type); - } - wrapper.orderByAsc(MedicaldesRecord::getSort); - List list = recordService.list(wrapper); - return R.ok().put("result", list); - } - - /** - * 吴门纪实列表 - */ - @RequestMapping(path = "/recordByPage") - public R recordByPage(@RequestBody Map map) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - if (map.containsKey("type")&&StringUtils.isNotEmpty(map.get("type").toString())){ - wrapper.eq(MedicaldesRecord::getType,map.get("type")); - } - wrapper.orderByAsc(MedicaldesRecord::getSort); - Page page = recordService.page(new Page<>( - Long.parseLong(map.get("current").toString()), Long.parseLong(map.get("limit").toString())),wrapper); - return R.ok().put("result", page); - } - - @RequestMapping(path = "/getRecordById") - public R getRecordById(String id) { - return R.ok().put("result",recordService.getById(id)); - } - - @RequestMapping(path = "/saveOrUpdateRecord") - public R saveOrUpdateRecord(@RequestBody MedicaldesRecord record) { - recordService.saveOrUpdate(record); - return R.ok(); - } - - @RequestMapping(path = "/delRecord") - public R delRecord(String id) { - recordService.removeById(id); - return R.ok(); - } } diff --git a/src/main/java/com/peanut/modules/book/dao/MedicaldesRecordDao.java b/src/main/java/com/peanut/modules/book/dao/GeneralArticleDao.java similarity index 51% rename from src/main/java/com/peanut/modules/book/dao/MedicaldesRecordDao.java rename to src/main/java/com/peanut/modules/book/dao/GeneralArticleDao.java index ef02e1a8..dc711733 100644 --- a/src/main/java/com/peanut/modules/book/dao/MedicaldesRecordDao.java +++ b/src/main/java/com/peanut/modules/book/dao/GeneralArticleDao.java @@ -1,9 +1,9 @@ package com.peanut.modules.book.dao; import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.book.entity.MedicaldesRecord; +import com.peanut.modules.book.entity.GeneralArticle; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface MedicaldesRecordDao extends MPJBaseMapper { +public interface GeneralArticleDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/entity/MedicaldesRecord.java b/src/main/java/com/peanut/modules/book/entity/GeneralArticle.java similarity index 71% rename from src/main/java/com/peanut/modules/book/entity/MedicaldesRecord.java rename to src/main/java/com/peanut/modules/book/entity/GeneralArticle.java index f935984c..57b1b8d4 100644 --- a/src/main/java/com/peanut/modules/book/entity/MedicaldesRecord.java +++ b/src/main/java/com/peanut/modules/book/entity/GeneralArticle.java @@ -8,8 +8,8 @@ import lombok.Data; import java.io.Serializable; @Data -@TableName("medicaldes_record") -public class MedicaldesRecord implements Serializable { +@TableName("general_article") +public class GeneralArticle implements Serializable { private static final long serialVersionUID = 1L; @@ -22,9 +22,9 @@ public class MedicaldesRecord implements Serializable { private String title; /** - * 照片 + * 外链 */ - private String image; + private String url; /** * 内容 @@ -32,7 +32,12 @@ public class MedicaldesRecord implements Serializable { private String content; /** - * 类型1学术贡献、2抗疫纪实、3吴门公益 + * 文章类型 1文章 2外链形式 + */ + private Integer contentType; + + /** + * 类型 1学术思想 2学术平台 */ private Integer type; diff --git a/src/main/java/com/peanut/modules/book/service/MedicaldesRecordService.java b/src/main/java/com/peanut/modules/book/service/GeneralArticleService.java similarity index 54% rename from src/main/java/com/peanut/modules/book/service/MedicaldesRecordService.java rename to src/main/java/com/peanut/modules/book/service/GeneralArticleService.java index f577eb52..5247bac4 100644 --- a/src/main/java/com/peanut/modules/book/service/MedicaldesRecordService.java +++ b/src/main/java/com/peanut/modules/book/service/GeneralArticleService.java @@ -1,9 +1,9 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.peanut.modules.book.entity.MedicaldesRecord; +import com.peanut.modules.book.entity.GeneralArticle; import org.springframework.stereotype.Service; @Service -public interface MedicaldesRecordService extends IService { +public interface GeneralArticleService extends IService { } diff --git a/src/main/java/com/peanut/modules/book/service/impl/GeneralArticleServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/GeneralArticleServiceImpl.java new file mode 100644 index 00000000..b59ed29b --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/GeneralArticleServiceImpl.java @@ -0,0 +1,11 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.book.dao.GeneralArticleDao; +import com.peanut.modules.book.entity.GeneralArticle; +import com.peanut.modules.book.service.GeneralArticleService; +import org.springframework.stereotype.Service; + +@Service +public class GeneralArticleServiceImpl extends ServiceImpl implements GeneralArticleService { +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/MedicaldesRecordServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/MedicaldesRecordServiceImpl.java deleted file mode 100644 index 5aae809a..00000000 --- a/src/main/java/com/peanut/modules/book/service/impl/MedicaldesRecordServiceImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.peanut.modules.book.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.peanut.modules.book.dao.MedicaldesRecordDao; -import com.peanut.modules.book.entity.MedicaldesRecord; -import com.peanut.modules.book.service.MedicaldesRecordService; -import org.springframework.stereotype.Service; - -@Service -public class MedicaldesRecordServiceImpl extends ServiceImpl implements MedicaldesRecordService { -}