diff --git a/ruoyi-ui/src/api/base/company.js b/ruoyi-ui/src/api/base/company.js new file mode 100644 index 000000000..3feefefa9 --- /dev/null +++ b/ruoyi-ui/src/api/base/company.js @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +// 查询公司管理列表 +export function listCompany(query) { + return request({ + url: '/base/company/list', + method: 'get', + params: query + }) +} + +// 查询公司管理详细 +export function getCompany(id) { + return request({ + url: '/base/company/' + id, + method: 'get' + }) +} + +// 新增公司管理 +export function addCompany(data) { + return request({ + url: '/base/company', + method: 'post', + data: data + }) +} + +// 修改公司管理 +export function updateCompany(data) { + return request({ + url: '/base/company', + method: 'put', + data: data + }) +} + +// 公司状态修改 +export function changeCompanyEnabled(id, enabled) { + const data = { + id, + enabled + } + return request({ + url: '/base/company/changeEnabled', + method: 'put', + data: data + }) +} + +// 删除公司管理 +export function delCompany(id) { + return request({ + url: '/base/company/' + id, + method: 'delete' + }) +} + +// 导出公司管理 +export function exportCompany(query) { + return request({ + url: '/base/company/export', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue index 4e761eaea..889b7dc15 100644 --- a/ruoyi-ui/src/layout/index.vue +++ b/ruoyi-ui/src/layout/index.vue @@ -1,102 +1,102 @@ - - - - - + + + + + diff --git a/ruoyi-ui/src/views/base/company/index.vue b/ruoyi-ui/src/views/base/company/index.vue new file mode 100644 index 000000000..25f6b72a5 --- /dev/null +++ b/ruoyi-ui/src/views/base/company/index.vue @@ -0,0 +1,382 @@ + + + diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java index 45d8ac91a..7e9300902 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java @@ -4,24 +4,24 @@ import com.ruoyi.common.core.lang.UUID; /** * ID生成器工具类 - * + * * @author ruoyi */ public class IdUtils { /** * 获取随机UUID - * + * * @return 随机UUID */ public static String randomUUID() { - return UUID.randomUUID().toString(); + return UUID.randomUUID().toString().toUpperCase(); } /** * 简化的UUID，去掉了横线 - * + * * @return 简化的UUID，去掉了横线 */ public static String simpleUUID() @@ -31,17 +31,17 @@ public class IdUtils /** * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID - * + * * @return 随机UUID */ public static String fastUUID() { - return UUID.fastUUID().toString(); + return UUID.fastUUID().toString().toUpperCase(); } /** * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID - * + * * @return 简化的UUID，去掉了横线 */ public static String fastSimpleUUID() diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java index 80b8c84fe..85d1df664 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java @@ -16,19 +16,20 @@ import javax.imageio.ImageIO; /** * 验证码工具类 - * + * * @author ruoyi */ public class VerifyCodeUtils { // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符 - public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ"; +// public static final String VERIFY_CODES = "123456789ABCDEFGHJKLMNPQRSTUVWXYZ"; + public static final String VERIFY_CODES = "123456789"; private static Random random = new SecureRandom(); /** * 使用系统默认字符源生成验证码 - * + * * @param verifySize 验证码长度 * @return */ @@ -39,7 +40,7 @@ public class VerifyCodeUtils /** * 使用指定源生成验证码 - * + * * @param verifySize 验证码长度 * @param sources 验证码字符源 * @return @@ -62,7 +63,7 @@ public class VerifyCodeUtils /** * 输出指定验证码图片流 - * + * * @param w * @param h * @param os @@ -223,4 +224,4 @@ public class VerifyCodeUtils } } -} \ No newline at end of file +} diff --git a/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java index f0519d5ac..d7c652b98 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/config/DruidConfig.java @@ -26,7 +26,7 @@ import com.ruoyi.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 - * + * * @author ruoyi */ @Configuration @@ -58,10 +58,10 @@ public class DruidConfig setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource"); return new DynamicDataSource(masterDataSource, targetDataSources); } - + /** * 设置数据源 - * + * * @param targetDataSources 备选数据源集合 * @param sourceName 数据源名称 * @param beanName bean名称 @@ -109,7 +109,7 @@ public class DruidConfig // 获取common.js String text = Utils.readFromResource(filePath); // 正则替换banner, 除去底部的广告信息 - text = text.replaceAll("
", ""); + //text = text.replaceAll("
", ""); text = text.replaceAll("powered.*?shrek.wang", ""); response.getWriter().write(text); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/controller/BaseCompanyController.java b/ruoyi/src/main/java/com/ruoyi/project/mr/controller/BaseCompanyController.java new file mode 100644 index 000000000..02cc07410 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/controller/BaseCompanyController.java @@ -0,0 +1,112 @@ +package com.ruoyi.project.mr.controller; + +import com.ruoyi.common.utils.IdUtils; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.aspectj.lang.annotation.Log; +import com.ruoyi.framework.aspectj.lang.enums.BusinessType; +import com.ruoyi.framework.web.controller.BaseController; +import com.ruoyi.framework.web.domain.AjaxResult; +import com.ruoyi.framework.web.page.TableDataInfo; +import com.ruoyi.project.mr.domain.BaseCompany; +import com.ruoyi.project.mr.service.IBaseCompanyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 公司管理Controller + * + * @author mr + * @date 2020-01-04 + */ +@RestController +@RequestMapping("/base/company") +public class BaseCompanyController extends BaseController +{ + @Autowired + private IBaseCompanyService baseCompanyService; + + /** + * 查询公司管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:company:list')") + @GetMapping("/list") + public TableDataInfo list(BaseCompany baseCompany) + { + startPage(); + List list = baseCompanyService.selectBaseCompanyList(baseCompany); + return getDataTable(list); + } + + /** + * 导出公司管理列表 + */ + @PreAuthorize("@ss.hasPermi('base:company:export')") + @Log(title = "公司管理", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(BaseCompany baseCompany) + { + List list = baseCompanyService.selectBaseCompanyList(baseCompany); + ExcelUtil util = new ExcelUtil(BaseCompany.class); + return util.exportExcel(list, "公司信息"); + } + + /** + * 获取公司管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('base:company:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(baseCompanyService.selectBaseCompanyById(id)); + } + + /** + * 新增公司管理 + */ + @PreAuthorize("@ss.hasPermi('base:company:add')") + @Log(title = "公司管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseCompany baseCompany) + { + baseCompany.setId(IdUtils.fastUUID()); + return toAjax(baseCompanyService.insertBaseCompany(baseCompany)); + } + + /** + * 修改公司管理 + */ + @PreAuthorize("@ss.hasPermi('base:company:edit')") + @Log(title = "公司管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseCompany baseCompany) + { + return toAjax(baseCompanyService.updateBaseCompany(baseCompany)); + } + + /** + * 删除公司管理 + */ + @PreAuthorize("@ss.hasPermi('base:company:remove')") + @Log(title = "公司管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(baseCompanyService.deleteBaseCompanyByIds(ids)); + } + + /** + * 状态修改 + */ + @PreAuthorize("@ss.hasPermi('base:company:edit')") + @Log(title = "公司管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeEnabled") + public AjaxResult changeEnabled(@RequestBody BaseCompany baseCompany) + { + baseCompany.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(baseCompanyService.updateBaseCompanyEnabled(baseCompany)); + } +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/domain/BaseCompany.java b/ruoyi/src/main/java/com/ruoyi/project/mr/domain/BaseCompany.java new file mode 100644 index 000000000..77e43cf2c --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/domain/BaseCompany.java @@ -0,0 +1,98 @@ +package com.ruoyi.project.mr.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; + +/** + * 公司管理对象 base_company + * + * @author mr + * @date 2020-01-04 + */ +public class BaseCompany extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** UUID */ + private String id; + + /** 排序 */ + @Excel(name = "排序") + private Long sort; + + /** 公司代码 */ + @Excel(name = "公司代码") + private String codeid; + + /** 公司简称 */ + @Excel(name = "公司简称") + private String name; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String enabled; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setSort(Long sort) + { + this.sort = sort; + } + + public Long getSort() + { + return sort; + } + public void setCodeid(String codeid) + { + this.codeid = codeid; + } + + public String getCodeid() + { + return codeid; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setEnabled(String enabled) + { + this.enabled = enabled; + } + + public String getEnabled() + { + return enabled; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("sort", getSort()) + .append("codeid", getCodeid()) + .append("name", getName()) + .append("enabled", getEnabled()) + .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/mapper/BaseCompanyMapper.java b/ruoyi/src/main/java/com/ruoyi/project/mr/mapper/BaseCompanyMapper.java new file mode 100644 index 000000000..e5a728aea --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/mapper/BaseCompanyMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.mr.mapper; + +import com.ruoyi.project.mr.domain.BaseCompany; +import java.util.List; + +/** + * 公司管理Mapper接口 + * + * @author mr + * @date 2020-01-04 + */ +public interface BaseCompanyMapper +{ + /** + * 查询公司管理 + * + * @param id 公司管理ID + * @return 公司管理 + */ + public BaseCompany selectBaseCompanyById(String id); + + /** + * 查询公司管理列表 + * + * @param baseCompany 公司管理 + * @return 公司管理集合 + */ + public List selectBaseCompanyList(BaseCompany baseCompany); + + /** + * 新增公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + public int insertBaseCompany(BaseCompany baseCompany); + + /** + * 修改公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + public int updateBaseCompany(BaseCompany baseCompany); + + /** + * 删除公司管理 + * + * @param id 公司管理ID + * @return 结果 + */ + public int deleteBaseCompanyById(String id); + + /** + * 批量删除公司管理 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseCompanyByIds(String[] ids); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/service/IBaseCompanyService.java b/ruoyi/src/main/java/com/ruoyi/project/mr/service/IBaseCompanyService.java new file mode 100644 index 000000000..0f6ffe951 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/service/IBaseCompanyService.java @@ -0,0 +1,70 @@ +package com.ruoyi.project.mr.service; + +import com.ruoyi.project.mr.domain.BaseCompany; + +import java.util.List; + +/** + * 公司管理Service接口 + * + * @author mr + * @date 2020-01-04 + */ +public interface IBaseCompanyService +{ + /** + * 查询公司管理 + * + * @param id 公司管理ID + * @return 公司管理 + */ + public BaseCompany selectBaseCompanyById(String id); + + /** + * 查询公司管理列表 + * + * @param baseCompany 公司管理 + * @return 公司管理集合 + */ + public List selectBaseCompanyList(BaseCompany baseCompany); + + /** + * 新增公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + public int insertBaseCompany(BaseCompany baseCompany); + + /** + * 修改公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + public int updateBaseCompany(BaseCompany baseCompany); + + /** + * 批量删除公司管理 + * + * @param ids 需要删除的公司管理ID + * @return 结果 + */ + public int deleteBaseCompanyByIds(String[] ids); + + /** + * 删除公司管理信息 + * + * @param id 公司管理ID + * @return 结果 + */ + public int deleteBaseCompanyById(String id); + + /** + * 修改公司状态 + * + * @param baseCompany 公司信息 + * @return 结果 + */ + public int updateBaseCompanyEnabled(BaseCompany baseCompany); +} diff --git a/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java new file mode 100644 index 000000000..dce108320 --- /dev/null +++ b/ruoyi/src/main/java/com/ruoyi/project/mr/service/impl/BaseCompanyServiceImpl.java @@ -0,0 +1,111 @@ +package com.ruoyi.project.mr.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.project.mr.domain.BaseCompany; +import com.ruoyi.project.mr.mapper.BaseCompanyMapper; +import com.ruoyi.project.mr.service.IBaseCompanyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 公司管理Service业务层处理 + * + * @author mr + * @date 2020-01-04 + */ +@Service +public class BaseCompanyServiceImpl implements IBaseCompanyService +{ + @Autowired + private BaseCompanyMapper baseCompanyMapper; + + /** + * 查询公司管理 + * + * @param id 公司管理ID + * @return 公司管理 + */ + @Override + public BaseCompany selectBaseCompanyById(String id) + { + return baseCompanyMapper.selectBaseCompanyById(id); + } + + /** + * 查询公司管理列表 + * + * @param baseCompany 公司管理 + * @return 公司管理 + */ + @Override + public List selectBaseCompanyList(BaseCompany baseCompany) + { + return baseCompanyMapper.selectBaseCompanyList(baseCompany); + } + + /** + * 新增公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + @Override + public int insertBaseCompany(BaseCompany baseCompany) + { + baseCompany.setCreateTime(DateUtils.getNowDate()); + return baseCompanyMapper.insertBaseCompany(baseCompany); + } + + /** + * 修改公司管理 + * + * @param baseCompany 公司管理 + * @return 结果 + */ + @Override + public int updateBaseCompany(BaseCompany baseCompany) + { + baseCompany.setUpdateTime(DateUtils.getNowDate()); + return baseCompanyMapper.updateBaseCompany(baseCompany); + } + + /** + * 批量删除公司管理 + * + * @param ids 需要删除的公司管理ID + * @return 结果 + */ + @Override + public int deleteBaseCompanyByIds(String[] ids) + { + return baseCompanyMapper.deleteBaseCompanyByIds(ids); + } + + /** + * 删除公司管理信息 + * + * @param id 公司管理ID + * @return 结果 + */ + @Override + public int deleteBaseCompanyById(String id) + { + return baseCompanyMapper.deleteBaseCompanyById(id); + } + + /** + * 修改用户状态 + * + * @param baseCompany 用户信息 + * @return 结果 + */ + @Override + public int updateBaseCompanyEnabled(BaseCompany baseCompany) + { + baseCompany.setUpdateTime(DateUtils.getNowDate()); + return baseCompanyMapper.updateBaseCompany(baseCompany); + } + +} diff --git a/ruoyi/src/main/resources/banner.txt b/ruoyi/src/main/resources/banner.txt index 94662592f..6bdf82b8b 100644 --- a/ruoyi/src/main/resources/banner.txt +++ b/ruoyi/src/main/resources/banner.txt @@ -21,4 +21,4 @@ Spring Boot Version: ${spring-boot.version} // `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // // 佛祖保佑 永不宕机 永无BUG // -//////////////////////////////////////////////////////////////////// \ No newline at end of file +//////////////////////////////////////////////////////////////////// diff --git a/ruoyi/src/main/resources/mybatis/base/BaseCompanyMapper.xml b/ruoyi/src/main/resources/mybatis/base/BaseCompanyMapper.xml new file mode 100644 index 000000000..f41e7e78f --- /dev/null +++ b/ruoyi/src/main/resources/mybatis/base/BaseCompanyMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + select ID, Sort, CodeID, Name, Enabled, create_by, create_time, update_by, update_time, remark from base_company + + + + + + + + insert into base_company + + ID, + Sort, + CodeID, + Name, + Enabled, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{sort}, + #{codeid}, + #{name}, + #{enabled}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update base_company + + Sort = #{sort}, + CodeID = #{codeid}, + Name = #{name}, + Enabled = #{enabled}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where ID = #{id} + + + + delete from base_company where ID = #{id} + + + + delete from base_company where ID in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm index 212d20a43..71cd5125f 100644 --- a/ruoyi/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm @@ -97,7 +97,7 @@ - + #foreach($column in $columns) #set($javaField=$column.javaField) @@ -140,7 +140,7 @@ - + \ No newline at end of file +