From 3ae4960e84ddd3dea65fa1d58a89f7099d183b60 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 29 Dec 2021 20:25:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=9A1=E3=80=81=E8=8B=B1?= =?UTF-8?q?=E8=AF=AD=E6=A8=A1=E5=9D=97=E5=BE=AE=E6=9C=8D=E5=8A=A1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90crud=20=20=20=20=20=202=E3=80=81jreb?= =?UTF-8?q?el=E5=A4=A7=E5=9D=91=EF=BC=8C=E6=B2=A1=E6=89=93=E5=BC=80jrebel?= =?UTF-8?q?=E5=8E=BB=E4=BD=BF=E7=94=A8j=20debug=E5=90=AF=E5=8A=A8=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0xml=E6=96=87=E4=BB=B6=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E4=BA=86=E4=B8=80=E4=B8=AA=E5=A4=9A=E5=B0=8F=E6=97=B6?= =?UTF-8?q?=E6=89=8D=E5=8F=91=E7=8E=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annotation/EnableCustomConfig.java | 13 +- ruoyi-ui/src/api/business/english/word.js | 44 +++ .../src/views/business/english/word/index.vue | 342 ++++++++++++++++++ xjs-business/xjs-business-english/pom.xml | 6 +- .../controller/EnglishWordController.java | 94 +++++ .../java/com/xjs/word/domain/EnglishWord.java | 129 +++++++ .../xjs/word/mapper/EnglishWordMapper.java | 64 ++++ .../xjs/word/service/IEnglishWordService.java | 64 ++++ .../service/impl/EnglishWordServiceImpl.java | 92 +++++ .../src/main/resources/bootstrap.yml | 2 + .../mapper.english/EnglishWordMapper.xml | 100 +++++ .../src/main/resources/rebel.xml | 16 + 12 files changed, 952 insertions(+), 14 deletions(-) create mode 100644 ruoyi-ui/src/api/business/english/word.js create mode 100644 ruoyi-ui/src/views/business/english/word/index.vue create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java create mode 100644 xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java create mode 100644 xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml create mode 100644 xjs-business/xjs-business-english/src/main/resources/rebel.xml diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java index 88402bee..40177f57 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java @@ -1,19 +1,14 @@ package com.ruoyi.common.security.annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import com.ruoyi.common.security.config.ApplicationConfig; +import com.ruoyi.common.security.feign.FeignAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; -import org.mybatis.spring.annotation.MapperScans; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; -import com.ruoyi.common.security.config.ApplicationConfig; -import com.ruoyi.common.security.feign.FeignAutoConfiguration; + +import java.lang.annotation.*; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-ui/src/api/business/english/word.js b/ruoyi-ui/src/api/business/english/word.js new file mode 100644 index 00000000..6ee255a0 --- /dev/null +++ b/ruoyi-ui/src/api/business/english/word.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询英语单词列表 +export function listWord(query) { + return request({ + url: '/english/word/list', + method: 'get', + params: query + }) +} + +// 查询英语单词详细 +export function getWord(id) { + return request({ + url: '/english/word/' + id, + method: 'get' + }) +} + +// 新增英语单词 +export function addWord(data) { + return request({ + url: '/english/word', + method: 'post', + data: data + }) +} + +// 修改英语单词 +export function updateWord(data) { + return request({ + url: '/english/word', + method: 'put', + data: data + }) +} + +// 删除英语单词 +export function delWord(id) { + return request({ + url: '/english/word/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue new file mode 100644 index 00000000..d99c96e7 --- /dev/null +++ b/ruoyi-ui/src/views/business/english/word/index.vue @@ -0,0 +1,342 @@ + + + diff --git a/xjs-business/xjs-business-english/pom.xml b/xjs-business/xjs-business-english/pom.xml index 720c3366..a4a3ae07 100644 --- a/xjs-business/xjs-business-english/pom.xml +++ b/xjs-business/xjs-business-english/pom.xml @@ -8,13 +8,9 @@ 3.3.0 4.0.0 - 业务模块-英语管理 + 业务模块-英语管理模块 xjs-business-english - - 8 - 8 - \ No newline at end of file diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java new file mode 100644 index 00000000..2c6e23a2 --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java @@ -0,0 +1,94 @@ +package com.xjs.word.controller; + +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.xjs.word.domain.EnglishWord; +import com.xjs.word.service.IEnglishWordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 英语单词Controller + * + * @author xjs + * @date 2021-12-29 + */ +@RestController +@RequestMapping("/word") +public class EnglishWordController extends BaseController { + @Autowired + private IEnglishWordService englishWordService; + + + //------------------------代码自动生成----------------------------------- + + /** + * 查询英语单词列表 + */ + @RequiresPermissions("english:word:list") + @GetMapping("/list") + public TableDataInfo list(EnglishWord englishWord) { + startPage(); + List list = englishWordService.selectEnglishWordList(englishWord); + return getDataTable(list); + } + + /** + * 导出英语单词列表 + */ + @RequiresPermissions("english:word:export") + @Log(title = "英语单词", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EnglishWord englishWord) { + List list = englishWordService.selectEnglishWordList(englishWord); + ExcelUtil util = new ExcelUtil(EnglishWord.class); + util.exportExcel(response, list, "英语单词数据"); + } + + /** + * 获取英语单词详细信息 + */ + @RequiresPermissions("english:word:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(englishWordService.selectEnglishWordById(id)); + } + + /** + * 新增英语单词 + */ + @RequiresPermissions("english:word:add") + @Log(title = "英语单词", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EnglishWord englishWord) { + return toAjax(englishWordService.insertEnglishWord(englishWord)); + } + + /** + * 修改英语单词 + */ + @RequiresPermissions("english:word:edit") + @Log(title = "英语单词", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EnglishWord englishWord) { + return toAjax(englishWordService.updateEnglishWord(englishWord)); + } + + /** + * 删除英语单词 + */ + @RequiresPermissions("english:word:remove") + @Log(title = "英语单词", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(englishWordService.deleteEnglishWordByIds(ids)); + } +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java new file mode 100644 index 00000000..a7770ccc --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/domain/EnglishWord.java @@ -0,0 +1,129 @@ +package com.xjs.word.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 英语单词对象 english_word + * + * @author xjs + * @date 2021-12-29 + */ +public class EnglishWord extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId + private Long id; + + /** + * 英语单词 + */ + @Excel(name = "英语单词") + private String englishWord; + + /** + * 对应的中文 + */ + @Excel(name = "对应的中文") + private String chineseWord; + + /** + * 排序1,2,3,4 + */ + @Excel(name = "排序1,2,3,4") + private Integer sort; + + /** + * 是否收藏 1收藏 2不收藏 + */ + @Excel(name = "是否收藏 1收藏 2不收藏") + private Integer isCollect; + + /** + * 置顶 1置顶 2不置顶 + */ + @Excel(name = "置顶 1置顶 2不置顶") + private Integer top; + + /** + * 查看次数 + */ + @Excel(name = "查看次数") + private Long lookCount; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setEnglishWord(String englishWord) { + this.englishWord = englishWord; + } + + public String getEnglishWord() { + return englishWord; + } + + public void setChineseWord(String chineseWord) { + this.chineseWord = chineseWord; + } + + public String getChineseWord() { + return chineseWord; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Integer getSort() { + return sort; + } + + public void setIsCollect(Integer isCollect) { + this.isCollect = isCollect; + } + + public Integer getIsCollect() { + return isCollect; + } + + public void setTop(Integer top) { + this.top = top; + } + + public Integer getTop() { + return top; + } + + public void setLookCount(Long lookCount) { + this.lookCount = lookCount; + } + + public Long getLookCount() { + return lookCount; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("englishWord", getEnglishWord()) + .append("chineseWord", getChineseWord()) + .append("sort", getSort()) + .append("isCollect", getIsCollect()) + .append("top", getTop()) + .append("lookCount", getLookCount()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java new file mode 100644 index 00000000..2bd03322 --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/mapper/EnglishWordMapper.java @@ -0,0 +1,64 @@ +package com.xjs.word.mapper; + +import com.xjs.word.domain.EnglishWord; + +import java.util.List; + +/** + * 英语单词Mapper接口 + * + * @author xjs + * @date 2021-12-29 + */ +public interface EnglishWordMapper { + + //------------------------代码自动生成----------------------------------- + + /** + * 查询英语单词 + * + * @param id 英语单词主键 + * @return 英语单词 + */ + EnglishWord selectEnglishWordById(Long id); + + /** + * 查询英语单词列表 + * + * @param englishWord 英语单词 + * @return 英语单词集合 + */ + List selectEnglishWordList(EnglishWord englishWord); + + /** + * 新增英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + int insertEnglishWord(EnglishWord englishWord); + + /** + * 修改英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + int updateEnglishWord(EnglishWord englishWord); + + /** + * 删除英语单词 + * + * @param id 英语单词主键 + * @return 结果 + */ + int deleteEnglishWordById(Long id); + + /** + * 批量删除英语单词 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteEnglishWordByIds(Long[] ids); +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java new file mode 100644 index 00000000..651b298c --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/IEnglishWordService.java @@ -0,0 +1,64 @@ +package com.xjs.word.service; + +import com.xjs.word.domain.EnglishWord; + +import java.util.List; + +/** + * 英语单词Service接口 + * + * @author xjs + * @date 2021-12-29 + */ +public interface IEnglishWordService { + + + //------------------------代码自动生成----------------------------------- + /** + * 查询英语单词 + * + * @param id 英语单词主键 + * @return 英语单词 + */ + public EnglishWord selectEnglishWordById(Long id); + + /** + * 查询英语单词列表 + * + * @param englishWord 英语单词 + * @return 英语单词集合 + */ + public List selectEnglishWordList(EnglishWord englishWord); + + /** + * 新增英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + public int insertEnglishWord(EnglishWord englishWord); + + /** + * 修改英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + public int updateEnglishWord(EnglishWord englishWord); + + /** + * 批量删除英语单词 + * + * @param ids 需要删除的英语单词主键集合 + * @return 结果 + */ + public int deleteEnglishWordByIds(Long[] ids); + + /** + * 删除英语单词信息 + * + * @param id 英语单词主键 + * @return 结果 + */ + public int deleteEnglishWordById(Long id); +} diff --git a/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java new file mode 100644 index 00000000..818f82e2 --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/java/com/xjs/word/service/impl/EnglishWordServiceImpl.java @@ -0,0 +1,92 @@ +package com.xjs.word.service.impl; + +import com.ruoyi.common.core.utils.DateUtils; +import com.xjs.word.domain.EnglishWord; +import com.xjs.word.mapper.EnglishWordMapper; +import com.xjs.word.service.IEnglishWordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 英语单词Service业务层处理 + * + * @author xjs + * @date 2021-12-29 + */ +@Service +public class EnglishWordServiceImpl implements IEnglishWordService { + @Resource + private EnglishWordMapper englishWordMapper; + + + //------------------------代码自动生成----------------------------------- + + /** + * 查询英语单词 + * + * @param id 英语单词主键 + * @return 英语单词 + */ + @Override + public EnglishWord selectEnglishWordById(Long id) { + return englishWordMapper.selectEnglishWordById(id); + } + + /** + * 查询英语单词列表 + * + * @param englishWord 英语单词 + * @return 英语单词 + */ + @Override + public List selectEnglishWordList(EnglishWord englishWord) { + return englishWordMapper.selectEnglishWordList(englishWord); + } + + /** + * 新增英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + @Override + public int insertEnglishWord(EnglishWord englishWord) { + englishWord.setCreateTime(DateUtils.getNowDate()); + return englishWordMapper.insertEnglishWord(englishWord); + } + + /** + * 修改英语单词 + * + * @param englishWord 英语单词 + * @return 结果 + */ + @Override + public int updateEnglishWord(EnglishWord englishWord) { + return englishWordMapper.updateEnglishWord(englishWord); + } + + /** + * 批量删除英语单词 + * + * @param ids 需要删除的英语单词主键 + * @return 结果 + */ + @Override + public int deleteEnglishWordByIds(Long[] ids) { + return englishWordMapper.deleteEnglishWordByIds(ids); + } + + /** + * 删除英语单词信息 + * + * @param id 英语单词主键 + * @return 结果 + */ + @Override + public int deleteEnglishWordById(Long id) { + return englishWordMapper.deleteEnglishWordById(id); + } +} diff --git a/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml b/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml index 84b61ceb..1e9e27fb 100644 --- a/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml +++ b/xjs-business/xjs-business-english/src/main/resources/bootstrap.yml @@ -25,3 +25,5 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #配置组 group: xjs + + diff --git a/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml new file mode 100644 index 00000000..bbd9f3a5 --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/resources/mapper.english/EnglishWordMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + select id, + english_word, + chinese_word, + sort, + is_collect, + top, + look_count, + create_time + from english_word + + + + + + + + insert into english_word + + id, + english_word, + chinese_word, + sort, + is_collect, + top, + look_count, + create_time, + + + #{id}, + #{englishWord}, + #{chineseWord}, + #{sort}, + #{isCollect}, + #{top}, + #{lookCount}, + #{createTime}, + + + + + update english_word + + english_word = #{englishWord}, + chinese_word = #{chineseWord}, + sort = #{sort}, + is_collect = #{isCollect}, + top = #{top}, + look_count = #{lookCount}, + create_time = #{createTime}, + + where id = #{id} + + + + delete + from english_word + where id = #{id} + + + + delete from english_word where id in + + #{id} + + + \ No newline at end of file diff --git a/xjs-business/xjs-business-english/src/main/resources/rebel.xml b/xjs-business/xjs-business-english/src/main/resources/rebel.xml new file mode 100644 index 00000000..2ac5b89c --- /dev/null +++ b/xjs-business/xjs-business-english/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + xjs-business-english + + + + + + +