diff --git a/pom.xml b/pom.xml index 2ea0f4b3d..adfeb487c 100644 --- a/pom.xml +++ b/pom.xml @@ -215,6 +215,14 @@ ${ruoyi.version} + + + com.ruoyi + province-platform + ${ruoyi.version} + + + @@ -225,6 +233,8 @@ ruoyi-quartz ruoyi-generator ruoyi-common + province-platform + pom diff --git a/province-platform/pom.xml b/province-platform/pom.xml new file mode 100644 index 000000000..0b98a83d2 --- /dev/null +++ b/province-platform/pom.xml @@ -0,0 +1,30 @@ + + + + ruoyi + com.ruoyi + 4.5.1 + + 4.0.0 + + province-platform + + + + 平台模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + + \ No newline at end of file diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java new file mode 100644 index 000000000..cfb6f9b94 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/domain/EconType.java @@ -0,0 +1,97 @@ +package com.ruoyi.province.platform.domain; + +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; + +/** + * 经济类型对象 platf_econ_type + * + * @author dalin + * @date 2020-12-08 + */ +public class EconType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Integer econId; + + /** 名称 */ + @Excel(name = "名称") + private String econName; + + /** 单据号 */ + @Excel(name = "单据号") + private String docNum; + + /** 资料状态 0有效 1无效 */ + @Excel(name = "资料状态 0有效 1无效") + private String status; + + /** 删除标志 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + public void setEconId(Integer econId) + { + this.econId = econId; + } + + public Integer getEconId() + { + return econId; + } + public void setEconName(String econName) + { + this.econName = econName; + } + + public String getEconName() + { + return econName; + } + public void setDocNum(String docNum) + { + this.docNum = docNum; + } + + public String getDocNum() + { + return docNum; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("econId", getEconId()) + .append("econName", getEconName()) + .append("docNum", getDocNum()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java new file mode 100644 index 000000000..a9437c2c5 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/mapper/EconTypeMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.province.platform.mapper; + +import java.util.List; +import com.ruoyi.province.platform.domain.EconType; + +/** + * 经济类型Mapper接口 + * + * @author dalin + * @date 2020-12-08 + */ +public interface EconTypeMapper +{ + /** + * 查询经济类型 + * + * @param econId 经济类型ID + * @return 经济类型 + */ + public EconType selectEconTypeById(Integer econId); + + /** + * 查询经济类型列表 + * + * @param econType 经济类型 + * @return 经济类型集合 + */ + public List selectEconTypeList(EconType econType); + + /** + * 新增经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + public int insertEconType(EconType econType); + + /** + * 修改经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + public int updateEconType(EconType econType); + + /** + * 删除经济类型 + * + * @param econId 经济类型ID + * @return 结果 + */ + public int deleteEconTypeById(Integer econId); + + /** + * 批量删除经济类型 + * + * @param econIds 需要删除的数据ID + * @return 结果 + */ + public int deleteEconTypeByIds(String[] econIds); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java new file mode 100644 index 000000000..e49f45139 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/IEconTypeService.java @@ -0,0 +1,61 @@ +package com.ruoyi.province.platform.service; + +import java.util.List; +import com.ruoyi.province.platform.domain.EconType; + +/** + * 经济类型Service接口 + * + * @author dalin + * @date 2020-12-08 + */ +public interface IEconTypeService +{ + /** + * 查询经济类型 + * + * @param econId 经济类型ID + * @return 经济类型 + */ + public EconType selectEconTypeById(Integer econId); + + /** + * 查询经济类型列表 + * + * @param econType 经济类型 + * @return 经济类型集合 + */ + public List selectEconTypeList(EconType econType); + + /** + * 新增经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + public int insertEconType(EconType econType); + + /** + * 修改经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + public int updateEconType(EconType econType); + + /** + * 批量删除经济类型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteEconTypeByIds(String ids); + + /** + * 删除经济类型信息 + * + * @param econId 经济类型ID + * @return 结果 + */ + public int deleteEconTypeById(Integer econId); +} diff --git a/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java new file mode 100644 index 000000000..0bf54e011 --- /dev/null +++ b/province-platform/src/main/java/com/ruoyi/province/platform/service/impl/EconTypeServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.province.platform.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.province.platform.mapper.EconTypeMapper; +import com.ruoyi.province.platform.domain.EconType; +import com.ruoyi.province.platform.service.IEconTypeService; +import com.ruoyi.common.core.text.Convert; + +/** + * 经济类型Service业务层处理 + * + * @author dalin + * @date 2020-12-08 + */ +@Service +public class EconTypeServiceImpl implements IEconTypeService +{ + @Autowired + private EconTypeMapper econTypeMapper; + + /** + * 查询经济类型 + * + * @param econId 经济类型ID + * @return 经济类型 + */ + @Override + public EconType selectEconTypeById(Integer econId) + { + return econTypeMapper.selectEconTypeById(econId); + } + + /** + * 查询经济类型列表 + * + * @param econType 经济类型 + * @return 经济类型 + */ + @Override + public List selectEconTypeList(EconType econType) + { + return econTypeMapper.selectEconTypeList(econType); + } + + /** + * 新增经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + @Override + public int insertEconType(EconType econType) + { + econType.setCreateTime(DateUtils.getNowDate()); + return econTypeMapper.insertEconType(econType); + } + + /** + * 修改经济类型 + * + * @param econType 经济类型 + * @return 结果 + */ + @Override + public int updateEconType(EconType econType) + { + econType.setUpdateTime(DateUtils.getNowDate()); + return econTypeMapper.updateEconType(econType); + } + + /** + * 删除经济类型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteEconTypeByIds(String ids) + { + return econTypeMapper.deleteEconTypeByIds(Convert.toStrArray(ids)); + } + + /** + * 删除经济类型信息 + * + * @param econId 经济类型ID + * @return 结果 + */ + @Override + public int deleteEconTypeById(Integer econId) + { + return econTypeMapper.deleteEconTypeById(econId); + } +} diff --git a/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml new file mode 100644 index 000000000..71a4dc18f --- /dev/null +++ b/province-platform/src/main/resources/mapper/platform/EconTypeMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + select econ_id, econ_name, doc_num, status, remark, del_flag, create_by, create_time, update_by, update_time from platf_econ_type + + + + + + + + insert into platf_econ_type + + econ_name, + doc_num, + status, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{econName}, + #{docNum}, + #{status}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update platf_econ_type + + econ_name = #{econName}, + doc_num = #{docNum}, + status = #{status}, + remark = #{remark}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where econ_id = #{econId} + + + + delete from platf_econ_type where econ_id = #{econId} + + + + delete from platf_econ_type where econ_id in + + #{econId} + + + + \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 07c5adde2..c4d9b55c0 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -79,6 +79,13 @@ ruoyi-generator + + + com.ruoyi + province-platform + + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java new file mode 100644 index 000000000..dd7f091e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/platform/EconTypeController.java @@ -0,0 +1,123 @@ +package com.ruoyi.web.controller.platform; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.province.platform.domain.EconType; +import com.ruoyi.province.platform.service.IEconTypeService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 经济类型Controller + * + * @author dalin + * @date 2020-12-08 + */ +@Controller +@RequestMapping("/platform/econtype") +public class EconTypeController extends BaseController +{ + private String prefix = "platform/econtype"; + + @Autowired + private IEconTypeService econTypeService; + + @RequiresPermissions("platform:econtype:view") + @GetMapping() + public String econtype() + { + return prefix + "/econtype"; + } + + /** + * 查询经济类型列表 + */ + @RequiresPermissions("platform:econtype:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(EconType econType) + { + startPage(); + List list = econTypeService.selectEconTypeList(econType); + return getDataTable(list); + } + + /** + * 导出经济类型列表 + */ + @RequiresPermissions("platform:econtype:export") + @Log(title = "经济类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(EconType econType) + { + List list = econTypeService.selectEconTypeList(econType); + ExcelUtil util = new ExcelUtil(EconType.class); + return util.exportExcel(list, "econtype"); + } + + /** + * 新增经济类型 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存经济类型 + */ + @RequiresPermissions("platform:econtype:add") + @Log(title = "经济类型", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(EconType econType) + { + return toAjax(econTypeService.insertEconType(econType)); + } + + /** + * 修改经济类型 + */ + @GetMapping("/edit/{econId}") + public String edit(@PathVariable("econId") Integer econId, ModelMap mmap) + { + EconType econType = econTypeService.selectEconTypeById(econId); + mmap.put("econType", econType); + return prefix + "/edit"; + } + + /** + * 修改保存经济类型 + */ + @RequiresPermissions("platform:econtype:edit") + @Log(title = "经济类型", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(EconType econType) + { + return toAjax(econTypeService.updateEconType(econType)); + } + + /** + * 删除经济类型 + */ + @RequiresPermissions("platform:econtype:remove") + @Log(title = "经济类型", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(econTypeService.deleteEconTypeByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d69c66d27..ff75f805f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/province?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: gx123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 74874830f..c0de42ebc 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 8088 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html new file mode 100644 index 000000000..360ad2a59 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/add.html @@ -0,0 +1,58 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html new file mode 100644 index 000000000..ed062dfef --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/econtype.html @@ -0,0 +1,109 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html b/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html new file mode 100644 index 000000000..90402c852 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/platform/econtype/edit.html @@ -0,0 +1,47 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index f3792cdc6..e4f1a7660 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -2,10 +2,10 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: dalin # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.ruoyi.province.platform # 自动去除表前缀，默认是false - autoRemovePre: false + autoRemovePre: true # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file + tablePrefix: sys_,platf_ \ No newline at end of file