From aa1ada4bba98405388ae609f4655326b63e51621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=9F=8E=E5=BF=B5=E4=BA=91?= <495888462@qq.com> Date: Wed, 4 Mar 2020 15:19:17 +0800 Subject: [PATCH] no commit message --- ruoyi-ui/src/api/base/idiom.js | 53 +++ ruoyi-ui/src/views/base/idiom/index.vue | 308 ++++++++++++++++++ .../ruoyi/project/mr/api/IdiomController.java | 78 +++++ .../base/controller/DataIdiomController.java | 106 ++++++ .../project/mr/base/domain/DataIdiom.java | 98 ++++++ .../mr/base/mapper/DataIdiomMapper.java | 69 ++++ .../mr/base/service/IDataIdiomService.java | 69 ++++ .../service/impl/DataIdiomServiceImpl.java | 108 ++++++ .../main/resources/i18n/messages.properties | 1 + .../mybatis/base/DataIdiomMapper.xml | 98 ++++++ 10 files changed, 988 insertions(+) create mode 100644 ruoyi-ui/src/api/base/idiom.js create mode 100644 ruoyi-ui/src/views/base/idiom/index.vue create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/api/IdiomController.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/base/controller/DataIdiomController.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/base/domain/DataIdiom.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/base/mapper/DataIdiomMapper.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/base/service/IDataIdiomService.java create mode 100644 ruoyi/src/main/java/com/ruoyi/project/mr/base/service/impl/DataIdiomServiceImpl.java create mode 100644 ruoyi/src/main/resources/mybatis/base/DataIdiomMapper.xml diff --git a/ruoyi-ui/src/api/base/idiom.js b/ruoyi-ui/src/api/base/idiom.js new file mode 100644 index 000000000..39bce337b --- /dev/null +++ b/ruoyi-ui/src/api/base/idiom.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询成语存放列表 +export function listIdiom(query) { + return request({ + url: '/base/idiom/list', + method: 'get', + params: query + }) +} + +// 查询成语存放详细 +export function getIdiom(id) { + return request({ + url: '/base/idiom/' + id, + method: 'get' + }) +} + +// 新增成语存放 +export function addIdiom(data) { + return request({ + url: '/base/idiom', + method: 'post', + data: data + }) +} + +// 修改成语存放 +export function updateIdiom(data) { + return request({ + url: '/base/idiom', + method: 'put', + data: data + }) +} + +// 删除成语存放 +export function delIdiom(id) { + return request({ + url: '/base/idiom/' + id, + method: 'delete' + }) +} + +// 导出成语存放 +export function exportIdiom(query) { + return request({ + url: '/base/idiom/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/base/idiom/index.vue b/ruoyi-ui/src/views/base/idiom/index.vue new file mode 100644 index 000000000..72d49d8bf --- /dev/null +++ b/ruoyi-ui/src/views/base/idiom/index.vue @@ -0,0 +1,308 @@ + + + diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/api/IdiomController.java b/ruoyi/src/main/java/com/ruoyi/project/mr/api/IdiomController.java new file mode 100644 index 000000000..78b615e11 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/api/IdiomController.java @@ -0,0 +1,78 @@ +package com.ruoyi.project.mr.api; + +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.common.enums.UserStatus; +import com.ruoyi.common.utils.MessageUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.project.mr.base.domain.DataIdiom; +import com.ruoyi.project.mr.base.service.IDataIdiomService; +import com.ruoyi.project.system.domain.SysUser; +import com.ruoyi.project.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * swagger 成语接口 + * + * @author zzp + */ +@Api(tags = "成语接口") +@RestController +@RequestMapping("/mr/base") +public class IdiomController extends BaseController { + // 令牌秘钥 + @Value("${token.apiSecret}") + private String apiSecret; + + @Autowired + private IDataIdiomService dataIdiomService; + + @ApiOperation(value = "成语信息", notes = "根据ID查询成语信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "成语ID", dataType = "int", paramType = "query", example = "1")}) + @GetMapping("/IdiomByID") + public AjaxResult getIdiomByID(@RequestHeader(value = "signature", required = false) String secret, Long id) { + if (StringUtils.isEmpty(secret)) { + return AjaxResult.error(400, MessageUtils.message("api.error.msg")); + } else if (!apiSecret.equals(secret)) { + return AjaxResult.error(400, MessageUtils.message("api.error.msg")); + } + + DataIdiom idiom = dataIdiomService.selectDataIdiomById(id); + + if(idiom!= null){ + return AjaxResult.success(idiom); + }else{ + return AjaxResult.error(400, MessageUtils.message("api.error.null")); + } + } + + @ApiOperation(value = "成语信息", notes = "根据词语查询成语信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "词语", dataType = "String", paramType = "query", example = "双")}) + @GetMapping("/IdiomByName") + public AjaxResult getIdiomByName(@RequestHeader(value = "signature", required = false) String secret, String name) { + if (StringUtils.isEmpty(secret)) { + return AjaxResult.error(400, MessageUtils.message("api.error.msg")); + } else if (!apiSecret.equals(secret)) { + return AjaxResult.error(400, MessageUtils.message("api.error.msg")); + } + DataIdiom idiom = dataIdiomService.selectDataIdiomByName(name); + if(idiom!= null){ + return AjaxResult.success(idiom); + }else{ + return AjaxResult.error(400, MessageUtils.message("api.error.null")); + } + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/base/controller/DataIdiomController.java b/ruoyi/src/main/java/com/ruoyi/project/mr/base/controller/DataIdiomController.java new file mode 100644 index 000000000..4397d0ee6 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/base/controller/DataIdiomController.java @@ -0,0 +1,106 @@ +package com.ruoyi.project.mr.base.controller; + +import java.util.List; + +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.framework.aspectj.lang.annotation.Log; +import com.ruoyi.framework.aspectj.lang.enums.BusinessType; +import com.ruoyi.project.mr.base.domain.DataIdiom; +import com.ruoyi.project.mr.base.service.IDataIdiomService; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.web.page.TableDataInfo; + +/** + * 成语存放Controller + * + * @author mr + * @date 2020-03-03 + */ +@RestController +@RequestMapping("/base/idiom") +public class DataIdiomController extends BaseController +{ + @Autowired + private IDataIdiomService dataIdiomService; + + /** + * 查询成语存放列表 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:list')") + @GetMapping("/list") + public TableDataInfo list(DataIdiom dataIdiom) + { + startPage(); + List list = dataIdiomService.selectDataIdiomList(dataIdiom); + return getDataTable(list); + } + + /** + * 导出成语存放列表 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:export')") + @Log(title = "成语存放", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(DataIdiom dataIdiom) + { + List list = dataIdiomService.selectDataIdiomList(dataIdiom); + ExcelUtil util = new ExcelUtil(DataIdiom.class); + return util.exportExcel(list, "idiom"); + } + + /** + * 获取成语存放详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(dataIdiomService.selectDataIdiomById(id)); + } + + /** + * 新增成语存放 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:add')") + @Log(title = "成语存放", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DataIdiom dataIdiom) + { + dataIdiom.setCreateBy(SecurityUtils.getUsername()); + return toAjax(dataIdiomService.insertDataIdiom(dataIdiom)); + } + + /** + * 修改成语存放 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:edit')") + @Log(title = "成语存放", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DataIdiom dataIdiom) + { + return toAjax(dataIdiomService.updateDataIdiom(dataIdiom)); + } + + /** + * 删除成语存放 + */ + @PreAuthorize("@ss.hasPermi('base:idiom:remove')") + @Log(title = "成语存放", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(dataIdiomService.deleteDataIdiomByIds(ids)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/base/domain/DataIdiom.java b/ruoyi/src/main/java/com/ruoyi/project/mr/base/domain/DataIdiom.java new file mode 100644 index 000000000..8271d5081 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/base/domain/DataIdiom.java @@ -0,0 +1,98 @@ +package com.ruoyi.project.mr.base.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.framework.aspectj.lang.annotation.Excel; +import com.ruoyi.framework.web.domain.BaseEntity; + +/** + * 成语存放对象 data_idiom + * + * @author mr + * @date 2020-03-03 + */ +public class DataIdiom extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 成语 */ + @Excel(name = "成语") + private String idiomName; + + /** 拼音 */ + @Excel(name = "拼音") + private String idiomPinyin; + + /** 注释 */ + @Excel(name = "注释") + private String idiomDesc; + + /** 难易程度 */ + @Excel(name = "难易程度") + private Integer idiomLevel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setIdiomName(String idiomName) + { + this.idiomName = idiomName; + } + + public String getIdiomName() + { + return idiomName; + } + public void setIdiomPinyin(String idiomPinyin) + { + this.idiomPinyin = idiomPinyin; + } + + public String getIdiomPinyin() + { + return idiomPinyin; + } + public void setIdiomDesc(String idiomDesc) + { + this.idiomDesc = idiomDesc; + } + + public String getIdiomDesc() + { + return idiomDesc; + } + public void setIdiomLevel(Integer idiomLevel) + { + this.idiomLevel = idiomLevel; + } + + public Integer getIdiomLevel() + { + return idiomLevel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("idiomName", getIdiomName()) + .append("idiomPinyin", getIdiomPinyin()) + .append("idiomDesc", getIdiomDesc()) + .append("idiomLevel", getIdiomLevel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/base/mapper/DataIdiomMapper.java b/ruoyi/src/main/java/com/ruoyi/project/mr/base/mapper/DataIdiomMapper.java new file mode 100644 index 000000000..d960fc0b3 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/base/mapper/DataIdiomMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.project.mr.base.mapper; + +import com.ruoyi.project.mr.base.domain.DataIdiom; +import java.util.List; + +/** + * 成语存放Mapper接口 + * + * @author mr + * @date 2020-03-03 + */ +public interface DataIdiomMapper +{ + /** + * 查询成语存放 + * + * @param id 成语存放ID + * @return 成语存放 + */ + public DataIdiom selectDataIdiomById(Long id); + + /** + * 查询成语存放 + * + * @param name 成语存放Name + * @return 成语存放 + */ + public DataIdiom selectDataIdiomByName(String name); + + /** + * 查询成语存放列表 + * + * @param dataIdiom 成语存放 + * @return 成语存放集合 + */ + public List selectDataIdiomList(DataIdiom dataIdiom); + + /** + * 新增成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + public int insertDataIdiom(DataIdiom dataIdiom); + + /** + * 修改成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + public int updateDataIdiom(DataIdiom dataIdiom); + + /** + * 删除成语存放 + * + * @param id 成语存放ID + * @return 结果 + */ + public int deleteDataIdiomById(Long id); + + /** + * 批量删除成语存放 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteDataIdiomByIds(Long[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/IDataIdiomService.java b/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/IDataIdiomService.java new file mode 100644 index 000000000..7f6f80620 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/IDataIdiomService.java @@ -0,0 +1,69 @@ +package com.ruoyi.project.mr.base.service; + +import com.ruoyi.project.mr.base.domain.DataIdiom; +import java.util.List; + +/** + * 成语存放Service接口 + * + * @author mr + * @date 2020-03-03 + */ +public interface IDataIdiomService +{ + /** + * 查询成语存放 + * + * @param id 成语存放ID + * @return 成语存放 + */ + public DataIdiom selectDataIdiomById(Long id); + + /** + * 查询成语存放 + * + * @param name 成语存放Name + * @return 成语存放 + */ + public DataIdiom selectDataIdiomByName(String name); + + /** + * 查询成语存放列表 + * + * @param dataIdiom 成语存放 + * @return 成语存放集合 + */ + public List selectDataIdiomList(DataIdiom dataIdiom); + + /** + * 新增成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + public int insertDataIdiom(DataIdiom dataIdiom); + + /** + * 修改成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + public int updateDataIdiom(DataIdiom dataIdiom); + + /** + * 批量删除成语存放 + * + * @param ids 需要删除的成语存放ID + * @return 结果 + */ + public int deleteDataIdiomByIds(Long[] ids); + + /** + * 删除成语存放信息 + * + * @param id 成语存放ID + * @return 结果 + */ + public int deleteDataIdiomById(Long id); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/impl/DataIdiomServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/impl/DataIdiomServiceImpl.java new file mode 100644 index 000000000..1d336c61b --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/base/service/impl/DataIdiomServiceImpl.java @@ -0,0 +1,108 @@ +package com.ruoyi.project.mr.base.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.project.mr.base.mapper.DataIdiomMapper; +import com.ruoyi.project.mr.base.domain.DataIdiom; +import com.ruoyi.project.mr.base.service.IDataIdiomService; + +/** + * 成语存放Service业务层处理 + * + * @author mr + * @date 2020-03-03 + */ +@Service +public class DataIdiomServiceImpl implements IDataIdiomService +{ + @Autowired + private DataIdiomMapper dataIdiomMapper; + + /** + * 查询成语存放 + * + * @param id 成语存放ID + * @return 成语存放 + */ + @Override + public DataIdiom selectDataIdiomById(Long id) + { + return dataIdiomMapper.selectDataIdiomById(id); + } + + /** + * 查询成语存放 + * + * @param name 成语存放Name + * @return 成语存放 + */ + @Override + public DataIdiom selectDataIdiomByName(String name) + { + return dataIdiomMapper.selectDataIdiomByName(name); + } + + /** + * 查询成语存放列表 + * + * @param dataIdiom 成语存放 + * @return 成语存放 + */ + @Override + public List selectDataIdiomList(DataIdiom dataIdiom) + { + return dataIdiomMapper.selectDataIdiomList(dataIdiom); + } + + /** + * 新增成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + @Override + public int insertDataIdiom(DataIdiom dataIdiom) + { + dataIdiom.setCreateTime(DateUtils.getNowDate()); + return dataIdiomMapper.insertDataIdiom(dataIdiom); + } + + /** + * 修改成语存放 + * + * @param dataIdiom 成语存放 + * @return 结果 + */ + @Override + public int updateDataIdiom(DataIdiom dataIdiom) + { + dataIdiom.setUpdateTime(DateUtils.getNowDate()); + return dataIdiomMapper.updateDataIdiom(dataIdiom); + } + + /** + * 批量删除成语存放 + * + * @param ids 需要删除的成语存放ID + * @return 结果 + */ + @Override + public int deleteDataIdiomByIds(Long[] ids) + { + return dataIdiomMapper.deleteDataIdiomByIds(ids); + } + + /** + * 删除成语存放信息 + * + * @param id 成语存放ID + * @return 结果 + */ + @Override + public int deleteDataIdiomById(Long id) + { + return dataIdiomMapper.deleteDataIdiomById(id); + } +} diff --git a/ruoyi/src/main/resources/i18n/messages.properties b/ruoyi/src/main/resources/i18n/messages.properties index 054def803..06d38f3b4 100644 --- a/ruoyi/src/main/resources/i18n/messages.properties +++ b/ruoyi/src/main/resources/i18n/messages.properties @@ -38,3 +38,4 @@ no.view.permission=您没有查看数据的权限，请联系管理员添加权 #API消息 api.success.msg=请求(或处理)成功 api.error.msg=请求参数不完整或不正确 +api.error.null=无请求数据 diff --git a/ruoyi/src/main/resources/mybatis/base/DataIdiomMapper.xml b/ruoyi/src/main/resources/mybatis/base/DataIdiomMapper.xml new file mode 100644 index 000000000..b61071213 --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/base/DataIdiomMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + select id, idiom_name, idiom_pinyin, idiom_desc, idiom_level, create_by, create_time, update_by, update_time, remark from data_idiom + + + + + + + + + + insert into data_idiom + + id, + idiom_name, + idiom_pinyin, + idiom_desc, + idiom_level, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{idiomName}, + #{idiomPinyin}, + #{idiomDesc}, + #{idiomLevel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update data_idiom + + idiom_name = #{idiomName}, + idiom_pinyin = #{idiomPinyin}, + idiom_desc = #{idiomDesc}, + idiom_level = #{idiomLevel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from data_idiom where id = #{id} + + + + delete from data_idiom where id in + + #{id} + + + +