diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/note/NmNoteTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/note/NmNoteTagController.java deleted file mode 100644 index a0258ac03..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/note/NmNoteTagController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.ruoyi.web.controller.note; - -import java.util.List; -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.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.note.domain.NmNoteTag; -import com.ruoyi.note.service.INmNoteTagService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 便签标签Controller - * - * @author wang - * @date 2020-09-12 - */ -@RestController -@RequestMapping("/note/tag") -public class NmNoteTagController extends BaseController -{ - @Autowired - private INmNoteTagService nmNoteTagService; - - /** - * 查询便签标签列表 - */ - @PreAuthorize("@ss.hasPermi('note:tag:list')") - @GetMapping("/list") - public TableDataInfo list(NmNoteTag nmNoteTag) - { - startPage(); - List list = nmNoteTagService.selectNmNoteTagList(nmNoteTag); - return getDataTable(list); - } - - /** - * 导出便签标签列表 - */ - @PreAuthorize("@ss.hasPermi('note:tag:export')") - @Log(title = "便签标签", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(NmNoteTag nmNoteTag) - { - List list = nmNoteTagService.selectNmNoteTagList(nmNoteTag); - ExcelUtil util = new ExcelUtil(NmNoteTag.class); - return util.exportExcel(list, "tag"); - } - - /** - * 获取便签标签详细信息 - */ - @PreAuthorize("@ss.hasPermi('note:tag:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return AjaxResult.success(nmNoteTagService.selectNmNoteTagById(id)); - } - - /** - * 新增便签标签 - */ - @PreAuthorize("@ss.hasPermi('note:tag:add')") - @Log(title = "便签标签", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody NmNoteTag nmNoteTag) - { - return toAjax(nmNoteTagService.insertNmNoteTag(nmNoteTag)); - } - - /** - * 修改便签标签 - */ - @PreAuthorize("@ss.hasPermi('note:tag:edit')") - @Log(title = "便签标签", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody NmNoteTag nmNoteTag) - { - return toAjax(nmNoteTagService.updateNmNoteTag(nmNoteTag)); - } - - /** - * 删除便签标签 - */ - @PreAuthorize("@ss.hasPermi('note:tag:remove')") - @Log(title = "便签标签", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(nmNoteTagService.deleteNmNoteTagByIds(ids)); - } -} diff --git a/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteContent.java b/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteContent.java index c983e8840..37721c57f 100644 --- a/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteContent.java +++ b/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteContent.java @@ -19,7 +19,6 @@ import com.ruoyi.common.core.domain.BaseEntity; @NoArgsConstructor public class NmNoteContent { - private static final long serialVersionUID = 1L; /** 便签主键ID */ private Long noteId; diff --git a/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteTag.java b/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteTag.java deleted file mode 100644 index 90116fd5b..000000000 --- a/ruoyi-note/src/main/java/com/ruoyi/note/domain/NmNoteTag.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ruoyi.note.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 便签标签对象 nm_note_tag - * - * @author wang - * @date 2020-09-12 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class NmNoteTag -{ - - - /** id */ - private Long id; - - /** 便签id */ - @Excel(name = "便签id") - private Long noteId; - - /** 标签Id */ - @Excel(name = "标签Id") - private Long tagId; - -} diff --git a/ruoyi-note/src/main/java/com/ruoyi/note/mapper/NmNoteTagMapper.java b/ruoyi-note/src/main/java/com/ruoyi/note/mapper/NmNoteTagMapper.java deleted file mode 100644 index f75196879..000000000 --- a/ruoyi-note/src/main/java/com/ruoyi/note/mapper/NmNoteTagMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.note.mapper; - -import java.util.List; -import com.ruoyi.note.domain.NmNoteTag; - -/** - * 便签标签Mapper接口 - * - * @author wang - * @date 2020-09-12 - */ -public interface NmNoteTagMapper -{ - /** - * 查询便签标签 - * - * @param id 便签标签ID - * @return 便签标签 - */ - public NmNoteTag selectNmNoteTagById(Long id); - - /** - * 查询便签标签列表 - * - * @param nmNoteTag 便签标签 - * @return 便签标签集合 - */ - public List selectNmNoteTagList(NmNoteTag nmNoteTag); - - /** - * 新增便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - public int insertNmNoteTag(NmNoteTag nmNoteTag); - - /** - * 修改便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - public int updateNmNoteTag(NmNoteTag nmNoteTag); - - /** - * 删除便签标签 - * - * @param id 便签标签ID - * @return 结果 - */ - public int deleteNmNoteTagById(Long id); - - /** - * 批量删除便签标签 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteNmNoteTagByIds(Long[] ids); -} diff --git a/ruoyi-note/src/main/java/com/ruoyi/note/service/INmNoteTagService.java b/ruoyi-note/src/main/java/com/ruoyi/note/service/INmNoteTagService.java deleted file mode 100644 index cfb775001..000000000 --- a/ruoyi-note/src/main/java/com/ruoyi/note/service/INmNoteTagService.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ruoyi.note.service; - -import java.util.List; -import com.ruoyi.note.domain.NmNoteTag; - -/** - * 便签标签Service接口 - * - * @author wang - * @date 2020-09-12 - */ -public interface INmNoteTagService -{ - /** - * 查询便签标签 - * - * @param id 便签标签ID - * @return 便签标签 - */ - public NmNoteTag selectNmNoteTagById(Long id); - - /** - * 查询便签标签列表 - * - * @param nmNoteTag 便签标签 - * @return 便签标签集合 - */ - public List selectNmNoteTagList(NmNoteTag nmNoteTag); - - /** - * 新增便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - public int insertNmNoteTag(NmNoteTag nmNoteTag); - - /** - * 修改便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - public int updateNmNoteTag(NmNoteTag nmNoteTag); - - /** - * 批量删除便签标签 - * - * @param ids 需要删除的便签标签ID - * @return 结果 - */ - public int deleteNmNoteTagByIds(Long[] ids); - - /** - * 删除便签标签信息 - * - * @param id 便签标签ID - * @return 结果 - */ - public int deleteNmNoteTagById(Long id); -} diff --git a/ruoyi-note/src/main/java/com/ruoyi/note/service/impl/NmNoteTagServiceImpl.java b/ruoyi-note/src/main/java/com/ruoyi/note/service/impl/NmNoteTagServiceImpl.java deleted file mode 100644 index a123494a2..000000000 --- a/ruoyi-note/src/main/java/com/ruoyi/note/service/impl/NmNoteTagServiceImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.ruoyi.note.service.impl; - -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.ruoyi.note.mapper.NmNoteTagMapper; -import com.ruoyi.note.domain.NmNoteTag; -import com.ruoyi.note.service.INmNoteTagService; - -/** - * 便签标签Service业务层处理 - * - * @author wang - * @date 2020-09-12 - */ -@Service -public class NmNoteTagServiceImpl implements INmNoteTagService -{ - @Autowired - private NmNoteTagMapper nmNoteTagMapper; - - /** - * 查询便签标签 - * - * @param id 便签标签ID - * @return 便签标签 - */ - @Override - public NmNoteTag selectNmNoteTagById(Long id) - { - return nmNoteTagMapper.selectNmNoteTagById(id); - } - - /** - * 查询便签标签列表 - * - * @param nmNoteTag 便签标签 - * @return 便签标签 - */ - @Override - public List selectNmNoteTagList(NmNoteTag nmNoteTag) - { - return nmNoteTagMapper.selectNmNoteTagList(nmNoteTag); - } - - /** - * 新增便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - @Override - public int insertNmNoteTag(NmNoteTag nmNoteTag) - { - return nmNoteTagMapper.insertNmNoteTag(nmNoteTag); - } - - /** - * 修改便签标签 - * - * @param nmNoteTag 便签标签 - * @return 结果 - */ - @Override - public int updateNmNoteTag(NmNoteTag nmNoteTag) - { - return nmNoteTagMapper.updateNmNoteTag(nmNoteTag); - } - - /** - * 批量删除便签标签 - * - * @param ids 需要删除的便签标签ID - * @return 结果 - */ - @Override - public int deleteNmNoteTagByIds(Long[] ids) - { - return nmNoteTagMapper.deleteNmNoteTagByIds(ids); - } - - /** - * 删除便签标签信息 - * - * @param id 便签标签ID - * @return 结果 - */ - @Override - public int deleteNmNoteTagById(Long id) - { - return nmNoteTagMapper.deleteNmNoteTagById(id); - } -} diff --git a/ruoyi-note/src/main/resources/mapper/note/NmNoteTagMapper.xml b/ruoyi-note/src/main/resources/mapper/note/NmNoteTagMapper.xml deleted file mode 100644 index a2fe5c0fb..000000000 --- a/ruoyi-note/src/main/resources/mapper/note/NmNoteTagMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - select id, note_id, tag_id from nm_note_tag - - - - - - - - - insert into nm_note_tag - - note_id, - tag_id, - - - #{noteId}, - #{tagId}, - - - - - update nm_note_tag - - note_id = #{noteId}, - tag_id = #{tagId}, - - where id = #{id} - - - - delete from nm_note_tag where id = #{id} - - - - delete from nm_note_tag where id in - - #{id} - - - - diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 1e7556b8d..765dd11f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -10,7 +10,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 岗位表 sys_post - * + * * @author ruoyi */ public class SysPost extends BaseEntity @@ -104,7 +104,7 @@ public class SysPost extends BaseEntity { this.flag = flag; } - + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)