From e98a95c7e52db09cae3d6959c1787a9a5de6ce0c Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 30 Aug 2023 18:29:19 +0800 Subject: [PATCH] =?UTF-8?q?add=20-=20=E8=AF=AD=E8=A8=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/HwAreaController.java | 103 ++++++ .../java/com/ruoyi/basic/domain/HwArea.java | 72 ++++ .../com/ruoyi/basic/mapper/HwAreaMapper.java | 61 ++++ .../ruoyi/basic/service/IHwAreaService.java | 61 ++++ .../basic/service/impl/HwAreaServiceImpl.java | 96 +++++ .../resources/mapper/basic/HwAreaMapper.xml | 92 +++++ .../mapper/basic/HwDictDataLanguageMapper.xml | 66 ---- .../mapper/basic/HwDictDataMapper.xml | 118 ------- .../mapper/basic/HwDictTypeMapper.xml | 86 ----- ruoyi-ui/src/api/basic/area.js | 44 +++ ruoyi-ui/src/api/basic/language.js | 44 +++ ruoyi-ui/src/views/basic/area/index.vue | 331 ++++++++++++++++++ ruoyi-ui/src/views/basic/language/index.vue | 310 ++++++++++++++++ 13 files changed, 1214 insertions(+), 270 deletions(-) create mode 100644 ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/HwAreaController.java create mode 100644 ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/HwArea.java create mode 100644 ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/HwAreaMapper.java create mode 100644 ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/IHwAreaService.java create mode 100644 ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/impl/HwAreaServiceImpl.java create mode 100644 ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwAreaMapper.xml delete mode 100644 ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataLanguageMapper.xml delete mode 100644 ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataMapper.xml delete mode 100644 ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictTypeMapper.xml create mode 100644 ruoyi-ui/src/api/basic/area.js create mode 100644 ruoyi-ui/src/api/basic/language.js create mode 100644 ruoyi-ui/src/views/basic/area/index.vue create mode 100644 ruoyi-ui/src/views/basic/language/index.vue diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/HwAreaController.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/HwAreaController.java new file mode 100644 index 0000000..5ede497 --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/controller/HwAreaController.java @@ -0,0 +1,103 @@ +package com.ruoyi.basic.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +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.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.basic.domain.HwArea; +import com.ruoyi.basic.service.IHwAreaService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; + +/** + * 区域管理Controller + * + * @author YINQ + * @date 2023-08-30 + */ +@RestController +@RequestMapping("/area") +public class HwAreaController extends BaseController +{ + @Autowired + private IHwAreaService hwAreaService; + + /** + * 查询区域管理列表 + */ + @RequiresPermissions("basic:area:list") + @GetMapping("/list") + public AjaxResult list(HwArea hwArea) + { + List list = hwAreaService.selectHwAreaList(hwArea); + return success(list); + } + + /** + * 导出区域管理列表 + */ + @RequiresPermissions("basic:area:export") + @Log(title = "区域管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, HwArea hwArea) + { + List list = hwAreaService.selectHwAreaList(hwArea); + ExcelUtil util = new ExcelUtil(HwArea.class); + util.exportExcel(response, list, "区域管理数据"); + } + + /** + * 获取区域管理详细信息 + */ + @RequiresPermissions("basic:area:query") + @GetMapping(value = "/{areaId}") + public AjaxResult getInfo(@PathVariable("areaId") Long areaId) + { + return success(hwAreaService.selectHwAreaByAreaId(areaId)); + } + + /** + * 新增区域管理 + */ + @RequiresPermissions("basic:area:add") + @Log(title = "区域管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody HwArea hwArea) + { + return toAjax(hwAreaService.insertHwArea(hwArea)); + } + + /** + * 修改区域管理 + */ + @RequiresPermissions("basic:area:edit") + @Log(title = "区域管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody HwArea hwArea) + { + return toAjax(hwAreaService.updateHwArea(hwArea)); + } + + /** + * 删除区域管理 + */ + @RequiresPermissions("basic:area:remove") + @Log(title = "区域管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{areaIds}") + public AjaxResult remove(@PathVariable Long[] areaIds) + { + return toAjax(hwAreaService.deleteHwAreaByAreaIds(areaIds)); + } +} diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/HwArea.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/HwArea.java new file mode 100644 index 0000000..0c62cd9 --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/domain/HwArea.java @@ -0,0 +1,72 @@ +package com.ruoyi.basic.domain; + +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.TreeEntity; + +/** + * 区域管理对象 hw_area + * + * @author YINQ + * @date 2023-08-30 + */ +public class HwArea extends TreeEntity +{ + private static final long serialVersionUID = 1L; + + /** 区域ID */ + private Long areaId; + + /** 区域名称 */ + @Excel(name = "区域名称") + private String areaName; + + /** 区域状态 */ + @Excel(name = "区域状态") + private Long areaStatus; + + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setAreaStatus(Long areaStatus) + { + this.areaStatus = areaStatus; + } + + public Long getAreaStatus() + { + return areaStatus; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("areaId", getAreaId()) + .append("areaName", getAreaName()) + .append("ancestors", getAncestors()) + .append("parentId", getParentId()) + .append("areaStatus", getAreaStatus()) + .append("orderNum", getOrderNum()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/HwAreaMapper.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/HwAreaMapper.java new file mode 100644 index 0000000..3183eaa --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/mapper/HwAreaMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.basic.mapper; + +import java.util.List; +import com.ruoyi.basic.domain.HwArea; + +/** + * 区域管理Mapper接口 + * + * @author YINQ + * @date 2023-08-30 + */ +public interface HwAreaMapper +{ + /** + * 查询区域管理 + * + * @param areaId 区域管理主键 + * @return 区域管理 + */ + public HwArea selectHwAreaByAreaId(Long areaId); + + /** + * 查询区域管理列表 + * + * @param hwArea 区域管理 + * @return 区域管理集合 + */ + public List selectHwAreaList(HwArea hwArea); + + /** + * 新增区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + public int insertHwArea(HwArea hwArea); + + /** + * 修改区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + public int updateHwArea(HwArea hwArea); + + /** + * 删除区域管理 + * + * @param areaId 区域管理主键 + * @return 结果 + */ + public int deleteHwAreaByAreaId(Long areaId); + + /** + * 批量删除区域管理 + * + * @param areaIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteHwAreaByAreaIds(Long[] areaIds); +} diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/IHwAreaService.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/IHwAreaService.java new file mode 100644 index 0000000..f84de22 --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/IHwAreaService.java @@ -0,0 +1,61 @@ +package com.ruoyi.basic.service; + +import java.util.List; +import com.ruoyi.basic.domain.HwArea; + +/** + * 区域管理Service接口 + * + * @author YINQ + * @date 2023-08-30 + */ +public interface IHwAreaService +{ + /** + * 查询区域管理 + * + * @param areaId 区域管理主键 + * @return 区域管理 + */ + public HwArea selectHwAreaByAreaId(Long areaId); + + /** + * 查询区域管理列表 + * + * @param hwArea 区域管理 + * @return 区域管理集合 + */ + public List selectHwAreaList(HwArea hwArea); + + /** + * 新增区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + public int insertHwArea(HwArea hwArea); + + /** + * 修改区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + public int updateHwArea(HwArea hwArea); + + /** + * 批量删除区域管理 + * + * @param areaIds 需要删除的区域管理主键集合 + * @return 结果 + */ + public int deleteHwAreaByAreaIds(Long[] areaIds); + + /** + * 删除区域管理信息 + * + * @param areaId 区域管理主键 + * @return 结果 + */ + public int deleteHwAreaByAreaId(Long areaId); +} diff --git a/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/impl/HwAreaServiceImpl.java b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/impl/HwAreaServiceImpl.java new file mode 100644 index 0000000..4202533 --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/java/com/ruoyi/basic/service/impl/HwAreaServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.basic.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.basic.mapper.HwAreaMapper; +import com.ruoyi.basic.domain.HwArea; +import com.ruoyi.basic.service.IHwAreaService; + +/** + * 区域管理Service业务层处理 + * + * @author YINQ + * @date 2023-08-30 + */ +@Service +public class HwAreaServiceImpl implements IHwAreaService +{ + @Autowired + private HwAreaMapper hwAreaMapper; + + /** + * 查询区域管理 + * + * @param areaId 区域管理主键 + * @return 区域管理 + */ + @Override + public HwArea selectHwAreaByAreaId(Long areaId) + { + return hwAreaMapper.selectHwAreaByAreaId(areaId); + } + + /** + * 查询区域管理列表 + * + * @param hwArea 区域管理 + * @return 区域管理 + */ + @Override + public List selectHwAreaList(HwArea hwArea) + { + return hwAreaMapper.selectHwAreaList(hwArea); + } + + /** + * 新增区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + @Override + public int insertHwArea(HwArea hwArea) + { + hwArea.setCreateTime(DateUtils.getNowDate()); + return hwAreaMapper.insertHwArea(hwArea); + } + + /** + * 修改区域管理 + * + * @param hwArea 区域管理 + * @return 结果 + */ + @Override + public int updateHwArea(HwArea hwArea) + { + hwArea.setUpdateTime(DateUtils.getNowDate()); + return hwAreaMapper.updateHwArea(hwArea); + } + + /** + * 批量删除区域管理 + * + * @param areaIds 需要删除的区域管理主键 + * @return 结果 + */ + @Override + public int deleteHwAreaByAreaIds(Long[] areaIds) + { + return hwAreaMapper.deleteHwAreaByAreaIds(areaIds); + } + + /** + * 删除区域管理信息 + * + * @param areaId 区域管理主键 + * @return 结果 + */ + @Override + public int deleteHwAreaByAreaId(Long areaId) + { + return hwAreaMapper.deleteHwAreaByAreaId(areaId); + } +} diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwAreaMapper.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwAreaMapper.xml new file mode 100644 index 0000000..c548dd7 --- /dev/null +++ b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwAreaMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select area_id, area_name, ancestors, parent_id, area_status, order_num, create_by, create_time, update_by, update_time from hw_area + + + + + + + + insert into hw_area + + area_name, + ancestors, + parent_id, + area_status, + order_num, + create_by, + create_time, + update_by, + update_time, + + + #{areaName}, + #{ancestors}, + #{parentId}, + #{areaStatus}, + #{orderNum}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update hw_area + + area_name = #{areaName}, + ancestors = #{ancestors}, + parent_id = #{parentId}, + area_status = #{areaStatus}, + order_num = #{orderNum}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where area_id = #{areaId} + + + + delete from hw_area where area_id = #{areaId} + + + + delete from hw_area where area_id in + + #{areaId} + + + \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataLanguageMapper.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataLanguageMapper.xml deleted file mode 100644 index 27a7df7..0000000 --- a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataLanguageMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - select data_language_id, dict_code, dict_label, language_code from hw_dict_data_language - - - - - - - - insert into hw_dict_data_language - - dict_code, - dict_label, - language_code, - - - #{dictCode}, - #{dictLabel}, - #{languageCode}, - - - - - update hw_dict_data_language - - dict_code = #{dictCode}, - dict_label = #{dictLabel}, - language_code = #{languageCode}, - - where data_language_id = #{dataLanguageId} - - - - delete from hw_dict_data_language where data_language_id = #{dataLanguageId} - - - - delete from hw_dict_data_language where data_language_id in - - #{dataLanguageId} - - - \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataMapper.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataMapper.xml deleted file mode 100644 index f7e6af6..0000000 --- a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictDataMapper.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark from hw_dict_data - - - - - - - - - - - - insert into hw_dict_data - - dict_sort, - dict_label, - dict_value, - dict_type, - css_class, - list_class, - is_default, - status, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{dictSort}, - #{dictLabel}, - #{dictValue}, - #{dictType}, - #{cssClass}, - #{listClass}, - #{isDefault}, - #{status}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update hw_dict_data - - dict_sort = #{dictSort}, - dict_label = #{dictLabel}, - dict_value = #{dictValue}, - dict_type = #{dictType}, - css_class = #{cssClass}, - list_class = #{listClass}, - is_default = #{isDefault}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where dict_code = #{dictCode} - - - - delete from hw_dict_data where dict_code = #{dictCode} - - - - delete from hw_dict_data where dict_code in - - #{dictCode} - - - \ No newline at end of file diff --git a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictTypeMapper.xml b/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictTypeMapper.xml deleted file mode 100644 index 448d66e..0000000 --- a/ruoyi-modules/hw-basic/src/main/resources/mapper/basic/HwDictTypeMapper.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark from hw_dict_type - - - - - - - - insert into hw_dict_type - - dict_name, - dict_type, - status, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{dictName}, - #{dictType}, - #{status}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update hw_dict_type - - dict_name = #{dictName}, - dict_type = #{dictType}, - status = #{status}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where dict_id = #{dictId} - - - - delete from hw_dict_type where dict_id = #{dictId} - - - - delete from hw_dict_type where dict_id in - - #{dictId} - - - \ No newline at end of file diff --git a/ruoyi-ui/src/api/basic/area.js b/ruoyi-ui/src/api/basic/area.js new file mode 100644 index 0000000..442cfbb --- /dev/null +++ b/ruoyi-ui/src/api/basic/area.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询区域管理列表 +export function listArea(query) { + return request({ + url: '/basic/area/list', + method: 'get', + params: query + }) +} + +// 查询区域管理详细 +export function getArea(areaId) { + return request({ + url: '/basic/area/' + areaId, + method: 'get' + }) +} + +// 新增区域管理 +export function addArea(data) { + return request({ + url: '/basic/area', + method: 'post', + data: data + }) +} + +// 修改区域管理 +export function updateArea(data) { + return request({ + url: '/basic/area', + method: 'put', + data: data + }) +} + +// 删除区域管理 +export function delArea(areaId) { + return request({ + url: '/basic/area/' + areaId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/basic/language.js b/ruoyi-ui/src/api/basic/language.js new file mode 100644 index 0000000..7d79cf7 --- /dev/null +++ b/ruoyi-ui/src/api/basic/language.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询语言信息列表 +export function listLanguage(query) { + return request({ + url: '/basic/language/list', + method: 'get', + params: query + }) +} + +// 查询语言信息详细 +export function getLanguage(languageId) { + return request({ + url: '/basic/language/' + languageId, + method: 'get' + }) +} + +// 新增语言信息 +export function addLanguage(data) { + return request({ + url: '/basic/language', + method: 'post', + data: data + }) +} + +// 修改语言信息 +export function updateLanguage(data) { + return request({ + url: '/basic/language', + method: 'put', + data: data + }) +} + +// 删除语言信息 +export function delLanguage(languageId) { + return request({ + url: '/basic/language/' + languageId, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/basic/area/index.vue b/ruoyi-ui/src/views/basic/area/index.vue new file mode 100644 index 0000000..2281434 --- /dev/null +++ b/ruoyi-ui/src/views/basic/area/index.vue @@ -0,0 +1,331 @@ + + + diff --git a/ruoyi-ui/src/views/basic/language/index.vue b/ruoyi-ui/src/views/basic/language/index.vue new file mode 100644 index 0000000..7f36fba --- /dev/null +++ b/ruoyi-ui/src/views/basic/language/index.vue @@ -0,0 +1,310 @@ + + +