commit 2fad08ebb3fdc47dea9f1deb0a2d82fae0b440a3 Author: tianyongbao Date: Thu Apr 9 01:48:22 2026 +0800 feat: 鱼测云经销商管理后台，代码提交。 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..f6906f2 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# 已忽略包含查询文件的默认文件夹 +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..67e1e61 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bd480df --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2018 limap + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000..db24f1b --- /dev/null +++ b/README.en.md @@ -0,0 +1,36 @@ +# 分润管理 + +#### Description +{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} + +#### Software Architecture +Software architecture description + +#### Installation + +1. xxxx +2. xxxx +3. xxxx + +#### Instructions + +1. xxxx +2. xxxx +3. xxxx + +#### Contribution + +1. Fork the repository +2. Create Feat_xxx branch +3. Commit your code +4. Create Pull Request + + +#### Gitee Feature + +1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md +2. Gitee blog [blog.gitee.com](https://blog.gitee.com) +3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) +4. The most valuable open source project [GVP](https://gitee.com/gvp) +5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) +6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md new file mode 100644 index 0000000..0a241de --- /dev/null +++ b/README.md @@ -0,0 +1,39 @@ +# 分润管理 + +#### 介绍 +{**以下是 Gitee 平台说明，您可以替换此简介** +Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 +无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} + +#### 软件架构 +软件架构说明 + + +#### 安装教程 + +1. xxxx +2. xxxx +3. xxxx + +#### 使用说明 + +1. xxxx +2. xxxx +3. xxxx + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 +4. 新建 Pull Request + + +#### 特技 + +1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md +2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) +3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 +4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 +5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) +6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/docs/需求规格说明书.md b/docs/需求规格说明书.md new file mode 100644 index 0000000..f87998c --- /dev/null +++ b/docs/需求规格说明书.md @@ -0,0 +1,771 @@ +# 鱼测云分润管理系统需求规格说明书 + +## 1. 文档说明 + +### 1.1 编写目的 +本文档基于当前代码仓库 `profit-sharing-management-master` 的后端实现，对系统业务范围、角色权限、核心流程、功能需求和非功能需求进行还原和整理，用于： + +- 帮助快速理解项目覆盖的业务域 +- 作为后续需求澄清、系统改造和前后端联调的基础文档 +- 为补齐前端、测试用例、实施手册提供输入 + +### 1.2 编写依据 +本文档主要依据以下内容整理： + +- `fishery-admin` 中的业务控制器 +- `fishery-core` 中的领域模型、服务实现、SQL 映射 +- `fishery-system` 中的登录、用户、权限能力 +- `fishery-quartz` 中的定时任务 +- `application.yml` 与 `application-dev.yml` 中的运行配置 + +### 1.3 说明与边界 + +- 当前仓库主要是后端工程，未包含完整前端页面源码，因此界面交互以接口能力反推。 +- README 为占位内容，业务口径以代码实现为准。 +- 本文档区分“已明确实现的能力”和“根据实现推断的业务含义”。 +- 对于角色名称、菜单文案、审批组织关系等未在代码中直接定义的内容，仅做合理归纳，不作为最终主数据标准。 + +## 2. 项目概述 + +### 2.1 系统名称 + +- 系统工程描述：鱼测云分润管理系统 +- 运行入口名称：`fishery-admin` +- 默认访问上下文：`/equipment` + +### 2.2 业务定位 +该系统是一个“养殖设备管理 + 分润结算”的后台与移动端支撑系统，围绕鱼塘/池塘设备、充值订单、经销分润和提现结算展开，覆盖以下业务链路： + +1. 设备接入与设备归属管理 +2. 池塘与设备监测数据查询 +3. 告警信息查看与控制器开关控制 +4. 经销/层级用户分润比例配置 +5. 充值订单自动分润计算 +6. 分润记录统计、退款冲销 +7. 用户提现申请与打款处理 +8. 短信验证码登录与 APP 用户管理 + +### 2.3 总体架构 +系统为多模块 Spring Boot 单体工程，采用动态数据源。 + +- `fishery-admin` + 说明：Web API 入口、业务控制器 +- `fishery-system` + 说明：系统管理能力，如登录、用户、角色、菜单、部门、字典、日志 +- `fishery-core` + 说明：分润、设备绑定、提现、监测大屏等业务核心 +- `fishery-quartz` + 说明：定时任务，包括分润计算、设备绑定同步、告警码处理 +- `fishery-generator` + 说明：代码生成 +- `fishery-demo` + 说明：示例模块 +- `fishery-common` + 说明：通用基础组件 + +### 2.4 数据源边界 +系统至少涉及两套业务数据。 + +- 主数据源 `master` + 说明：本系统后台管理数据，如 `sys_*`、`basic_*` +- 辅助数据源 `test` + 说明：外部设备/订单/APP 用户数据，如 `aqu_user`、`aqu_device`、`aqu_pay_device`、`aqu_message_warn` +- 另有 `taos` 数据源配置 + 说明：已配置 TDengine 连接，当前在本仓库业务代码中未见明确使用 + +## 3. 业务角色 + +### 3.1 平台管理员 +负责系统级维护和业务全局管理，预期能力包括： + +- 系统用户、角色、部门、菜单管理 +- 分润基础规则维护 +- 用户分润档案维护 +- 设备绑定关系维护 +- 分润记录全量查询、导出、退款处理 +- 提现记录审核与打款处理 +- 告警电话维护 +- APP 用户管理 + +### 3.2 业务管理者 +根据代码中的数据权限判断，部分角色可按部门或经销体系查看数据，预期能力包括： + +- 查看本部门或本经销体系下的设备绑定 +- 查看分润记录报表 +- 查询提现记录 +- 维护下级用户相关业务数据 + +说明：代码中通过角色 ID 和部门树控制数据范围，但未直接给出正式角色名称。 + +### 3.3 分润用户 +即参与分润结算的业务用户，预期能力包括： + +- 查看本人分润记录 +- 查看本人提现记录 +- 维护本人分润档案和收款信息 +- 提交提现申请 + +### 3.4 APP 用户/养殖端用户 +该类用户来自 `aqu_user`，预期能力包括： + +- 通过手机号验证码或密码登录 +- 查看塘口与设备 +- 查看监测历史数据和告警 +- 控制控制器设备开关 + +## 4. 业务范围 + +### 4.1 已覆盖业务域 + +- 系统管理 +- APP/短信登录 +- 池塘与设备监测 +- 设备绑定 +- 分润规则管理 +- 用户分润档案管理 +- 分润记录管理 +- 提现管理 +- 退款冲销 +- 告警电话管理 +- 定时任务管理 + +### 4.2 明显未完成或实现不完整的业务 + +- 语音告警电话的自动拨号任务仅有占位逻辑，未完成实际拨打 +- 前端页面与交互细节未随仓库提供 +- 部分 XML 映射文件存在错配痕迹，说明代码仍有整理空间 + +## 5. 核心业务对象 + +### 5.1 分润基础规则 `basic_profit_sharing` + +- 等级名称 `name` +- 等级编码 `code` +- 测氧仪分润比例 `omRatio` +- 控制器分润比例 `controlRatio` + +用途：定义分润级别或档位的基础比例。 + +### 5.2 用户分润档案 `basic_profit_sharing_user` + +- 关联用户 `userId` +- 分润级别 `sharingCode` +- 测氧仪比例 `omRatio` +- 控制器比例 `controlRatio` +- 公司名称 `company` +- 开户行 `bank` +- 银行卡号 `bankNumber` +- 收款人姓名 `name` + +用途：存储参与分润的用户档案和收款信息。 + +### 5.3 用户设备绑定 `basic_user_bind_info` + +- 绑定用户 `userId` +- 设备编号 `deviceName` +- 产品 Key `productKey` +- IoT 唯一标识 `iotId` +- 设备类型 `type` +- 绑定时间 `bindTime` +- 分润状态 `profitStatus` +- 关联 APP 用户信息 + +用途：建立后台分润用户与业务设备之间的归属关系。 + +### 5.4 分润记录 `basic_profit_sharing_record` + +- 分润用户 `userId` +- 分润金额 `amount` +- 来源 `fromWay` +- 标题 `title` +- 原始订单号 `orderNo` +- 设备编号 `deviceName` +- 分润状态 `status` +- 提现状态 `withdrawalStatus` +- 打款状态 `paymentStatus` +- 驳回原因 `paymentReason` +- 关联提现单 `withdrawId` + +用途：记录每一笔可分配收益及其后续结算状态。 + +### 5.5 提现记录 `basic_user_withdraw` + +- 提现用户 `userId` +- 标题 `title` +- 申请时间 `withdrawTime` +- 提现总额 `totalAmount` +- 收款信息 `bank`、`bankNumber`、`name` +- 实际打款金额 `paymentAmount` +- 打款状态 `paymentStatus` +- 打款时间 `paymentTime` + +用途：记录按批次发起的提现申请和财务打款结果。 + +### 5.6 外部设备与订单对象 + +- `aqu_user` + 说明：APP 用户 +- `aqu_pond` + 说明：池塘/塘口 +- `aqu_device` + 说明：设备主表 +- `aqu_device_data_history` + 说明：设备历史监测数据 +- `aqu_device_switch` + 说明：控制器开关 +- `aqu_message_warn` + 说明：告警消息 +- `aqu_pay_device` + 说明：设备充值或付费明细，是分润计算的直接来源 + +## 6. 功能需求 + +### 6.1 系统管理 +系统应提供标准后台管理能力，包括： + +- 用户管理 +- 角色管理 +- 部门管理 +- 岗位管理 +- 菜单管理 +- 字典管理 +- 参数配置 +- 公告管理 +- 在线用户管理 +- 登录日志与操作日志 +- 定时任务管理 +- 缓存查看 +- 服务监控 +- 文件上传下载 + +说明：以上能力来自 `fishery-system` 与 `fishery-quartz` 通用模块。 + +### 6.2 登录与认证 + +#### 6.2.1 后台登录 +系统应支持后台账号密码登录，并具备： + +- 图形验证码校验 +- JWT Token 签发 +- 登录日志记录 +- 登录错误重试限制 + +#### 6.2.2 APP/短信登录 +系统应支持 `/sms/**` 匿名访问的移动端登录能力，包括： + +- 手机号获取短信验证码 +- 手机号 + 验证码登录 +- 手机号/用户名 + 密码登录 +- APP Token 签发 + +补充说明： + +- APP 用户既可能来自本系统 `sys_user`，也可能来自外部 `aqu_user` +- 代码中预留了微信 `openid`、手机号换取能力，但当前接口未形成完整微信登录闭环 + +### 6.3 池塘与设备监测 +系统应支持移动端或大屏使用者按本人数据范围查看养殖场景信息。 + +#### 6.3.1 塘口查询 +系统应支持查询当前用户所属塘口列表。 + +输入： + +- 当前登录用户 + +输出： + +- 塘口 ID +- 塘口名称 + +#### 6.3.2 设备列表查询 +系统应支持按塘口和设备类型查询设备。 + +筛选条件： + +- 用户 ID +- 塘口 ID 列表 +- 设备类型 + +输出内容至少包括： + +- 设备编号 +- 设备名称 +- 设备类型 +- 当前监测值 +- 在线状态 +- 告警参数 +- 控制器开关信息 + +#### 6.3.3 设备历史数据查询 +系统应支持查询设备历史趋势数据。 + +能力包括： + +- 单设备历史曲线查询 +- 多设备历史对比查询 +- 按最近 N 天统计 +- 30 分钟粒度聚合 + +监测指标包括： + +- 溶氧 +- 温度 +- 饱和度 +- pH +- 盐度 + +#### 6.3.4 告警信息查询 +系统应支持： + +- 查询当前用户告警列表 +- 按设备查询告警列表 +- 返回告警总数用于分页 + +#### 6.3.5 控制器开关控制 +系统应支持控制器设备开关下发。 + +输入： + +- `iotId` +- 开关序号 `index` +- 开关目标状态 `0/1` + +输出： + +- 下发是否成功 + +### 6.4 APP 用户管理 +系统应支持对外部 `aqu_user` 用户进行后台管理。 + +功能包括： + +- APP 用户列表查询 +- 修改是否开通大屏权限 `hasScreen` +- 修改用户标题 `title` + +### 6.5 设备绑定管理 +系统应支持维护后台分润用户与设备的绑定关系。 + +#### 6.5.1 绑定列表查询 +系统应支持查询绑定列表，并依据权限限制数据范围。 + +筛选条件至少包括： + +- 用户 +- 设备编号 +- 设备类型 +- APP 用户手机号 + +#### 6.5.2 绑定详情查询 +系统应支持查看绑定详情，并补充外部业务库中的设备归属信息。 + +#### 6.5.3 新增绑定 +系统应支持新增用户设备绑定，规则包括： + +- 若未传用户，则默认绑定到当前登录人 +- 若按用户 ID 指定绑定对象，应自动回填用户名 +- 同一设备编号不可重复绑定 +- 若外部业务库可查到该设备，应合并其业务侧设备信息 + +#### 6.5.4 修改与删除绑定 +系统应支持修改和删除绑定关系。 + +#### 6.5.5 设备数据补充查询 +围绕绑定设备，系统应支持： + +- 查询设备监测数据及历史数据 +- 查询控制器信息 +- 查询告警信息 + +### 6.6 分润基础规则管理 +系统应支持维护基础分润档位。 + +功能包括： + +- 分润规则列表查询 +- 分润规则详情查询 +- 新增分润规则 +- 修改分润规则 +- 删除分润规则 +- 导出分润规则 + +规则属性包括： + +- 等级名称 +- 等级编码 +- 测氧设备比例 +- 控制器比例 + +### 6.7 用户分润档案管理 +系统应支持维护分润用户档案及其收款信息。 + +功能包括： + +- 分润档案列表查询 +- 分润档案详情查询 +- 新增分润档案 +- 修改分润档案 +- 删除分润档案 +- 导出分润档案 + +业务规则包括： + +1. 档案主键与用户 ID 对齐。 +2. 若用户修改的是本人档案，可直接处理。 +3. 若用户修改他人档案，需要具备管理员权限。 +4. 用户档案不存在时，不允许直接修改，需先新增。 +5. 分润比例需通过层级校验。 + +#### 6.7.1 分润比例校验规则 +系统应校验同一条用户链路上的累计比例不超过 100%。 + +- 测氧设备比例累计不得超过 100% +- 控制器比例累计不得超过 100% + +说明： + +- 系统会沿 `sys_user.parent_id` 向上累加上级比例 +- 超出比例时，应阻止保存 + +### 6.8 分润计算与分润记录管理 + +#### 6.8.1 分润记录查询 +系统应支持分润记录列表查询、详情查询和导出。 + +查询维度至少包括： + +- 用户 +- 来源 +- 分润状态 +- 设备编号 +- 打款状态 +- 提现单号 +- 时间区间 +- 电话号码 + +#### 6.8.2 分润报表 +系统应支持统计报表接口，输出至少包括： + +- 分润总额 `total` +- 已分润金额 `fr` +- 已提现金额 `tx` + +统计维度包括： + +- 时间范围 +- 用户范围 +- 部门范围 + +#### 6.8.3 自动分润计算 +系统应通过定时任务，根据外部订单数据自动生成分润记录。 + +计算来源： + +- `aqu_pay_device` + +处理逻辑： + +1. 定时拉取指定时间窗口内的订单明细。 +2. 按设备编号找到参与分润的用户链路。 +3. 根据设备类型选择对应比例。 +4. 计算分润金额并生成记录。 +5. 将原订单标记为已参与分润。 + +分润公式： + +- 分润金额 = 支付金额 × 分润比例 / 100 + +设备类型： + +- `1`：溶氧设备 +- `2`：控制器设备 + +#### 6.8.4 分润记录状态流转 +分润记录至少应支持以下状态维度： + +- 分润状态 `status` + - `0`：待处理或已申请提现待打款 + - `1`：已生成有效分润 + - `9`：无效 +- 提现状态 `withdrawalStatus` + - `0`：未提现 + - `1`：已提现申请 +- 打款状态 `paymentStatus` + - `0`：未打款 + - `1`：已打款 + - `9`：驳回或失效 + +说明：以上语义基于字段注释和代码行为归纳。 + +#### 6.8.5 退款处理 +系统应支持按订单号对分润记录进行退款冲销。 + +处理规则： + +- 同一订单号下的所有有效分润记录均应被置为无效 +- 同步记录驳回原因 +- 如该分润记录已关联提现单，应同步冲减提现单剩余可打款金额 + +### 6.9 提现管理 + +#### 6.9.1 提现记录查询 +系统应支持提现记录列表查询、详情查询和导出。 + +查询维度至少包括： + +- 用户 +- 标题 +- 提现时间 +- 昵称 +- 手机号 + +#### 6.9.2 用户提现申请 +系统应支持分润用户发起提现申请。 + +规则包括： + +1. 仅可提取本人记录。 +2. 仅可提取未提现的分润记录。 +3. 当前实现中，仅允许提取生成时间早于当前 30 天的分润记录。 +4. 用户必须先维护完整收款信息。 +5. 提现申请成功后，应生成一张提现单。 +6. 被纳入本次提现的分润记录应回填 `withdrawId`。 + +提现单生成内容包括： + +- 提现标题 +- 提现总额 +- 提现时间 +- 收款公司/开户行 +- 收款卡号 +- 收款人姓名 +- 用户昵称和手机号 +- 初始打款状态 + +#### 6.9.3 打款处理 +系统应支持后台修改提现单状态，并在打款成功后更新金额。 + +预期规则： + +- `paymentStatus = 1` 表示已打款 +- 打款金额可小于总额 +- 若后续发生退款或驳回，应同步冲减可打款金额 + +### 6.10 告警电话管理 +系统应支持维护语音报警手机号。 + +功能包括： + +- 电话列表查询 +- 新增电话 +- 修改电话 +- 删除电话 + +字段包括： + +- 手机号 +- 是否启用 + +说明：定时拨号任务尚未完成。 + +### 6.11 定时任务 + +#### 6.11.1 分润计算任务 `profitTask` +系统应支持定时执行分润计算。 + +能力包括： + +- 订单读取 +- 分润链路展开 +- 分润记录批量生成 +- 原订单状态更新 + +#### 6.11.2 设备绑定同步任务 +系统应支持补齐尚未关联 `device_id` 的绑定记录。 + +处理逻辑： + +- 查询本地绑定表中缺失设备 ID 的记录 +- 根据设备编号到外部业务库查找设备 +- 回填设备 ID 等信息 + +#### 6.11.3 告警码处理任务 `WarnCodeTask` +系统应支持在设备充值成功后重置设备告警码。 + +#### 6.11.4 语音拨号任务 `CellTask` +当前仅有框架和号码查询逻辑，实际拨打能力未实现。 + +## 7. 关键业务流程 + +### 7.1 分润准备流程 + +1. 管理员创建系统用户和组织关系。 +2. 管理员维护用户分润档案。 +3. 管理员维护用户与设备的绑定关系。 +4. 系统根据用户层级和设备归属建立可分润链路。 + +### 7.2 充值分润流程 + +1. 设备在外部业务库产生充值/支付记录。 +2. 定时任务读取最近时间窗口内的支付明细。 +3. 系统按设备编号匹配绑定用户及上级链路。 +4. 系统按设备类型套用比例，生成分润记录。 +5. 系统将支付明细标记为已分润，避免重复计算。 + +### 7.3 提现流程 + +1. 分润用户完善收款资料。 +2. 用户发起提现申请。 +3. 系统筛选满足条件的分润记录并汇总金额。 +4. 系统生成提现单，并将分润记录关联到提现单。 +5. 管理员审核并打款。 +6. 若发生退款或驳回，系统同步调整金额状态。 + +### 7.4 设备监测流程 + +1. APP 用户登录。 +2. 查询本人塘口列表。 +3. 查询塘口下设备列表。 +4. 查看实时值、历史值、告警记录。 +5. 对控制器设备执行开关控制。 + +## 8. 业务规则 + +### 8.1 数据权限规则 + +- 普通用户默认仅能查看本人分润记录和提现记录 +- 部分高权限角色可查看更大范围数据 +- 设备绑定列表按用户/部门树控制查询范围 + +说明：具体角色编码需以生产环境主数据为准。 + +### 8.2 分润比例规则 + +- 上下级累计比例不可超过 100% +- 不同设备类型使用不同分润比例字段 + +### 8.3 设备类型规则 + +- `1` 表示溶氧监测设备 +- `2` 表示控制器设备 + +### 8.4 提现规则 + +- 仅未提现记录可参与提现 +- 当前实现限制为 30 天前产生的分润记录 +- 未维护收款信息时不得发起提现 + +### 8.5 退款规则 + +- 退款会使相关分润记录失效 +- 退款会影响提现单剩余可打款金额 + +## 9. 接口与模块清单 + +### 9.1 业务接口模块 + +- `/sms` + 说明：短信验证码与 APP 登录 +- `/screen` + 说明：塘口、设备、历史、告警、控制 +- `/basic/profitSharing` + 说明：分润基础规则 +- `/basic/sharingUser` + 说明：用户分润档案 +- `/basic/sharingRecord` + 说明：分润记录与报表、退款 +- `/basic/userBind` + 说明：设备绑定、监测数据、控制器信息、告警 +- `/basic/withdraw` + 说明：提现申请与提现记录 +- `/basic/user` + 说明：APP 用户管理 +- `/sys/tel` + 说明：语音报警电话 + +### 9.2 通用后台模块 + +- `/login` +- `/system/user` +- `/system/role` +- `/system/dept` +- `/system/menu` +- `/system/dict` +- `/system/config` +- `/system/notice` +- `/monitor/*` +- `/tool/gen/*` + +## 10. 非功能需求 + +### 10.1 技术要求 + +- Java 8 +- Spring Boot 2.5.x +- MyBatis Plus +- Redis +- JWT +- Druid 动态数据源 + +### 10.2 性能要求 + +- 常规列表查询应支持分页 +- 历史数据查询需使用缓存降低数据库压力 +- 设备在线状态应短时缓存 +- 定时任务应具备批量处理能力 + +### 10.3 安全要求 + +- 后台接口需基于权限控制访问 +- APP 登录验证码需具备有效期 +- 登录行为需记录日志 +- 上传下载需校验文件合法性 + +### 10.4 可维护性要求 + +- 业务模块与系统模块分层清晰 +- 关键业务实体应保留创建/更新时间 +- 定时任务应可配置、可查看执行日志 + +## 11. 当前实现中的风险与待确认事项 + +### 11.1 业务待确认 + +- 角色 ID 与业务角色名称的正式映射关系 +- 控制器设备为何固定叠加 `ID = 101` 的分润档案 +- 提现记录的审核流程是否应区分“申请中、审核通过、已打款、已驳回” +- 退款是否应按提现单冲减全部关联记录，而非单笔金额 + +### 11.2 实现待修正 + +- `BasicProfitSharingUserMapper.xml` 内容与文件名不匹配，疑似误复制 +- 语音拨号任务尚未实现 +- 若按当前代码执行，部分提现记录状态更新逻辑可能未完全落库 +- 部分接口的权限注解被注释，需确认是否为正式设计 +- 退款接口中的订单号非空校验逻辑疑似反向 + +### 11.3 文档待补充 + +- 前端页面原型 +- 角色菜单矩阵 +- 数据字典 +- 完整表结构设计 +- 对账和财务闭环说明 + +## 12. 结论 +从现有代码看，该项目不是单纯的“后台管理模板”，而是面向鱼塘养殖设备场景的分润结算系统。其核心业务主线是： + +1. 维护用户与设备关系 +2. 采集设备与充值业务数据 +3. 按层级和设备类型计算分润 +4. 支持分润查询、提现和退款冲销 +5. 为 APP/大屏提供设备监测、告警和控制能力 + +如果要继续推进项目建设，建议下一步优先补齐以下内容： + +1. 角色与组织模型说明 +2. 表结构与状态机说明 +3. 前端页面清单 +4. 提现审核与财务流程口径 +5. 语音告警闭环设计 diff --git a/fishery-admin/pom.xml b/fishery-admin/pom.xml new file mode 100644 index 0000000..6521313 --- /dev/null +++ b/fishery-admin/pom.xml @@ -0,0 +1,134 @@ + + + + fishery_base + com.limap + 3.8.5 + + 4.0.0 + jar + fishery-admin + + + web服务入口 + + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + + + mysql + mysql-connector-java + + + + + org.postgresql + postgresql + + + + com.taosdata.jdbc + taos-jdbcdriver + 2.0.38 + + + + com.highgo + HgdbJdbc + 6.2.3 + + + + + com.limap + fishery-common-mybatis + + + + + com.limap + fishery-common-security + + + + + com.limap + fishery-common-web + + + + + com.limap + fishery-system + + + + com.limap + fishery-core + + + + + com.limap + fishery-quartz + + + + + com.limap + fishery-generator + + + + + com.limap + fishery-demo + + + + + + + org.springframework.boot + spring-boot-maven-plugin + 2.1.1.RELEASE + + true + + + + + repackage + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.1.0 + + false + ${project.artifactId} + + + + ${project.artifactId} + + + \ No newline at end of file diff --git a/fishery-admin/src/main/java/com/limap/AopLog.java b/fishery-admin/src/main/java/com/limap/AopLog.java new file mode 100644 index 0000000..a12d9ca --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/AopLog.java @@ -0,0 +1,139 @@ +package com.limap; + +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; +import com.limap.common.utils.MailUtils; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.*; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * + + * 使用 aop 切面记录请求日志信息 + * + * @author jjb + * @since 2021-11-09 + */ +@Aspect +@Component +@Slf4j +public class AopLog { + + private static final String START_TIME = "request-start"; + + /** + * 切入点 + */ + @Pointcut("execution(* com.limap.work.controller.app..*(..))") + public void log() { + + + } + + /** + * 前置操作 + * + * @param point 切入点 + */ + @Before("log()") + public void beforeLog(JoinPoint point) { + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + + log.info("【请求 URL】：{}", request.getRequestURL()); + log.info("【请求 IP】：{}", request.getRemoteAddr()); + log.info("【请求类名】：{}，【请求方法名】：{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); + + Map parameterMap = request.getParameterMap(); + log.info("【请求参数】：{},", JSONObject.toJSONString(parameterMap)); + Long start = System.currentTimeMillis(); + request.setAttribute(START_TIME, start); + } + + /** + * 环绕操作 + * + * @param point 切入点 + * @return 原方法返回值 + * @throws Throwable 异常信息 + */ + @Around("log()") + public Object aroundLog(ProceedingJoinPoint point) throws Throwable { + + Object result = point.proceed(); + log.info("【返回值】：{}", JSONUtil.toJsonStr(result)); + //返回数据给切面方法 + return result; + } + + /** + * 异常通知操作 (看情况是否需要,一般项目都有全局异常处理) + * + * @param point 切入点 + */ + @AfterThrowing(value = "log()",throwing = "e") + public void afterThrowingLog(JoinPoint point,Exception e) { + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + + log.info("【异常请求 URL】：{}", request.getRequestURL()); + log.info("【异常请求 IP】：{}", request.getRemoteAddr()); + log.info("【异常请求类名】：{}，【请求方法名】：{}", point.getSignature().getDeclaringTypeName(), point.getSignature().getName()); + + Map parameterMap = request.getParameterMap(); + log.info("【异常请求参数】：{}，", JSONObject.toJSONString(parameterMap)); + log.info("【异常信息】：{}，", JSONUtil.toJsonStr(e.getMessage())); + + Map map = new HashMap<>(); + Map params = new HashMap(){{ + put("异常请求 URL",request.getRequestURL()); + put("异常请求 IP",request.getRemoteAddr()); + put("异常请求参数",JSONObject.toJSONString(parameterMap)); + put("异常信息",JSONUtil.toJsonStr(e.getMessage())); + }}; +// map.put("host","smtp.163.com"); +//// map.put("mailFrom","17863938131@163.com"); +// map.put("mailFrom","18453076019@163.com"); +//// map.put("passwd","DPVROHZZPETWTCDV"); +// map.put("passwd","EEZGZODVTOLFLHWR"); +// map.put("host","smtp.qq.com"); +// map.put("mailFrom","251173110@qq.com"); +// map.put("fromUser","小叮塘助手"); +// map.put("passwd","fqxusebzierbbgha"); +// map.put("mailTo","31320887171@qq.com"); +//// map.put("mailTo","623044253@qq.com,niuwj@qdlimap.com"); +// //标题和内容配置 +// map.put("mailTittle","小叮塘助手系统异常提示"); +// map.put("mailContent",JSONObject.toJSONString(params)); +// //发送简单邮件 +// MailUtils.sendSimpleMail(map); + } + + /** + * 后置操作 + */ + @AfterReturning("log()") + public void afterReturning() { + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); + + Long start = (Long) request.getAttribute(START_TIME); + Long end = System.currentTimeMillis(); + log.info("【请求耗时】：{}毫秒", end - start); + } +} diff --git a/fishery-admin/src/main/java/com/limap/LimapApplication.java b/fishery-admin/src/main/java/com/limap/LimapApplication.java new file mode 100644 index 0000000..67857f6 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/LimapApplication.java @@ -0,0 +1,30 @@ +package com.limap; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +/** + * 启动程序 + * + * @author limap + */ + +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +public class LimapApplication +{ + public static void main(String[] args) + { + // System.setProperty("spring.devtools.restart.enabled", "false"); + SpringApplication.run(LimapApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "***************************************\n" + + "* _ _ _______ _ _ *\n" + + "* | | (_) |___ ___| | | | | *\n" + + "* | | _ | | | | | | *\n" + + "* | | | | | | | | | | *\n" + + "* | |___ | | | | | \\____/ | *\n" + + "* |_____| |_| |_| \\______/ *\n" + + "***************************************\n" ); + } +} diff --git a/fishery-admin/src/main/java/com/limap/LimapServletInitializer.java b/fishery-admin/src/main/java/com/limap/LimapServletInitializer.java new file mode 100644 index 0000000..6f82854 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/LimapServletInitializer.java @@ -0,0 +1,18 @@ +package com.limap; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +/** + * web容器中进行部署 + * + * @author limap + */ +public class LimapServletInitializer extends SpringBootServletInitializer +{ + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) + { + return application.sources(LimapApplication.class); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/admin/CommonController.java b/fishery-admin/src/main/java/com/limap/controller/admin/CommonController.java new file mode 100644 index 0000000..4fae343 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/admin/CommonController.java @@ -0,0 +1,163 @@ +package com.limap.controller.admin; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import com.limap.common.config.LimapConfig; +import com.limap.common.constant.Constants; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.file.FileUploadUtils; +import com.limap.common.utils.file.FileUtils; +import com.limap.common.web.config.ServerConfig; + +/** + * 通用请求处理 + * + * @author limap + */ +@RestController +@RequestMapping("/common") +public class CommonController +{ + private static final Logger log = LoggerFactory.getLogger(CommonController.class); + + @Autowired + private ServerConfig serverConfig; + + private static final String FILE_DELIMETER = ","; + + /** + * 通用下载请求 + * + * @param fileName 文件名称 + * @param delete 是否删除 + */ + @GetMapping("/download") + public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) + { + try + { + if (!FileUtils.checkAllowDownload(fileName)) + { + throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); + } + String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); + String filePath = LimapConfig.getDownloadPath() + fileName; + + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, realFileName); + FileUtils.writeBytes(filePath, response.getOutputStream()); + if (delete) + { + FileUtils.deleteFile(filePath); + } + } + catch (Exception e) + { + log.error("下载文件失败", e); + } + } + + /** + * 通用上传请求（单个） + */ + @PostMapping("/upload") + public AjaxResult uploadFile(MultipartFile file) throws Exception + { + try + { + // 上传文件路径 + String filePath = LimapConfig.getUploadPath(); + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + AjaxResult ajax = AjaxResult.success(); + ajax.put("url", url); + ajax.put("fileName", fileName); + ajax.put("newFileName", FileUtils.getName(fileName)); + ajax.put("originalFilename", file.getOriginalFilename()); + return ajax; + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 通用上传请求（多个） + */ + @PostMapping("/uploads") + public AjaxResult uploadFiles(List files) throws Exception + { + try + { + // 上传文件路径 + String filePath = LimapConfig.getUploadPath(); + List urls = new ArrayList(); + List fileNames = new ArrayList(); + List newFileNames = new ArrayList(); + List originalFilenames = new ArrayList(); + for (MultipartFile file : files) + { + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + urls.add(url); + fileNames.add(fileName); + newFileNames.add(FileUtils.getName(fileName)); + originalFilenames.add(file.getOriginalFilename()); + } + AjaxResult ajax = AjaxResult.success(); + ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER)); + ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER)); + ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER)); + ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER)); + return ajax; + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + + /** + * 本地资源通用下载 + */ + @GetMapping("/download/resource") + public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response) + throws Exception + { + try + { + if (!FileUtils.checkAllowDownload(resource)) + { + throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); + } + // 本地资源路径 + String localPath = LimapConfig.getProfile(); + // 数据库资源地址 + String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX); + // 下载名称 + String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + FileUtils.setAttachmentResponseHeader(response, downloadName); + FileUtils.writeBytes(downloadPath, response.getOutputStream()); + } + catch (Exception e) + { + log.error("下载文件失败", e); + } + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/admin/IndexController.java b/fishery-admin/src/main/java/com/limap/controller/admin/IndexController.java new file mode 100644 index 0000000..12690ea --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/admin/IndexController.java @@ -0,0 +1,29 @@ +package com.limap.controller.admin; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.limap.common.config.LimapConfig; +import com.limap.common.utils.StringUtils; + +/** + * 首页 + * + * @author limap + */ +@RestController +public class IndexController +{ + /** 系统基础配置 */ + @Autowired + private LimapConfig limapConfig; + + /** + * 访问首页，提示语 + */ + @RequestMapping("/") + public String index() + { + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", limapConfig.getName(), limapConfig.getVersion()); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingController.java b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingController.java new file mode 100644 index 0000000..d1803da --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingController.java @@ -0,0 +1,107 @@ +package com.limap.controller.manager; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import com.limap.core.basic.domain.BasicProfitSharing; +import com.limap.core.basic.service.IBasicProfitSharingService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 基础分润信息Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "基础分润信息") +@RestController +@RequestMapping("/basic/profitSharing") +public class BasicProfitSharingController extends BaseController { + @Autowired + private IBasicProfitSharingService basicProfitSharingService; + + /** + * 查询基础分润信息列表 + */ + @ApiOperation("查询基础分润信息列表") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:list')") + @GetMapping("/list") + public TableDataInfo list(BasicProfitSharing basicProfitSharing) { + startPage(); + List list = basicProfitSharingService.selectBasicProfitSharingList(basicProfitSharing); + return getDataTable(list); + } + + /** + * 导出基础分润信息列表 + */ + @ApiOperation("导出基础分润信息列表") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:export')") + @Log(title = "基础分润信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicProfitSharing basicProfitSharing) { + List list = basicProfitSharingService.selectBasicProfitSharingList(basicProfitSharing); + ExcelUtil util = new ExcelUtil(BasicProfitSharing.class); + util.exportExcel(response, list, "基础分润信息数据"); + } + + /** + * 获取基础分润信息详细信息 + */ + @ApiOperation("获取基础分润信息详细信息") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(basicProfitSharingService.getById(id)); + } + + /** + * 新增基础分润信息 + */ + @ApiOperation("新增基础分润信息") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:add')") + @Log(title = "基础分润信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasicProfitSharing basicProfitSharing) { + return toAjax(basicProfitSharingService.save(basicProfitSharing)); + } + + /** + * 修改基础分润信息 + */ + @ApiOperation("修改基础分润信息") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:edit')") + @Log(title = "基础分润信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasicProfitSharing basicProfitSharing) { + return toAjax(basicProfitSharingService.updateById(basicProfitSharing)); + } + + /** + * 删除基础分润信息 + */ + @ApiOperation("删除基础分润信息") + @PreAuthorize("@ss.hasPermi('basic:profitSharing:remove')") + @Log(title = "基础分润信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(basicProfitSharingService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingRecordController.java b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingRecordController.java new file mode 100644 index 0000000..a7fb1c1 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingRecordController.java @@ -0,0 +1,152 @@ +package com.limap.controller.manager; + +import java.util.List; +import java.util.Arrays; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; + +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.service.IBasicUserWithdrawService; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import com.limap.core.basic.service.IBasicProfitSharingRecordService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; +import com.limap.core.basic.vo.SharingRecordSearchVo; + +/** + * 分润记录Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "分润记录") +@RestController +@RequestMapping("/basic/sharingRecord") +public class BasicProfitSharingRecordController extends BaseController { + @Autowired + private IBasicProfitSharingRecordService basicProfitSharingRecordService; + @Autowired + private IBasicUserWithdrawService basicUserWithdrawService; + + /** + * 查询分润记录列表 + */ + @ApiOperation("查询分润记录列表") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:list')") + @GetMapping("/list") + public TableDataInfo list(BasicProfitSharingRecord basicProfitSharingRecord) { + startPage(); + List roles = getLoginUser().getUser().getRoles(); + if(roles.stream().noneMatch(role -> role.getRoleId().compareTo(100L) <0)){ + basicProfitSharingRecord.setUserId(getUserId()); + } + List list = basicProfitSharingRecordService.selectBasicProfitSharingRecordList(basicProfitSharingRecord); + return getDataTable(list); + } + + + @ApiOperation("报表统计") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:list')") + @GetMapping("/report") + public AjaxResult reportData(SharingRecordSearchVo searchVo) { + List roles = getLoginUser().getUser().getRoles(); + if(roles.stream().noneMatch(role -> role.getRoleId().compareTo(100L) >=0)){ + searchVo.setUserId(getUserId()); + }else{ + searchVo.setDeptId(getDeptId()); + } + Map resultMap = basicProfitSharingRecordService.getReportData(searchVo); + return success(resultMap); + } + + /** + * 导出分润记录列表 + */ + @ApiOperation("导出分润记录列表") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:export')") + @Log(title = "分润记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicProfitSharingRecord basicProfitSharingRecord) { + List list = basicProfitSharingRecordService.selectBasicProfitSharingRecordList(basicProfitSharingRecord); + ExcelUtil util = new ExcelUtil(BasicProfitSharingRecord.class); + util.exportExcel(response, list, "分润记录数据"); + } + + /** + * 获取分润记录详细信息 + */ + @ApiOperation("获取分润记录详细信息") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(basicProfitSharingRecordService.getById(id)); + } + + /** + * 新增分润记录 + */ + @ApiOperation("新增分润记录") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:add')") + @Log(title = "分润记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasicProfitSharingRecord basicProfitSharingRecord) { + return toAjax(basicProfitSharingRecordService.save(basicProfitSharingRecord)); + } + + /** + * 修改分润记录 + */ + @ApiOperation("修改分润记录") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:edit')") + @Log(title = "分润记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasicProfitSharingRecord basicProfitSharingRecord) { + if(basicProfitSharingRecord.getStatus().equals(9) || basicProfitSharingRecord.getPaymentStatus().equals(9)){ + basicProfitSharingRecord.setStatus(9); + basicProfitSharingRecord.setPaymentStatus(9); + if(basicProfitSharingRecord.getWithdrawId() != null){ + basicUserWithdrawService.updatePayment(basicProfitSharingRecord.getWithdrawId(),basicProfitSharingRecord.getAmount()); + } + } + return toAjax(basicProfitSharingRecordService.updateById(basicProfitSharingRecord)); + } + + @ApiOperation("退款处理") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:edit')") + @Log(title = "退款处理", businessType = BusinessType.UPDATE) + @PutMapping("/refund") + public AjaxResult refund(@RequestBody BasicProfitSharingRecord basicProfitSharingRecord) { + if(StringUtils.isNotBlank(basicProfitSharingRecord.getOrderNo())){ + return AjaxResult.error("订单号不能为空"); + } + return basicProfitSharingRecordService.dealRefund(basicProfitSharingRecord); + } + + /** + * 删除分润记录 + */ + @ApiOperation("删除分润记录") + @PreAuthorize("@ss.hasPermi('basic:sharingRecord:remove')") + @Log(title = "分润记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(basicProfitSharingRecordService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingUserController.java b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingUserController.java new file mode 100644 index 0000000..883435b --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/BasicProfitSharingUserController.java @@ -0,0 +1,138 @@ +package com.limap.controller.manager; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.limap.common.core.domain.entity.SysRole; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import com.limap.core.basic.domain.BasicProfitSharingUser; +import com.limap.core.basic.service.IBasicProfitSharingUserService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 用户分润基础信息Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "用户分润基础信息") +@RestController +@RequestMapping("/basic/sharingUser") +public class BasicProfitSharingUserController extends BaseController { + @Autowired + private IBasicProfitSharingUserService basicProfitSharingUserService; + + /** + * 查询用户分润基础信息列表 + */ + @ApiOperation("查询用户分润基础信息列表") + @PreAuthorize("@ss.hasPermi('basic:sharingUser:list')") + @GetMapping("/list") + public TableDataInfo list(BasicProfitSharingUser basicProfitSharingUser) { + startPage(); + List list = basicProfitSharingUserService.selectBasicProfitSharingUserList(basicProfitSharingUser); + return getDataTable(list); + } + /** + * 导出用户分润基础信息列表 + */ + @ApiOperation("导出用户分润基础信息列表") + @PreAuthorize("@ss.hasPermi('basic:sharingUser:export')") + @Log(title = "用户分润基础信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicProfitSharingUser basicProfitSharingUser) { + List list = basicProfitSharingUserService.selectBasicProfitSharingUserList(basicProfitSharingUser); + ExcelUtil util = new ExcelUtil(BasicProfitSharingUser.class); + util.exportExcel(response, list, "用户分润基础信息数据"); + } + + /** + * 获取用户分润基础信息详细信息 + */ + @ApiOperation("获取用户分润基础信息详细信息") +// @PreAuthorize("@ss.hasPermi('basic:sharingUser:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + BasicProfitSharingUser byId = basicProfitSharingUserService.getById(id); + if (byId == null) { + byId = new BasicProfitSharingUser(); + } + return success(byId); + } + + /** + * 新增用户分润基础信息 + */ + @ApiOperation("新增用户分润基础信息") +// @PreAuthorize("@ss.hasPermi('basic:sharingUser:add')") + @Log(title = "用户分润基础信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasicProfitSharingUser basicProfitSharingUser) { + if(basicProfitSharingUser.getUserId() != null){ + basicProfitSharingUser.setId(basicProfitSharingUser.getUserId()); + }else{ + basicProfitSharingUser.setId(getUserId()); + basicProfitSharingUser.setUserId(getUserId()); + } + basicProfitSharingUserService.checkRatio(basicProfitSharingUser); + return toAjax(basicProfitSharingUserService.save(basicProfitSharingUser)); + } + + /** + * 修改用户分润基础信息 + */ + @ApiOperation("修改用户分润基础信息") +// @PreAuthorize("@ss.hasPermi('basic:sharingUser:edit')") + @Log(title = "用户分润基础信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasicProfitSharingUser basicProfitSharingUser) { + Long userId = basicProfitSharingUser.getUserId(); + if(userId != null){ + if(!userId.equals(getUserId())){ + List roles = getLoginUser().getUser().getRoles(); + if(roles.stream().noneMatch(role -> role.getRoleId().compareTo(100L) <0)){ + return error("只有管理员可以修改其他用户的信息"); + } + } + basicProfitSharingUser.setId(userId); + }else{ + basicProfitSharingUser.setId(getUserId()); + } + if(basicProfitSharingUserService.getById(basicProfitSharingUser.getId()) == null){ + return error("请联系管理员添加用户基础信息"); + } + + + basicProfitSharingUserService.checkRatio(basicProfitSharingUser); + return toAjax(basicProfitSharingUserService.updateById(basicProfitSharingUser)); + } + + /** + * 删除用户分润基础信息 + */ + @ApiOperation("删除用户分润基础信息") + @PreAuthorize("@ss.hasPermi('basic:sharingUser:remove')") + @Log(title = "用户分润基础信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(basicProfitSharingUserService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserBindInfoController.java b/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserBindInfoController.java new file mode 100644 index 0000000..404ddae --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserBindInfoController.java @@ -0,0 +1,290 @@ +package com.limap.controller.manager; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.*; +import java.util.stream.Collectors; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.limap.common.core.domain.AjaxResult1; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.page.PageDomain; +import com.limap.common.core.page.TableSupport; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.vo.BasicDeviceSearchVO; +import com.limap.core.screen.service.IScreenService; +import com.limap.core.screen.vo.AppEquipmentVo; +import com.limap.core.screen.vo.ControlSwitch; +import com.limap.core.screen.vo.EquipmentHistory; +import com.limap.core.screen.vo.WarnVo; +import com.limap.system.service.ISysUserService; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiResponse; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.basic.service.IBasicUserBindInfoService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 用户设备绑定信息Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "用户设备绑定信息") +@RestController +@RequestMapping("/basic/userBind") +public class BasicUserBindInfoController extends BaseController { + @Autowired + private IBasicUserBindInfoService basicUserBindInfoService; + @Resource + private IScreenService screenService; + @Resource + private ISysUserService userService; + + /** + * 查询用户设备绑定信息列表 + */ + @ApiOperation("查询用户设备绑定信息列表") + @PreAuthorize("@ss.hasPermi('basic:userBind:list')") + @GetMapping("/list") + public TableDataInfo list(BasicUserBindInfo basicUserBindInfo) { + startPage(); + Long userId = getUserId(); + boolean b = getLoginUser().getUser().getRoles().stream().anyMatch(role -> role.getRoleId() == 2L || role.getRoleId() == 4L); + basicUserBindInfo.setUserId(userId); + if(userId == 1L || b){ + basicUserBindInfo.setUserId(null); + } + List list = basicUserBindInfoService.selectBasicUserBindInfoList(basicUserBindInfo); + return getDataTable(list); + } + + /** + * 导出用户设备绑定信息列表 + */ + @ApiOperation("导出用户设备绑定信息列表") + @PreAuthorize("@ss.hasPermi('basic:userBind:export')") + @Log(title = "用户设备绑定信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicUserBindInfo basicUserBindInfo) { + List list = basicUserBindInfoService.selectBasicUserBindInfoList(basicUserBindInfo); + ExcelUtil util = new ExcelUtil(BasicUserBindInfo.class); + util.exportExcel(response, list, "用户设备绑定信息数据"); + } + + /** + * 获取用户设备绑定信息详细信息 + */ + @ApiOperation("获取用户设备绑定信息详细信息") + @PreAuthorize("@ss.hasPermi('basic:userBind:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + BasicUserBindInfo byId = basicUserBindInfoService.getById(id); + BasicUserBindInfo b = basicUserBindInfoService.selectAppUserInfo(byId); + return success(b); + } + + @ApiOperation("获取设备监测数据") + @PostMapping(value = "data") + public AjaxResult getMonitorData(@RequestBody @Valid BasicDeviceSearchVO vo) { + Map map = new HashMap<>(); + BasicUserBindInfo byId = basicUserBindInfoService.getInfoByDeviceId(vo.getDeviceId()); + AppEquipmentVo equipmentById = screenService.getEquipmentByDeviceNo(byId.getDeviceName()); + if (equipmentById != null) { + List equipmentHistory = screenService.getEquipmentHistory(vo.getDays(), equipmentById.getId()); + map.put("history", equipmentHistory); + }else{ + map.put("history", Collections.emptyList()); + } + map.put("equipment", equipmentById); + + return success(map); + } + + @ApiOperation("获取控制器信息") + @PostMapping(value = "control") + @ApiResponse(code = 200,message = "获取控制器信息",response = ControlSwitch.class) + public AjaxResult getControlData(@RequestBody @Valid BasicDeviceSearchVO vo) { + BasicUserBindInfo byId = basicUserBindInfoService.getInfoByDeviceId(vo.getDeviceId()); + return success(basicUserBindInfoService.getcControlInfo(byId.getDeviceName())); + } + + @ApiOperation("获取控制器信息") + @PostMapping(value = "control1") + public AjaxResult1> getControlData1(@RequestBody @Valid BasicDeviceSearchVO vo) { + BasicUserBindInfo byId = basicUserBindInfoService.getInfoByDeviceId(vo.getDeviceId()); + return AjaxResult1.success(basicUserBindInfoService.getcControlInfo(byId.getDeviceName())); + } + + + @ApiOperation("获取告警数据") + @GetMapping("warn") + public TableDataInfo getWarnList(Long deviceId){ + BasicUserBindInfo byId = basicUserBindInfoService.getInfoByDeviceId(deviceId); + if(byId==null){ + return getDataTable(Collections.emptyList()); + } + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + List list = screenService.getWarnListByDevice(byId.getDeviceId(),pageNum,pageSize); + long total = screenService.getWarnListCountByDevice(deviceId); + return getDataTable(list,total); + } + /** + * 新增用户设备绑定信息 + */ + @ApiOperation("新增用户设备绑定信息") + @PreAuthorize("@ss.hasPermi('basic:userBind:add')") + @Log(title = "用户设备绑定信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasicUserBindInfo basicUserBindInfo) { + if(basicUserBindInfo.getUserId() == null){ + basicUserBindInfo.setUserId(getUserId()); + }else if(basicUserBindInfo.getUserName() == null){ + SysUser sysUser = userService.selectUserById(basicUserBindInfo.getUserId()); + if(sysUser == null){ + return AjaxResult.error("用户不存在,请先创建用户"); + } + basicUserBindInfo.setUserName(sysUser.getNickName()); + } + + + if(basicUserBindInfoService.count(new QueryWrapper().eq("device_name",basicUserBindInfo.getDeviceName()))>0){ + return AjaxResult.error("设备已绑定"); + } + BasicUserBindInfo b = basicUserBindInfoService.selectAppUserInfo(basicUserBindInfo); + if(b==null){ + b = basicUserBindInfo; + }else{ + b.setUserId(basicUserBindInfo.getUserId()); + b.setUserName(basicUserBindInfo.getUserName()); + } + return toAjax(basicUserBindInfoService.save(b)); + } + + /** + * 修改用户设备绑定信息 + */ + @ApiOperation("修改用户设备绑定信息") + @PreAuthorize("@ss.hasPermi('basic:userBind:edit')") + @Log(title = "用户设备绑定信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasicUserBindInfo basicUserBindInfo) { + return toAjax(basicUserBindInfoService.updateById(basicUserBindInfo)); + } + + /** + * 删除用户设备绑定信息 + */ + @ApiOperation("删除用户设备绑定信息") + @PreAuthorize("@ss.hasPermi('basic:userBind:remove')") + @Log(title = "用户设备绑定信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(basicUserBindInfoService.removeByIds(Arrays.asList(ids))); + } + + + + @GetMapping("/test") + public AjaxResult remove() throws IOException { + FileInputStream fis = new FileInputStream("C:\\Users\\17863\\Desktop\\星途瑞销售明细(2).xlsx"); + Workbook workbook = new XSSFWorkbook(fis); + Sheet sheet = workbook.getSheetAt(0); + + String lastCustomerName = ""; + String lastContactPerson = ""; + + Iterator iterator = sheet.iterator(); + int rowIndex = 0; + List list = new ArrayList<>(); + List sysUsers = userService.selectUserList(new SysUser()); + Map> name = sysUsers.stream().collect(Collectors.groupingBy(SysUser::getUserName)); + Map> nick = sysUsers.stream().collect(Collectors.groupingBy(SysUser::getNickName)); + + while (iterator.hasNext()) { + Row row = iterator.next(); + if (rowIndex++ == 0) continue; // 跳过标题行 + + Cell customerCell = row.getCell(1); // 客户名称 + Cell contactCell = row.getCell(2); // 联系人 + + String customerName = getCellString(customerCell); + String contactPerson = getCellString(contactCell); + + if (customerName.isEmpty()) { + customerName = lastCustomerName; + } else { + lastCustomerName = customerName; + } + + if (contactPerson.isEmpty()) { + contactPerson = lastContactPerson; + } else { + lastContactPerson = contactPerson; + } + + String deviceCode = getCellString(row.getCell(7)); + if(StringUtils.isNotBlank(deviceCode)){ + BasicUserBindInfo basicUserBindInfo = new BasicUserBindInfo(); + if(nick.containsKey(customerName)){ + SysUser sysUser = nick.get(customerName).get(0); + basicUserBindInfo.setUserId(sysUser.getUserId()); + basicUserBindInfo.setUserId(sysUser.getUserId()); + basicUserBindInfo.setUserName(sysUser.getUserName()); + }else if(name.containsKey(contactPerson)){ + SysUser sysUser = name.get(contactPerson).get(0); + basicUserBindInfo.setUserId(sysUser.getUserId()); + basicUserBindInfo.setUserName(contactPerson); + } + basicUserBindInfo.setDeviceName(deviceCode); + list.add(basicUserBindInfo); + } + } + list.forEach(e-> { + BasicUserBindInfo b = basicUserBindInfoService.selectAppUserInfo(e); + if(b==null){ + b = e; + }else{ + b.setUserId(e.getUserId()); + b.setUserName(e.getUserName()); + } + basicUserBindInfoService.save(b); + }); + + return success(); + } + + + private static String getCellString(Cell cell) { + if (cell == null) return ""; + if (cell.getCellType() == CellType.STRING) return cell.getStringCellValue().trim(); + if (cell.getCellType() == CellType.NUMERIC) return String.valueOf((long)cell.getNumericCellValue()); + return ""; + } + +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserWithdrawController.java b/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserWithdrawController.java new file mode 100644 index 0000000..509b2f7 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/BasicUserWithdrawController.java @@ -0,0 +1,135 @@ +package com.limap.controller.manager; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.limap.common.core.domain.entity.SysRole; +import com.limap.core.basic.vo.BasicUserWithdrawVo; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import com.limap.core.basic.domain.BasicUserWithdraw; +import com.limap.core.basic.service.IBasicUserWithdrawService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 提现记录Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "提现记录") +@RestController +@RequestMapping("/basic/withdraw") +public class BasicUserWithdrawController extends BaseController { + @Autowired + private IBasicUserWithdrawService basicUserWithdrawService; + + /** + * 查询提现记录列表 + */ + @ApiOperation("查询提现记录列表") + @PreAuthorize("@ss.hasPermi('basic:withdraw:list')") + @GetMapping("/list") + public TableDataInfo list(BasicUserWithdraw basicUserWithdraw) { + startPage(); + List roles = getLoginUser().getUser().getRoles(); + if(roles.stream().noneMatch(role -> role.getRoleId().compareTo(100L) <0)){ + basicUserWithdraw.setUserId(getUserId()); + } + List list = basicUserWithdrawService.selectBasicUserWithdrawList(basicUserWithdraw); + return getDataTable(list); + } + + /** + * 导出提现记录列表 + */ + @ApiOperation("导出提现记录列表") + @PreAuthorize("@ss.hasPermi('basic:withdraw:export')") + @Log(title = "提现记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasicUserWithdraw basicUserWithdraw) { + List list = basicUserWithdrawService.selectBasicUserWithdrawList(basicUserWithdraw); + ExcelUtil util = new ExcelUtil(BasicUserWithdraw.class); + util.exportExcel(response, list, "提现记录数据"); + } + + @ApiOperation("用户提现") + @PreAuthorize("@ss.hasPermi('basic:withdraw:add')") + @Log(title = "用户提现", businessType = BusinessType.INSERT) + @PostMapping("user/withdraw") + public AjaxResult addUserWithdraw(@RequestBody BasicUserWithdrawVo basicUserWithdraw) { + basicUserWithdraw.setUserId(getUserId()); + return basicUserWithdrawService.addUserWithdraw(basicUserWithdraw); + } + + + /** + * 获取提现记录详细信息 + */ + @ApiOperation("获取提现记录详细信息") + @PreAuthorize("@ss.hasPermi('basic:withdraw:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(basicUserWithdrawService.getById(id)); + } + + /** + * 新增提现记录 + */ + @ApiOperation("新增提现记录") + @PreAuthorize("@ss.hasPermi('basic:withdraw:add')") + @Log(title = "提现记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasicUserWithdraw basicUserWithdraw) { + return toAjax(basicUserWithdrawService.save(basicUserWithdraw)); + } + + /** + * 修改提现记录 + */ + @ApiOperation("修改提现记录") + @PreAuthorize("@ss.hasPermi('basic:withdraw:edit')") + @Log(title = "提现记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasicUserWithdraw basicUserWithdraw) { + boolean result = basicUserWithdrawService.updateById(basicUserWithdraw); + if(result){ + if("9".equals(basicUserWithdraw.getPaymentStatus())){ + + } + if("1".equals(basicUserWithdraw.getPaymentStatus())){ + basicUserWithdrawService.updatePayment(basicUserWithdraw.getId(),basicUserWithdraw.getPaymentAmount()); + } + + } + return toAjax(result); + } + + /** + * 删除提现记录 + */ + @ApiOperation("删除提现记录") + @PreAuthorize("@ss.hasPermi('basic:withdraw:remove')") + @Log(title = "提现记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(basicUserWithdrawService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/ScreenUserController.java b/fishery-admin/src/main/java/com/limap/controller/manager/ScreenUserController.java new file mode 100644 index 0000000..5c60029 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/ScreenUserController.java @@ -0,0 +1,59 @@ +package com.limap.controller.manager; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.core.basic.domain.BasicProfitSharing; +import com.limap.core.basic.service.IBasicProfitSharingService; +import com.limap.system.AppUserVO; +import com.limap.system.service.ISysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 基础分润信息Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "大屏用户信息管理") +@RestController +@RequestMapping("/basic/user") +public class ScreenUserController extends BaseController { + @Autowired + private ISysUserService appUserService; + + /** + * 查询基础分润信息列表 + */ + @ApiOperation("app用户列表") + @GetMapping("/list") + public TableDataInfo list(AppUserVO appUserVO) { + startPage(); + List list = appUserService.selectAppUserList(appUserVO); + return getDataTable(list); + } + + + + /** + * 修改基础分润信息 + */ + @ApiOperation("修改app用户信息") + @Log(title = "修改app用户信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppUserVO appUserVO) { + return toAjax(appUserService.updateAppUser(appUserVO)); + } + +} diff --git a/fishery-admin/src/main/java/com/limap/controller/manager/SysCellNumberController.java b/fishery-admin/src/main/java/com/limap/controller/manager/SysCellNumberController.java new file mode 100644 index 0000000..81408de --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/manager/SysCellNumberController.java @@ -0,0 +1,78 @@ +package com.limap.controller.manager; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.core.basic.domain.BasicUserWithdraw; +import com.limap.core.basic.domain.SysCellNumber; +import com.limap.core.basic.service.IBasicUserWithdrawService; +import com.limap.core.basic.service.ISysCellNumberService; +import com.limap.core.basic.vo.BasicUserWithdrawVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 语音报警电话Controller + * + * @author jjb + * @date 2025-04-11 + */ +@Api(tags = "语音报警电话") +@RestController +@RequestMapping("/sys/tel") +public class SysCellNumberController extends BaseController { + @Autowired + private ISysCellNumberService cellNumberService; + + /** + * 查询提现记录列表 + */ + @ApiOperation("查询提现记录列表") + @GetMapping("/list") + public AjaxResult list(SysCellNumber cellNumber) { + List list = cellNumberService.list(); + return success(list); + } + + + /** + * 新增提现记录 + */ + @ApiOperation("新增提现记录") + @Log(title = "提现记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysCellNumber cellNumber) { + return toAjax(cellNumberService.save(cellNumber)); + } + + /** + * 修改提现记录 + */ + @ApiOperation("修改提现记录") + @Log(title = "提现记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysCellNumber cellNumber) { + return toAjax(cellNumberService.updateById(cellNumber)); + } + + /** + * 删除提现记录 + */ + @ApiOperation("删除提现记录") + @Log(title = "提现记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(cellNumberService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/work/AppLoginController.java b/fishery-admin/src/main/java/com/limap/controller/work/AppLoginController.java new file mode 100644 index 0000000..195094f --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/work/AppLoginController.java @@ -0,0 +1,180 @@ +package com.limap.controller.work; + + +import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson2.JSONObject; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginBody; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ali.SendSmsUtil; +import com.limap.common.utils.http.HttpUtils; +import com.limap.system.service.ISysUserService; +import com.limap.system.service.SysLoginService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeUnit; + +/** + * @author jjb + */ +@Api(tags = "短息登录") +@RestController +@RequestMapping("/sms") +@Slf4j +public class AppLoginController extends BaseController { + @Autowired + private SysLoginService loginService; + @Autowired + private RedisCache redisCache; + + @Autowired + private ISysUserService userService; + + + private static String appId = "wx26776caf9fbb6a1d"; + private static String secret = "8c6a2fd12255dc490322de3acb1bc32a"; + + private final static String KEY_INDEX = "phoneCode:"; + + @ApiOperation("获取验证码") + @Log(title = "获取验证码") + @PostMapping("/getCode") + public AjaxResult getCode(@RequestBody LoginBody loginBody) throws Exception { + String username = loginBody.getTel(); + if(StringUtils.isBlank(username)){ + return AjaxResult.error("手机号不能为空"); + }else{ + if(!StringUtils.isPhoneNumberValid(username)){ + return AjaxResult.error("请输入正确手机号"); + } + Object cacheObject = redisCache.getCacheObject(KEY_INDEX + username); + if (cacheObject != null) { + redisCache.deleteObject(KEY_INDEX + username); + } + String s = RandomUtil.randomNumbers(6); + JSONObject object = new JSONObject(); + object.put("code",s); + boolean b = SendSmsUtil.sendCodeSms(object, username); + if(b){ + redisCache.setCacheObject(KEY_INDEX + username,s,31, TimeUnit.MINUTES); + return AjaxResult.success(); + } + } + return AjaxResult.error("获取验证码失败,请稍后再试"); + } + + @ApiOperation("用户登录") + @Log(title = "用户登录") + @PostMapping("/login") + public AjaxResult login(@RequestBody LoginBody loginBody) throws Exception { + return loginService.login(loginBody); + } + + + + + public static String creatCode(int n) { + //3、定义一个字符串变量记录生成的随机字符 + String code = ""; + Random r = new Random(); + //2、定义一个for循环，循环n次，依次生成随机字符 + for (int i = 0; i < n; i++) { + //i=0 1 2 + //3、生成一个随机字符，英文大、小写 数字（0 1 2 ） + int type = r.nextInt(3); + switch (type) { + case 0: + //大写字符（A 65-Z 65+25） + char ch = (char) (r.nextInt(26) + 65); + code += ch; + break; + case 1: + //小写字符（a 97-z 97+25） + char ch1 = (char) (r.nextInt(26) + 97); + code += ch1; + break; + case 2: + //数字字符 + code += r.nextInt(10);//0-9 + break; + default: + break; + } + } + return code; + } + + private static String random3() { + // nextInt(int origin, int bound) 范围：[origin,bound) + // 包左 不包右 + return String.valueOf(ThreadLocalRandom.current().nextInt(100000, 1000000)); + } + + public String getOpenId(String code) { + String openId = null; + String resultOpen = HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?"+ + "appid=" + appId + + "&secret=" + secret+ + "&js_code="+ code + + "&grant_type=authorization_code",null); + com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(resultOpen); + if (jsonObject.containsKey("errcode")) { + log.info("code无效，openId获取失败——小程序获取"); + return null; + } + openId = jsonObject.get("openid").toString(); + return openId ; + } + + public String getWxToken(){ + String wxAccessToken = (String)redisCache.getCacheObject("wx_accessToken"); + if(wxAccessToken!= null){ + return wxAccessToken; + } + String s = HttpUtils.sendGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appId+"&secret=" +secret); + try{ + JSONObject object = JSONObject.parseObject(s); + String accessToken = object.getString("access_token"); + Integer expiresIn = object.getInteger("expires_in"); + redisCache.setCacheObject("wx_accessToken",accessToken,expiresIn,TimeUnit.SECONDS); + return accessToken; + }catch (Exception e){ + return null; + } + } + + public String getWxPhone(String code){ + String wxToken = getWxToken(); + if(wxToken == null){ + throw new RuntimeException("获取微信token失败"); + } + Map params = new HashMap<>(); + params.put("code",code); + String s = HttpUtils.sendPost("https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=" + wxToken, JSONObject.toJSONString(params)); + try{ + JSONObject object = JSONObject.parseObject(s); + JSONObject phone_info = object.getJSONObject("phone_info"); + return phone_info.getString("purePhoneNumber"); + }catch (Exception e){ + log.error("获取微信用户手机号异常：{}",e.getMessage()); + } + return null; + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/work/EquipmentDataWork.java b/fishery-admin/src/main/java/com/limap/controller/work/EquipmentDataWork.java new file mode 100644 index 0000000..7c74f85 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/work/EquipmentDataWork.java @@ -0,0 +1,241 @@ +package com.limap.controller.work; + +import com.alibaba.fastjson.JSONObject; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.service.IAquDeviceService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.codec.binary.Base64; +import org.apache.qpid.jms.JmsConnection; +import org.apache.qpid.jms.JmsConnectionListener; +import org.apache.qpid.jms.message.JmsInboundMessageDispatch; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.naming.Context; +import javax.naming.InitialContext; +import java.net.URI; +import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * @author Lenovo + */ +@Component +@SuppressWarnings("AlibabaThreadShouldSetName") +@Slf4j +public class EquipmentDataWork implements ApplicationRunner { + + private static final String consumerGroupId = "7F0WdwTYzdoUhss7zBDK000100"; + + private static final String accessKey = "LTAI5tRnPowmTLjH181nSbsR"; + private static final String accessSecret = "Vh2LoAM1t3XuMUVy2wTWSACJ97kOUW"; + + + private static final String iotInstanceId = ""; + + private static final String clientId = UUID.randomUUID().toString(); + + private static final String host = clientId+ ".iot-amqp.cn-shanghai.aliyuncs.com"; + + // 指定单个进程启动的连接数,最大64个连接 + private static final int connectionCount = 8; + + @Autowired + private IAquDeviceService aquDeviceService; + + @Value("${ali.iot.amqpEnabled:true}") + private boolean amqpEnabled; + + /** + * 业务处理异步线程池，线程池参数可以根据您的业务特点调整，或者您也可以用其他异步方式处理接收到的消息。 + */ + private final static ExecutorService executorService = new ThreadPoolExecutor( + Runtime.getRuntime().availableProcessors(), + Runtime.getRuntime().availableProcessors() * 4, 200, TimeUnit.SECONDS, + new LinkedBlockingQueue(50000)); + + + @Override + public void run(ApplicationArguments args) throws Exception { + if (!amqpEnabled) { + log.info("AMQP 数据接收服务已关闭 [ali.iot.amqpEnabled=false]"); + return; + } + + List connections = new ArrayList<>(); + + //参数说明，请参见AMQP客户端接入说明文档。 + for (int i = 0; i < connectionCount; i++) { + long timeStamp = System.currentTimeMillis(); + //签名方法：支持hmacmd5、hmacsha1和hmacsha256。 + String signMethod = "hmacsha1"; + + //userName组装方法，请参见AMQP客户端接入说明文档。 + String userName = clientId + "-" + i + "|authMode=aksign" + + ",signMethod=" + signMethod + + ",timestamp=" + timeStamp + + ",authId=" + accessKey + + ",iotInstanceId=" + iotInstanceId + + ",consumerGroupId=" + consumerGroupId + + "|"; + //计算签名，password组装方法，请参见AMQP客户端接入说明文档。 + String signContent = "authId=" + accessKey + "×tamp=" + timeStamp; + String password = doSign(signContent, accessSecret, signMethod); + String connectionUrl = "failover:(amqps://" + host + ":5671?amqp.idleTimeout=80000)" + + "?failover.reconnectDelay=30"; + + Hashtable hashtable = new Hashtable<>(); + hashtable.put("connectionfactory.SBCF", connectionUrl); + hashtable.put("queue.QUEUE", "default"); + hashtable.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory"); + Context context = new InitialContext(hashtable); + ConnectionFactory cf = (ConnectionFactory)context.lookup("SBCF"); + Destination queue = (Destination)context.lookup("QUEUE"); + // 创建连接。 + Connection connection = cf.createConnection(userName, password); + connections.add(connection); + + ((JmsConnection)connection).addConnectionListener(myJmsConnectionListener); + // 创建会话。 + // Session.CLIENT_ACKNOWLEDGE: 收到消息后，需要手动调用message.acknowledge()。 + // Session.AUTO_ACKNOWLEDGE: SDK自动ACK（推荐）。 + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + + connection.start(); + // 创建Receiver连接。 + MessageConsumer consumer = session.createConsumer(queue); + consumer.setMessageListener(messageListener); + } + } + + private final MessageListener messageListener = message -> { + try { + executorService.submit(new Runnable() { + @Override + public void run() { + try{ + processMessage(message); + }catch (Exception e){ + log.error("processMessage occurs error "); + } + + } + }); + } catch (Exception e) { + log.error("submit task occurs exception ", e); + } + }; + + /** + * 在这里处理您收到消息后的具体业务逻辑。 + */ + private void processMessage(Message message) { + try { + byte[] body = message.getBody(byte[].class); + String content = new String(body); + String topic = message.getStringProperty("topic"); + String messageId = message.getStringProperty("messageId"); +// log.info("receive message" +// + ",\n topic = " + topic +// + ",\n messageId = " + messageId +// + ",\n content = " + content); + + dealDate(content); + } catch (Exception e) { + log.error("processMessage occurs error ", e); + } + } + + private static final JmsConnectionListener myJmsConnectionListener = new JmsConnectionListener() { + /** + * 连接成功建立。 + */ + @Override + public void onConnectionEstablished(URI remoteURI) { + log.info("onConnectionEstablished, remoteUri:{}", remoteURI); + } + + /** + * 尝试过最大重试次数之后，最终连接失败。 + */ + @Override + public void onConnectionFailure(Throwable error) { + log.error("onConnectionFailure, {}", error.getMessage()); + } + + /** + * 连接中断。 + */ + @Override + public void onConnectionInterrupted(URI remoteURI) { + log.info("onConnectionInterrupted, remoteUri:{}", remoteURI); + } + + /** + * 连接中断后又自动重连上。 + */ + @Override + public void onConnectionRestored(URI remoteURI) { + log.info("onConnectionRestored, remoteUri:{}", remoteURI); + } + + @Override + public void onInboundMessage(JmsInboundMessageDispatch envelope) {} + + @Override + public void onSessionClosed(Session session, Throwable cause) {} + + @Override + public void onConsumerClosed(MessageConsumer consumer, Throwable cause) {} + + @Override + public void onProducerClosed(MessageProducer producer, Throwable cause) {} + }; + + /** + * 计算签名，password组装方法，请参见AMQP客户端接入说明文档。 + */ + private static String doSign(String toSignString, String secret, String signMethod) throws Exception { + SecretKeySpec signingKey = new SecretKeySpec(secret.getBytes(), signMethod); + Mac mac = Mac.getInstance(signMethod); + mac.init(signingKey); + byte[] rawHmac = mac.doFinal(toSignString.getBytes()); + return Base64.encodeBase64String(rawHmac); + } + + + private void dealDate(String s) { + if (!amqpEnabled) { + return; + } + try{ + JSONObject jsonObject = JSONObject.parseObject(s); + JSONObject items = jsonObject.getJSONObject("items"); + String iotId = jsonObject.getString("iotId"); + String deviceName = jsonObject.getString("deviceName"); + String status = jsonObject.getString("status"); + AquDevice aquDevice = aquDeviceService.getInfoByIotId(iotId); + if(aquDevice != null){ + aquDeviceService.dealNowAndHistoryData(aquDevice,items); + } + }catch (Exception e){ + log.error("WOrk--dealDate error",e); + } + } +} diff --git a/fishery-admin/src/main/java/com/limap/controller/work/TestController.java b/fishery-admin/src/main/java/com/limap/controller/work/TestController.java new file mode 100644 index 0000000..dc11020 --- /dev/null +++ b/fishery-admin/src/main/java/com/limap/controller/work/TestController.java @@ -0,0 +1,124 @@ +package com.limap.controller.work; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.PageDomain; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.core.page.TableSupport; +import com.limap.common.enums.iot.DeviceType; +import com.limap.common.utils.ali.iot.ClientUtil; +import com.limap.core.screen.service.IScreenService; +import com.limap.core.screen.vo.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author limap + */ +@Api(tags = "大屏设备信息") +@RestController +@RequestMapping("/screen") +public class TestController extends BaseController { + + @Resource + private IScreenService screenService; + @Resource + private ClientUtil clientUtil; + + @ApiOperation("获取塘口信息") + @PostMapping("pond") + public AjaxResult getPonds(){ + Long userId = getUserId(); + List userPonds = screenService.getUserPonds(userId); + return AjaxResult.success(userPonds); + } + + @ApiOperation("获取设备信息") + @PostMapping("equipment") + public AjaxResult getEquipments(@RequestBody SearchVo vo){ + Long userId = getUserId(); + List equipments = screenService.getUserEquipments(userId, vo.getPondIds(),vo.getDeviceType()); + List userPonds = screenService.getUserPonds(userId); + Map> collect = userPonds.stream().collect(Collectors.groupingBy(PondVo::getId)); + equipments.forEach(e-> { + Long pondId = e.getPondId(); + if(collect.containsKey(pondId)){ + PondVo pondVo = collect.get(pondId).get(0); + e.setPondName(pondVo.getPondName()); + } + }); + return AjaxResult.success(equipments); + } + + @ApiOperation("获取全部设备信息") + @PostMapping("equipment/list") + public AjaxResult getEquipmentsList(@RequestBody SearchVo vo){ + Long userId = getUserId(); + List equipments = screenService.getEquipmentsList(userId, vo.getPondIds(),vo.getDeviceType()); + List userPonds = screenService.getUserPonds(userId); + Map> collect = userPonds.stream().collect(Collectors.groupingBy(PondVo::getId)); + equipments.forEach(e-> { + Long pondId = e.getPondId(); + if(collect.containsKey(pondId)){ + PondVo pondVo = collect.get(pondId).get(0); + e.setPondName(pondVo.getPondName()); + } + }); + return AjaxResult.success(equipments); + } + + @ApiOperation("获取历史数据") + @PostMapping("history") + public AjaxResult getEquipmentHistory(@RequestBody SearchVo vo){ + if( vo.getDeviceId() == null){ + return error("设备信息不能为空"); + } + Long userId = getUserId(); + List list = screenService.getEquipmentHistory(userId,vo.getDeviceId()); + return AjaxResult.success(list); + } + + @ApiOperation("获取历史数据") + @PostMapping("history/compare") + public AjaxResult historyCompare(@RequestBody @Valid CompareSearchVo vo){ + List list = screenService.historyCompare(vo); + Long userId = getUserId(); + List equipments = screenService.getUserEquipments(userId, null, DeviceType.doxygen.getCode()); + Map> collect = equipments.stream().collect(Collectors.groupingBy(AppEquipmentVo::getId)); + list.forEach(e->{ + if(collect.containsKey(e.getDeviceId())) { + AppEquipmentVo appEquipmentVo = collect.get(e.getDeviceId()).get(0); + e.setDeviceName(appEquipmentVo.getDeviceName()); + } + }); + return AjaxResult.success(list); + } + + @ApiOperation("获取告警数据") + @GetMapping("warn") + public TableDataInfo getWarnList(){ + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + List list = screenService.getWarnList(getUserId(),pageNum,pageSize); + long total = screenService.getWarnListCount(getUserId()); + return getDataTable(list,total); + } + + @ApiOperation("控制器开关控制") + @PostMapping("controlSwitch") + public AjaxResult controlSwitch(@RequestBody @Valid ControlSwitchVo vo){ + Map params = new HashMap<>(); + params.put("Switch"+vo.getIndex(),vo.getStatus()); + Boolean aBoolean = clientUtil.propertiesSet(vo.getIotId(), params); + return toAjax(aBoolean); + } +} diff --git a/fishery-admin/src/main/resources/META-INF/spring-devtools.properties b/fishery-admin/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 0000000..2b23f85 --- /dev/null +++ b/fishery-admin/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1 @@ +restart.include.json=/com.alibaba.fastjson.*.jar \ No newline at end of file diff --git a/fishery-admin/src/main/resources/application-dev.yml b/fishery-admin/src/main/resources/application-dev.yml new file mode 100644 index 0000000..878e9b5 --- /dev/null +++ b/fishery-admin/src/main/resources/application-dev.yml @@ -0,0 +1,62 @@ +# spring配置 +spring: + datasource: + druid: + stat-view-servlet: + enabled: true + loginUsername: limap + loginPassword: 123456 + dynamic: + druid: + initial-size: 5 + min-idle: 5 + maxActive: 20 + maxWait: 60000 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: SELECT version() + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxPoolPreparedStatementPerConnectionSize: 20 + filters: stat,slf4j + ## connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 + connectionProperties: + druid: + stat: + mergeSql: true + slowSqlMillis: 5000 + datasource: + # 主库数据源 + master: + driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://36.139.89.250:13306/work?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=CONVERT_TO_NULL&transformedBitIsBoolean=true&useSSL=false&serverTimezone=Asia/Shanghai + # username: zhangsan + # password: '%qLUNmRr!4' + url: jdbc:mysql://81.70.89.108:33306/fishery_dms?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=CONVERT_TO_NULL&transformedBitIsBoolean=true&useSSL=false&serverTimezone=Asia/Shanghai + username: root + password: Intc@123 + # 测试数据源 + # 使用方法，在 Mapper 类或者方法上增加注解 @DS("test") 用于切换数据源 + test: + driverClassName: org.postgresql.Driver + url: jdbc:postgresql://81.70.89.108:15432/fishery_dev?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true + username: postgres + password: intc@123987 + # 从库数据源 - TDengine + taos: + lazy: false + # 强制使用 HikariCP 连接池，避免继承全局 Druid 配置 + type: com.zaxxer.hikari.HikariDataSource + driverClassName: com.taosdata.jdbc.rs.RestfulDriver + # 不指定数据库名，在 SQL 中使用完整路径 fishery.table_name + url: jdbc:TAOS-RS://81.70.89.108:6041?timezone=Shanghai&charset=UTF-8&locale=en_US.UTF-8 + username: root + password: intc@123456 + hikari: + connection-timeout: 60000 + idle-timeout: 600000 + max-lifetime: 1800000 + maximum-pool-size: 5 + minimum-idle: 2 diff --git a/fishery-admin/src/main/resources/application.yml b/fishery-admin/src/main/resources/application.yml new file mode 100644 index 0000000..355a375 --- /dev/null +++ b/fishery-admin/src/main/resources/application.yml @@ -0,0 +1,187 @@ +# 项目相关配置 +limap: + # 名称 + name: 经销商管理系统 + # 版本 + version: 3.8.5 + # 版权年份 + copyrightYear: 2023 + # 实例演示开关 + demoEnabled: true + # 文件路径 示例（ Windows配置D:/temp/limap/uploadPath，Linux配置 /home/limap/uploadPath） + profile: D:/temp/limap/uploadPath + # 获取ip地址开关 + addressEnabled: true + # 验证码类型 math 数组计算 char 字符验证 + #captchaType: math + +# 验证码配置 +captcha: + # 验证码类型配置 查看 CaptchaProperties 类 + codeType: arithmetic + # 登录图形验证码有效时间/分钟 + expiration: 2 + # 验证码高度 + width: 111 + # 验证码宽度 + height: 36 + # 内容长度 + length: 2 + # 字体名称，为空则使用默认字体 + fontName: + # 字体大小 + fontSize: 25 + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 8080 + servlet: + # 应用的访问路径 + context-path: /equipment + tomcat: + # tomcat的URI编码 + uri-encoding: UTF-8 + # 连接数满后的排队数，默认为100 + accept-count: 1000 + threads: + # tomcat最大线程数，默认为200 + max: 800 + # Tomcat启动初始化的线程数，默认值10 + min-spare: 100 + compression: + enabled: true + mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain +# 日志配置 +logging: + level: + com.limap: info + org.springframework: warn + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +# Spring配置 +spring: + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: + active: dev + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + # 服务模块 + devtools: + restart: + # 热部署开关 + enabled: true + # redis 配置 + redis: + # 地址 + host: 82.157.37.106 + # 端口，默认为6379 + port: 26379 + # 数据库索引 + database: 4 + # 密码 + password: bbd4b56e5d3f + # 连接超时时间 + timeout: 10s + lettuce: + pool: + # 连接池中的最小空闲连接 + min-idle: 0 + # 连接池中的最大空闲连接 + max-idle: 8 + # 连接池的最大数据库连接数 + max-active: 8 + # #连接池最大阻塞等待时间（使用负值表示没有限制） + max-wait: -1ms + +# token配置 +token: + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: abcdefghijklmnopqrstuvwxyz + # 令牌有效期（默认30分钟） + expireTime: 1 + +# MyBatis Plus配置 +mybatis-plus: + # 实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.limap.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + global-config: + # 数据库相关配置 + db-config: + # ID自增 + id-type: ASSIGN_ID + # 逻辑已删除值 + logic-delete-value: 1 + # 逻辑未删除值 + logic-not-delete-value: 0 + banner: false + # 加载原生全局的配置文件 + # configLocation: classpath:mybatis/mybatis-config.xml + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + configuration-properties: + prefix: + blobType: BLOB + boolValue: TRUE + +# PageHelper分页插件 +pagehelper: + helperDialect: postgresql + reasonable: true + supportMethodsArguments: true + params: count=countSql + +# Swagger配置 +swagger: + # 是否开启swagger + enabled: true + # 请求前缀 + pathMapping: + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + +ali: + accessKeyId: LTAI5tKv3CygUJwCd8W9p6aR + accessKeySecret: KjOSdAMh4Tgdyj0he1mM5xk6JBYiY5 + iot: + regionId: cn-shanghai + productCode: Iot + domain: iot.cn-shanghai.aliyuncs.com + version: 2018-01-20 + appKey: 334224397 + appSecret: 70de3018ec39423e9ca1e1b6a6a84ad6 + endPoint: https://ilop.iot-as-http2.cn-shanghai.aliyuncs.com:443 + cellCount: 3 + controllerType: a1cXr2xY5mI + oxygenType: a1cXr2xY5mI + # AMQP数据接收开关：true-开启，false-关闭 + amqpEnabled: false diff --git a/fishery-admin/src/main/resources/banner.txt b/fishery-admin/src/main/resources/banner.txt new file mode 100644 index 0000000..b56396f --- /dev/null +++ b/fishery-admin/src/main/resources/banner.txt @@ -0,0 +1,24 @@ +Application Version: ${limap.version} +Spring Boot Version: ${spring-boot.version} +//////////////////////////////////////////////////////////////////// +// _ooOoo_ // +// o8888888o // +// 88" . "88 // +// (| ^_^ |) // +// O\ = /O // +// ____/`---'\____ // +// .' \\| |// `. // +// / \\||| : |||// \ // +// / _||||| -:- |||||- \ // +// | | \\\ - /// | | // +// | \_| ''\---/'' | | // +// \ .-\__ `-` ___/-. / // +// ___`. .' /--.--\ `. . ___ // +// ."" '< `.___\_<|>_/___.' >'"". // +// | | : `- \`.;`\ _ /`;.`/ - ` : | | // +// \ \ `-. \_ __\ /__ _/ .-` / / // +// ========`-.____`-.___\_____/___.-`____.-'======== // +// `=---=' // +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // +// 佛祖保佑 永不宕机 永无BUG // +//////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/fishery-admin/src/main/resources/i18n/messages.properties b/fishery-admin/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..93de005 --- /dev/null +++ b/fishery-admin/src/main/resources/i18n/messages.properties @@ -0,0 +1,38 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=用户不存在/密码错误 +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 +user.password.delete=对不起，您的账号已被删除 +user.blocked=用户已封禁，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +login.blocked=很遗憾，访问IP已被列入系统黑名单 +user.logout.success=退出成功 + +length.not.valid=长度必须在{min}到{max}个字符之间 + +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.password.not.valid=* 5-50个字符 + +user.email.not.valid=邮箱格式错误 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 + +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 + +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] diff --git a/fishery-admin/src/main/resources/ip2region/ip2region.db b/fishery-admin/src/main/resources/ip2region/ip2region.db new file mode 100644 index 0000000..3b6a296 Binary files /dev/null and b/fishery-admin/src/main/resources/ip2region/ip2region.db differ diff --git a/fishery-admin/src/main/resources/logback.xml b/fishery-admin/src/main/resources/logback.xml new file mode 100644 index 0000000..00f525c --- /dev/null +++ b/fishery-admin/src/main/resources/logback.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/sys-user.log + + + ${log.path}/sys-user.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fishery-admin/src/main/resources/mybatis/mybatis-config.xml b/fishery-admin/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 0000000..ac47c03 --- /dev/null +++ b/fishery-admin/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/fishery-common/fishery-common-api/pom.xml b/fishery-common/fishery-common-api/pom.xml new file mode 100644 index 0000000..085bff4 --- /dev/null +++ b/fishery-common/fishery-common-api/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-api + 各模块聚合api + + + + + + com.limap + fishery-common-core + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-api/src/main/java/com/limap/common/api/SystemApi.java b/fishery-common/fishery-common-api/src/main/java/com/limap/common/api/SystemApi.java new file mode 100644 index 0000000..9907c01 --- /dev/null +++ b/fishery-common/fishery-common-api/src/main/java/com/limap/common/api/SystemApi.java @@ -0,0 +1,29 @@ +package com.limap.common.api; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.domain.entity.SysLogininfor; +import com.limap.common.core.domain.entity.SysOperLog; + +/** + * 系统管理api接口 + * + * @author metaee + * @date 2023/3/8 11:24 + **/ + +public interface SystemApi { + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + void insertLogininfor(SysLogininfor logininfor); + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + void insertOperlog(SysOperLog operLog); +} diff --git a/fishery-common/fishery-common-core/pom.xml b/fishery-common/fishery-common-core/pom.xml new file mode 100644 index 0000000..cf77b4f --- /dev/null +++ b/fishery-common/fishery-common-core/pom.xml @@ -0,0 +1,215 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-core + 核心工具 + + + + + + org.springframework + spring-context-support + + + + + org.springframework + spring-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + + com.baomidou + mybatis-plus-boot-starter + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.springframework.boot + spring-boot-starter-websocket + + + + + org.apache.commons + commons-lang3 + + + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.alibaba.fastjson2 + fastjson2 + + + + + commons-io + commons-io + + + + + org.apache.poi + poi-ooxml + + + + + org.yaml + snakeyaml + + + + + io.jsonwebtoken + jjwt + + + + + javax.xml.bind + jaxb-api + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.commons + commons-pool2 + + + + + eu.bitwalker + UserAgentUtils + + + + + org.lionsoul + ip2region + 1.7.2 + + + + + javax.servlet + javax.servlet-api + + + + + cn.hutool + hutool-all + + + + + org.projectlombok + lombok + + + + com.aliyun + dysmsapi20170525 + 2.0.24 + + + + + com.aliyun + aliyun-java-sdk-iot + 7.31.0 + + + + com.aliyun + aliyun-java-sdk-core + 4.5.6 + + + + com.aliyun + iot20180120 + 1.4.0 + + + + com.aliyun.openservices + iot-client-message + 1.1.5 + + + + com.aliyun + aliyun-java-sdk-linkcard + 1.0.0 + + + + + com.aliyun.api.gateway + sdk-core-java + 1.1.0 + + + + + org.apache.qpid + qpid-jms-client + 0.56.0 + + + + javax.mail + javax.mail-api + + + com.sun.mail + javax.mail + 1.6.2 + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/DataScope.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/DataScope.java new file mode 100644 index 0000000..0610eff --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/DataScope.java @@ -0,0 +1,33 @@ +package com.limap.common.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 数据权限过滤注解 + * + * @author limap + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface DataScope +{ + /** + * 部门表的别名 + */ + public String deptAlias() default ""; + + /** + * 用户表的别名 + */ + public String userAlias() default ""; + + /** + * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来 + */ + public String permission() default ""; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excel.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excel.java new file mode 100644 index 0000000..45b6a56 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excel.java @@ -0,0 +1,187 @@ +package com.limap.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.math.BigDecimal; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import com.limap.common.utils.poi.ExcelHandlerAdapter; + +/** + * 自定义导出Excel数据注解 + * + * @author limap + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Excel +{ + /** + * 导出时在excel中排序 + */ + public int sort() default Integer.MAX_VALUE; + + /** + * 导出到Excel中的名字. + */ + public String name() default ""; + + /** + * 日期格式, 如: yyyy-MM-dd + */ + public String dateFormat() default ""; + + /** + * 如果是字典类型，请设置字典的type值 (如: sys_user_sex) + */ + public String dictType() default ""; + + /** + * 读取内容转表达式 (如: 0=男,1=女,2=未知) + */ + public String readConverterExp() default ""; + + /** + * 分隔符，读取字符串组内容 + */ + public String separator() default ","; + + /** + * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化) + */ + public int scale() default -1; + + /** + * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN + */ + public int roundingMode() default BigDecimal.ROUND_HALF_EVEN; + + /** + * 导出时在excel中每个列的高度 单位为字符 + */ + public double height() default 14; + + /** + * 导出时在excel中每个列的宽 单位为字符 + */ + public double width() default 16; + + /** + * 文字后缀,如% 90 变成90% + */ + public String suffix() default ""; + + /** + * 当值为空时,字段的默认值 + */ + public String defaultValue() default ""; + + /** + * 提示信息 + */ + public String prompt() default ""; + + /** + * 设置只能选择不能输入的列内容. + */ + public String[] combo() default {}; + + /** + * 是否需要纵向合并单元格,应对需求:含有list集合单元格) + */ + public boolean needMerge() default false; + + /** + * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写. + */ + public boolean isExport() default true; + + /** + * 另一个类中的属性名称,支持多级获取,以小数点隔开 + */ + public String targetAttr() default ""; + + /** + * 是否自动统计数据,在最后追加一行统计数据总和 + */ + public boolean isStatistics() default false; + + /** + * 导出类型（0数字 1字符串 2图片） + */ + public ColumnType cellType() default ColumnType.STRING; + + /** + * 导出列头背景色 + */ + public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT; + + /** + * 导出列头字体颜色 + */ + public IndexedColors headerColor() default IndexedColors.WHITE; + + /** + * 导出单元格背景色 + */ + public IndexedColors backgroundColor() default IndexedColors.WHITE; + + /** + * 导出单元格字体颜色 + */ + public IndexedColors color() default IndexedColors.BLACK; + + /** + * 导出字段对齐方式 + */ + public HorizontalAlignment align() default HorizontalAlignment.CENTER; + + /** + * 自定义数据处理器 + */ + public Class handler() default ExcelHandlerAdapter.class; + + /** + * 自定义数据处理器参数 + */ + public String[] args() default {}; + + /** + * 字段类型（0：导出导入；1：仅导出；2：仅导入） + */ + Type type() default Type.ALL; + + public enum Type + { + ALL(0), EXPORT(1), IMPORT(2); + private final int value; + + Type(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } + + public enum ColumnType + { + NUMERIC(0), STRING(1), IMAGE(2); + private final int value; + + ColumnType(int value) + { + this.value = value; + } + + public int value() + { + return this.value; + } + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excels.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excels.java new file mode 100644 index 0000000..da18e4b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/Excels.java @@ -0,0 +1,18 @@ +package com.limap.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Excel注解集 + * + * @author limap + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Excels +{ + public Excel[] value(); +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RateLimiter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RateLimiter.java new file mode 100644 index 0000000..bab5abb --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RateLimiter.java @@ -0,0 +1,40 @@ +package com.limap.common.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.limap.common.constant.CacheConstants; +import com.limap.common.enums.LimitType; + +/** + * 限流注解 + * + * @author limap + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RateLimiter +{ + /** + * 限流key + */ + public String key() default CacheConstants.RATE_LIMIT_KEY; + + /** + * 限流时间,单位秒 + */ + public int time() default 60; + + /** + * 限流次数 + */ + public int count() default 100; + + /** + * 限流类型 + */ + public LimitType limitType() default LimitType.DEFAULT; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RepeatSubmit.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RepeatSubmit.java new file mode 100644 index 0000000..3ad4665 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/annotation/RepeatSubmit.java @@ -0,0 +1,31 @@ +package com.limap.common.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义注解防止表单重复提交 + * + * @author limap + * + */ +@Inherited +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RepeatSubmit +{ + /** + * 间隔时间(ms)，小于此时间视为重复提交 + */ + public int interval() default 5000; + + /** + * 提示消息 + */ + public String message() default "不允许重复提交，请稍候再试"; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/config/LimapConfig.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/config/LimapConfig.java new file mode 100644 index 0000000..58f0e02 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/config/LimapConfig.java @@ -0,0 +1,135 @@ +package com.limap.common.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * 读取项目相关配置 + * + * @author limap + */ +@Component +@ConfigurationProperties(prefix = "limap") +public class LimapConfig +{ + /** 项目名称 */ + private String name; + + /** 版本 */ + private String version; + + /** 版权年份 */ + private String copyrightYear; + + /** 实例演示开关 */ + private boolean demoEnabled; + + /** 上传路径 */ + private static String profile; + + /** 获取地址开关 */ + private static boolean addressEnabled; + + /** 验证码类型 */ + private static String captchaType; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getCopyrightYear() + { + return copyrightYear; + } + + public void setCopyrightYear(String copyrightYear) + { + this.copyrightYear = copyrightYear; + } + + public boolean isDemoEnabled() + { + return demoEnabled; + } + + public void setDemoEnabled(boolean demoEnabled) + { + this.demoEnabled = demoEnabled; + } + + public static String getProfile() + { + return profile; + } + + public void setProfile(String profile) + { + LimapConfig.profile = profile; + } + + public static boolean isAddressEnabled() + { + return addressEnabled; + } + + public void setAddressEnabled(boolean addressEnabled) + { + LimapConfig.addressEnabled = addressEnabled; + } + + public static String getCaptchaType() { + return captchaType; + } + + public void setCaptchaType(String captchaType) { + LimapConfig.captchaType = captchaType; + } + + /** + * 获取导入上传路径 + */ + public static String getImportPath() + { + return getProfile() + "/import"; + } + + /** + * 获取头像上传路径 + */ + public static String getAvatarPath() + { + return getProfile() + "/avatar"; + } + + /** + * 获取下载路径 + */ + public static String getDownloadPath() + { + return getProfile() + "/download/"; + } + + /** + * 获取上传路径 + */ + public static String getUploadPath() + { + return getProfile() + "/upload"; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/CacheConstants.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/CacheConstants.java new file mode 100644 index 0000000..c7742c3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/CacheConstants.java @@ -0,0 +1,44 @@ +package com.limap.common.constant; + +/** + * 缓存的key 常量 + * + * @author limap + */ +public class CacheConstants +{ + /** + * 登录用户 redis key + */ + public static final String LOGIN_TOKEN_KEY = "app_login_tokens:"; + + /** + * 验证码 redis key + */ + public static final String CAPTCHA_CODE_KEY = "app_captcha_codes:"; + + /** + * 参数管理 cache key + */ + public static final String SYS_CONFIG_KEY = "app_sys_config:"; + + /** + * 字典管理 cache key + */ + public static final String SYS_DICT_KEY = "app_sys_dict:"; + + /** + * 防重提交 redis key + */ + public static final String REPEAT_SUBMIT_KEY = "app_repeat_submit:"; + + /** + * 限流 redis key + */ + public static final String RATE_LIMIT_KEY = "app_rate_limit:"; + + /** + * 登录账户密码错误次数 redis key + */ + public static final String PWD_ERR_CNT_KEY = "app_pwd_err_cnt:"; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/Constants.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/Constants.java new file mode 100644 index 0000000..730e0fc --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/Constants.java @@ -0,0 +1,144 @@ +package com.limap.common.constant; + +import io.jsonwebtoken.Claims; + +/** + * 通用常量信息 + * + * @author limap + */ +public class Constants +{ + /** + * UTF-8 字符集 + */ + public static final String UTF8 = "UTF-8"; + + /** + * GBK 字符集 + */ + public static final String GBK = "GBK"; + + /** + * www主域 + */ + public static final String WWW = "www."; + + /** + * http请求 + */ + public static final String HTTP = "http://"; + + /** + * https请求 + */ + public static final String HTTPS = "https://"; + + /** + * 通用成功标识 + */ + public static final String SUCCESS = "0"; + + /** + * 通用失败标识 + */ + public static final String FAIL = "1"; + + /** + * 登录成功 + */ + public static final String LOGIN_SUCCESS = "Success"; + + /** + * 注销 + */ + public static final String LOGOUT = "Logout"; + + /** + * 注册 + */ + public static final String REGISTER = "Register"; + + /** + * 登录失败 + */ + public static final String LOGIN_FAIL = "Error"; + + /** + * 验证码有效期（分钟） + */ + public static final Integer CAPTCHA_EXPIRATION = 2; + + /** + * 令牌 + */ + public static final String TOKEN = "token"; + + /** + * 令牌前缀 + */ + public static final String TOKEN_PREFIX = "Bearer "; + + /** + * 令牌前缀 + */ + public static final String LOGIN_USER_KEY = "login_user_key"; + + public static final String APP_LOGIN_USER_KEY = "app_login_user_key"; + + /** + * 用户ID + */ + public static final String JWT_USERID = "userid"; + + /** + * 用户名称 + */ + public static final String JWT_USERNAME = Claims.SUBJECT; + + /** + * 用户头像 + */ + public static final String JWT_AVATAR = "avatar"; + + /** + * 创建时间 + */ + public static final String JWT_CREATED = "created"; + + /** + * 用户权限 + */ + public static final String JWT_AUTHORITIES = "authorities"; + + /** + * 资源映射路径 前缀 + */ + public static final String RESOURCE_PREFIX = "/profile"; + + /** + * RMI 远程方法调用 + */ + public static final String LOOKUP_RMI = "rmi:"; + + /** + * LDAP 远程方法调用 + */ + public static final String LOOKUP_LDAP = "ldap:"; + + /** + * LDAPS 远程方法调用 + */ + public static final String LOOKUP_LDAPS = "ldaps:"; + + /** + * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） + */ + public static final String[] JOB_WHITELIST_STR = { "com.limap" }; + + /** + * 定时任务违规的字符 + */ + public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", + "org.springframework", "org.apache", "com.limap.common.utils.file", "com.limap.common.config" }; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/GenConstants.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/GenConstants.java new file mode 100644 index 0000000..c565781 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/GenConstants.java @@ -0,0 +1,123 @@ +package com.limap.common.constant; + +/** + * 代码生成通用常量 + * + * @author limap + */ +public class GenConstants +{ + /** 单表（增删改查） */ + public static final String TPL_CRUD = "crud"; + + /** 树表（增删改查） */ + public static final String TPL_TREE = "tree"; + + /** 主子表（增删改查） */ + public static final String TPL_SUB = "sub"; + + /** 树编码字段 */ + public static final String TREE_CODE = "treeCode"; + + /** 树父编码字段 */ + public static final String TREE_PARENT_CODE = "treeParentCode"; + + /** 树名称字段 */ + public static final String TREE_NAME = "treeName"; + + /** 上级菜单ID字段 */ + public static final String PARENT_MENU_ID = "parentMenuId"; + + /** 上级菜单名称字段 */ + public static final String PARENT_MENU_NAME = "parentMenuName"; + + /** 数据库字符串类型 */ + public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; + + /** 数据库文本类型 */ + public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext" }; + + /** 数据库时间类型 */ + public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp" }; + + /** 数据库数字类型 */ + public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer", + "bit", "bigint", "float", "double", "decimal" }; + + /** 页面不需要编辑字段 */ + // 20230224--update + ////public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "update_by", + //// "update_time", "del_flag", "del_by", "del_time" }; + public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" }; + + /** 页面不需要显示的列表字段 */ + // 20230224--update + ////public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", + //// "update_time","remark", "del_flag", "del_by", "del_time" }; + public static final String[] COLUMNNAME_NOT_LIST = { "id", "create_by", "create_time", "del_flag", "update_by", + "update_time" }; + + /** 页面不需要查询字段 */ + public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", + "update_time", "remark" }; + + /** Entity基类字段 */ + public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" }; + + /** Tree基类字段 */ + public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" }; + + /** 文本框 */ + public static final String HTML_INPUT = "input"; + + /** 文本域 */ + public static final String HTML_TEXTAREA = "textarea"; + + /** 下拉框 */ + public static final String HTML_SELECT = "select"; + + /** 单选框 */ + public static final String HTML_RADIO = "radio"; + + /** 复选框 */ + public static final String HTML_CHECKBOX = "checkbox"; + + /** 日期控件 */ + public static final String HTML_DATETIME = "datetime"; + + /** 图片上传控件 */ + public static final String HTML_IMAGE_UPLOAD = "imageUpload"; + + /** 文件上传控件 */ + public static final String HTML_FILE_UPLOAD = "fileUpload"; + + /** 富文本控件 */ + public static final String HTML_EDITOR = "editor"; + + /** 字符串类型 */ + public static final String TYPE_STRING = "String"; + + /** 整型 */ + public static final String TYPE_INTEGER = "Integer"; + + /** 长整型 */ + public static final String TYPE_LONG = "Long"; + + /** 浮点型 */ + public static final String TYPE_DOUBLE = "Double"; + + /** 高精度计算类型 */ + public static final String TYPE_BIGDECIMAL = "BigDecimal"; + + /** 时间类型 */ + public static final String TYPE_DATE = "Date"; + + /** 模糊查询 */ + public static final String QUERY_LIKE = "LIKE"; + + /** 相等查询 */ + public static final String QUERY_EQ = "EQ"; + + /** 需要 */ + public static final String REQUIRE = "1"; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/HttpStatus.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/HttpStatus.java new file mode 100644 index 0000000..5f74ffe --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/HttpStatus.java @@ -0,0 +1,94 @@ +package com.limap.common.constant; + +/** + * 返回状态码 + * + * @author limap + */ +public class HttpStatus +{ + /** + * 操作成功 + */ + public static final int SUCCESS = 200; + + /** + * 对象创建成功 + */ + public static final int CREATED = 201; + + /** + * 请求已经被接受 + */ + public static final int ACCEPTED = 202; + + /** + * 操作已经执行成功，但是没有返回数据 + */ + public static final int NO_CONTENT = 204; + + /** + * 资源已被移除 + */ + public static final int MOVED_PERM = 301; + + /** + * 重定向 + */ + public static final int SEE_OTHER = 303; + + /** + * 资源没有被修改 + */ + public static final int NOT_MODIFIED = 304; + + /** + * 参数列表错误（缺少，格式不匹配） + */ + public static final int BAD_REQUEST = 400; + + /** + * 未授权 + */ + public static final int UNAUTHORIZED = 401; + + /** + * 访问受限，授权过期 + */ + public static final int FORBIDDEN = 403; + + /** + * 资源，服务未找到 + */ + public static final int NOT_FOUND = 404; + + /** + * 不允许的http方法 + */ + public static final int BAD_METHOD = 405; + + /** + * 资源冲突，或者资源被锁 + */ + public static final int CONFLICT = 409; + + /** + * 不支持的数据，媒体类型 + */ + public static final int UNSUPPORTED_TYPE = 415; + + /** + * 系统内部错误 + */ + public static final int ERROR = 500; + + /** + * 接口未实现 + */ + public static final int NOT_IMPLEMENTED = 501; + + /** + * 系统警告消息 + */ + public static final int WARN = 601; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/ScheduleConstants.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/ScheduleConstants.java new file mode 100644 index 0000000..0e3369a --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/ScheduleConstants.java @@ -0,0 +1,50 @@ +package com.limap.common.constant; + +/** + * 任务调度通用常量 + * + * @author limap + */ +public class ScheduleConstants +{ + public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME"; + + /** 执行目标key */ + public static final String TASK_PROPERTIES = "TASK_PROPERTIES"; + + /** 默认 */ + public static final String MISFIRE_DEFAULT = "0"; + + /** 立即触发执行 */ + public static final String MISFIRE_IGNORE_MISFIRES = "1"; + + /** 触发一次执行 */ + public static final String MISFIRE_FIRE_AND_PROCEED = "2"; + + /** 不触发立即执行 */ + public static final String MISFIRE_DO_NOTHING = "3"; + + public enum Status + { + /** + * 正常 + */ + NORMAL("0"), + /** + * 暂停 + */ + PAUSE("1"); + + private String value; + + private Status(String value) + { + this.value = value; + } + + public String getValue() + { + return value; + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/UserConstants.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/UserConstants.java new file mode 100644 index 0000000..25d82e3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/constant/UserConstants.java @@ -0,0 +1,78 @@ +package com.limap.common.constant; + +/** + * 用户常量信息 + * + * @author limap + */ +public class UserConstants +{ + /** + * 平台内系统用户的唯一标志 + */ + public static final String SYS_USER = "SYS_USER"; + + /** 正常状态 */ + public static final String NORMAL = "0"; + + /** 异常状态 */ + public static final String EXCEPTION = "1"; + + /** 用户封禁状态 */ + public static final String USER_DISABLE = "1"; + + /** 角色封禁状态 */ + public static final String ROLE_DISABLE = "1"; + + /** 部门正常状态 */ + public static final String DEPT_NORMAL = "0"; + + /** 部门停用状态 */ + public static final String DEPT_DISABLE = "1"; + + /** 字典正常状态 */ + public static final String DICT_NORMAL = "0"; + + /** 是否为系统默认（是） */ + public static final String YES = "Y"; + + /** 是否菜单外链（是） */ + public static final String YES_FRAME = "0"; + + /** 是否菜单外链（否） */ + public static final String NO_FRAME = "1"; + + /** 菜单类型（目录） */ + public static final String TYPE_DIR = "M"; + + /** 菜单类型（菜单） */ + public static final String TYPE_MENU = "C"; + + /** 菜单类型（按钮） */ + public static final String TYPE_BUTTON = "F"; + + /** Layout组件标识 */ + public final static String LAYOUT = "Layout"; + + /** ParentView组件标识 */ + public final static String PARENT_VIEW = "ParentView"; + + /** InnerLink组件标识 */ + public final static String INNER_LINK = "InnerLink"; + + /** 校验是否唯一的返回标识 */ + public final static boolean UNIQUE = true; + public final static boolean NOT_UNIQUE = false; + + /** + * 用户名长度限制 + */ + public static final int USERNAME_MIN_LENGTH = 2; + public static final int USERNAME_MAX_LENGTH = 20; + + /** + * 密码长度限制 + */ + public static final int PASSWORD_MIN_LENGTH = 5; + public static final int PASSWORD_MAX_LENGTH = 20; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/controller/BaseController.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/controller/BaseController.java new file mode 100644 index 0000000..9913667 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/controller/BaseController.java @@ -0,0 +1,211 @@ +package com.limap.common.core.controller; + +import java.beans.PropertyEditorSupport; +import java.util.Date; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.limap.common.constant.HttpStatus; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.page.PageDomain; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.core.page.TableSupport; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.PageUtils; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.sql.SqlUtil; + +/** + * web层通用数据处理 + * + * @author limap + */ +public class BaseController +{ + protected final Logger logger = LoggerFactory.getLogger(this.getClass()); + + /** + * 将前台传递过来的日期格式的字符串，自动转化为Date类型 + */ + @InitBinder + public void initBinder(WebDataBinder binder) + { + // Date 类型转换 + binder.registerCustomEditor(Date.class, new PropertyEditorSupport() + { + @Override + public void setAsText(String text) + { + setValue(DateUtils.parseDate(text)); + } + }); + } + + /** + * 设置请求分页数据 + */ + protected void startPage() + { + PageUtils.startPage(); + } + + /** + * 设置请求排序数据 + */ + protected void startOrderBy() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) + { + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + PageHelper.orderBy(orderBy); + } + } + + /** + * 清理分页的线程变量 + */ + protected void clearPage() + { + PageUtils.clearPage(); + } + + /** + * 响应请求分页数据 + */ + @SuppressWarnings({ "rawtypes", "unchecked" }) + protected TableDataInfo getDataTable(List list) + { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(list); + rspData.setTotal(new PageInfo(list).getTotal()); + return rspData; + } + + protected TableDataInfo getDataTable(List list,long total) + { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(list); + rspData.setTotal(total); + return rspData; + } + /** + * 返回成功 + */ + public AjaxResult success() + { + return AjaxResult.success(); + } + + /** + * 返回失败消息 + */ + public AjaxResult error() + { + return AjaxResult.error(); + } + + /** + * 返回成功消息 + */ + public AjaxResult success(String message) + { + return AjaxResult.success(message); + } + + /** + * 返回成功消息 + */ + public AjaxResult success(Object data) + { + return AjaxResult.success(data); + } + + /** + * 返回失败消息 + */ + public AjaxResult error(String message) + { + return AjaxResult.error(message); + } + + /** + * 返回警告消息 + */ + public AjaxResult warn(String message) + { + return AjaxResult.warn(message); + } + + /** + * 响应返回结果 + * + * @param rows 影响行数 + * @return 操作结果 + */ + protected AjaxResult toAjax(int rows) + { + return rows > 0 ? AjaxResult.success() : AjaxResult.error(); + } + + /** + * 响应返回结果 + * + * @param result 结果 + * @return 操作结果 + */ + protected AjaxResult toAjax(boolean result) + { + return result ? success() : error(); + } + + /** + * 页面跳转 + */ + public String redirect(String url) + { + return StringUtils.format("redirect:{}", url); + } + + /** + * 获取用户缓存信息 + */ + public LoginUser getLoginUser() + { + return SecurityUtils.getLoginUser(); + } + + /** + * 获取登录用户id + */ + public Long getUserId() + { + return getLoginUser().getUserId(); + } + + /** + * 获取登录部门id + */ + public Long getDeptId() + { + return getLoginUser().getDeptId(); + } + + /** + * 获取登录用户名 + */ + public String getUsername() + { + return getLoginUser().getUsername(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult.java new file mode 100644 index 0000000..0b963e7 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult.java @@ -0,0 +1,185 @@ +package com.limap.common.core.domain; + +import java.util.HashMap; +import com.limap.common.constant.HttpStatus; +import com.limap.common.utils.StringUtils; + +/** + * 操作消息提醒 + * + * @author limap + */ +public class AjaxResult extends HashMap +{ + private static final long serialVersionUID = 1L; + + /** 状态码 */ + public static final String CODE_TAG = "code"; + + /** 返回内容 */ + public static final String MSG_TAG = "msg"; + + /** 数据对象 */ + public static final String DATA_TAG = "data"; + + /** + * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。 + */ + public AjaxResult() + { + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param code 状态码 + * @param msg 返回内容 + */ + public AjaxResult(int code, String msg) + { + super.put(CODE_TAG, code); + super.put(MSG_TAG, msg); + } + + /** + * 初始化一个新创建的 AjaxResult 对象 + * + * @param code 状态码 + * @param msg 返回内容 + * @param data 数据对象 + */ + public AjaxResult(int code, String msg, Object data) + { + super.put(CODE_TAG, code); + super.put(MSG_TAG, msg); + if (StringUtils.isNotNull(data)) + { + super.put(DATA_TAG, data); + } + } + + /** + * 返回成功消息 + * + * @return 成功消息 + */ + public static AjaxResult success() + { + return AjaxResult.success("操作成功"); + } + + /** + * 返回成功数据 + * + * @return 成功消息 + */ + public static AjaxResult success(Object data) + { + return AjaxResult.success("操作成功", data); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @return 成功消息 + */ + public static AjaxResult success(String msg) + { + return AjaxResult.success(msg, null); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 成功消息 + */ + public static AjaxResult success(String msg, Object data) + { + return new AjaxResult(HttpStatus.SUCCESS, msg, data); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult warn(String msg) + { + return AjaxResult.warn(msg, null); + } + + /** + * 返回警告消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static AjaxResult warn(String msg, Object data) + { + return new AjaxResult(HttpStatus.WARN, msg, data); + } + + /** + * 返回错误消息 + * + * @return 错误消息 + */ + public static AjaxResult error() + { + return AjaxResult.error("操作失败"); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @return 错误消息 + */ + public static AjaxResult error(String msg) + { + return AjaxResult.error(msg, null); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 错误消息 + */ + public static AjaxResult error(String msg, Object data) + { + return new AjaxResult(HttpStatus.ERROR, msg, data); + } + + /** + * 返回错误消息 + * + * @param code 状态码 + * @param msg 返回内容 + * @return 错误消息 + */ + public static AjaxResult error(int code, String msg) + { + return new AjaxResult(code, msg, null); + } + + /** + * 方便链式调用 + * + * @param key 键 + * @param value 值 + * @return 数据对象 + */ + @Override + public AjaxResult put(String key, Object value) + { + super.put(key, value); + return this; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult1.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult1.java new file mode 100644 index 0000000..01cab9e --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/AjaxResult1.java @@ -0,0 +1,361 @@ +package com.limap.common.core.domain; + + +import java.io.Serializable; +import java.util.*; + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONWriter; +import com.limap.common.constant.HttpStatus; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; + +@Data +@Slf4j +public class AjaxResult1 implements Serializable { + private static final long serialVersionUID = -2740653620215944417L; + + /** + * 状态码 + */ + public static final String CODE_TAG = "code"; + + /** + * 返回内容 + */ + public static final String MSG_TAG = "msg"; + + /** + * 数据对象 + */ + public static final String DATA_TAG = "data"; + + /** + * 状态码，告诉swagger/knife4j返回对象有一个code属性 + */ + private int code; + + /** + * 返回内容，告诉swagger/knife4j返回对象有一个msg属性 + */ + + private String msg; + + /** + * 数据对象，告诉swagger/knife4j返回对象有一个泛型数据对象属性 + */ + + public T data; + + /** + * 私有化唯一的构造器，是对象创建只能由create进行 + */ + private AjaxResult1() { + } + + /** + * 唯一创建对象实例的方法，实际创建的是子类对象AjaxResult1Impl + * + * @param code 状态码 + * @param msg 返回提示消息 + * @param data 返回是数据 + * @param 数据类型 + * @return 返回AjaxResult1，但实际类型为AjaxResult1的子类AjaxResult1Impl + */ + public static AjaxResult1 create(int code, String msg, T data) { + AjaxResult1Impl result = new AjaxResult1Impl<>(); + result.setCode(code); + result.setMsg(msg); + result.setData(data); + return result; + } + + /** + * 成功 + * + * @return r + */ + public static AjaxResult1 success() { + return AjaxResult1.successMsg("操作成功"); + } + + /** + * 返回成功数据 + * + * @return 成功消息，并携带泛型类型，便于swagger预览返回对象结构 + */ + public static AjaxResult1 successRT(T data) { + return success(data); + } + + public static AjaxResult1 success(T data) { + return AjaxResult1.success("操作成功", data); + } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @return 成功消息 + */ + public static AjaxResult1 successMsg(String msg) { + return AjaxResult1.success(msg, null); + } + +// /** +// * 返回成功消息 +// * todo 这是若依的另一个坑，该方法与success(Object data)方法存在重叠， +// * 比如想返回一个字符串路径，但期望调用的时success(Object data)方法， +// * 但实际调用的是success(String msg)方法，导致data的数据放置到msg上面， +// * 应该有数据的data却是空的。 +// * 此处的解决方案是直接加一个successMsg(String msg)方法，专门用于返回成功消息， +// * 避免与success(Object data)方法混淆， +// * 同时修改项目中使用的success(String msg)方法，改用successMsg(String msg)方法 +// * @param msg 返回内容 +// * @return 成功消息 +// */ +// public static AjaxResult1 success(String msg) { +// return AjaxResult1.success(msg, null); +// } + + /** + * 返回成功消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 成功消息 + */ + public static AjaxResult1 success(String msg, T data) { + return AjaxResult1.create(HttpStatus.SUCCESS, msg, data); + } + + /** + * 返回错误消息 + * + * @return r + */ + public static AjaxResult1 error() { + return AjaxResult1.error("操作失败"); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult1 error(String msg) { + return AjaxResult1.error(msg, null); + } + + /** + * 返回错误消息 + * + * @param msg 返回内容 + * @param data 数据对象 + * @return 警告消息 + */ + public static AjaxResult1 error(String msg, T data) { + return AjaxResult1.create(HttpStatus.ERROR, msg, data); + } + + /** + * 返回错误消息 + * + * @param code 状态码 + * @param msg 返回内容 + * @return 警告消息 + */ + public static AjaxResult1 error(int code, String msg) { + return AjaxResult1.create(code, msg, null); + } + + /** + * 方便链式调用 + * + * @param key 键 + * @param value 值 + * @return 数据对象 + */ + public AjaxResult1 put(String key, Object value) { + return this; + } + + public static class AjaxResult1Impl extends AjaxResult1 implements Map { + private static final long serialVersionUID = -6041138310168295064L; + + /** + * 定义实际保存数据的容器 + */ + private final Map dataMap; + + /** + * 创建子类对象时创建数据容器 + */ + public AjaxResult1Impl() { + dataMap = new HashMap<>(); + } + + /** + * 重写getCode，从数据容器中获取code + * + * @return r + */ + @Override + public int getCode() { + return (Integer) dataMap.getOrDefault(CODE_TAG, 0); + } + + /** + * 重写getMsg，从数据容器中获取msg + * + * @return r + */ + @Override + public String getMsg() { + return (String) dataMap.get(MSG_TAG); + } + + /** + * 重写getData，从数据容器中获取data + * + * @return r + */ + @Override + @SuppressWarnings("all") + public T getData() { + return (T) dataMap.get(data); + } + + /** + * 重写setCode，把code放到数据容器中 + */ + @Override + public void setCode(int code) { + dataMap.put(CODE_TAG, code); + } + + /** + * 重写setCode，把msg放到数据容器中 + */ + @Override + public void setMsg(String msg) { + dataMap.put(MSG_TAG, msg); + } + + /** + * 重写setData，把data放到数据容器中 + */ + @Override + public void setData(T data) { + dataMap.put(DATA_TAG, data); + } + + /** + * 重写put，直接使用数据容器的put方法，并返回this + * + * @return 返回AjaxResult1类型的AjaxResult1Impl实例对象 + */ + @Override + public AjaxResult1 put(String key, Object value) { + dataMap.put(key, value); + return this; + } + + /** + * 重写toString方法，直接使用数据容器的toString方法 + * + * @return r + */ + @Override + public String toString() { + return dataMap.toString(); + } + + //以下方法为Map接口需要实现的方法，直接使用数据容器的对应方法即可 + @Override + public int size() { + return dataMap.size(); + } + + @Override + public boolean isEmpty() { + return dataMap.isEmpty(); + } + + @Override + public boolean containsKey(Object key) { + return dataMap.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return dataMap.containsValue(value); + } + + @Override + public Object get(Object key) { + return dataMap.get(key); + } + + @Override + public Object remove(Object key) { + return dataMap.remove(key); + } + + @Override + public void putAll(Map m) { + dataMap.putAll(m); + } + + @Override + public void clear() { + dataMap.clear(); + } + + @Override + public Set keySet() { + return dataMap.keySet(); + } + + @Override + public Collection values() { + return dataMap.values(); + } + + @Override + public Set> entrySet() { + return dataMap.entrySet(); + } + } + + /** + * 测试代码 + * + * @param args a + */ + public static void main(String[] args) { + AjaxResult1 builder = AjaxResult1.success("返回数据"); + AjaxResult1> success = AjaxResult1.success(builder); + System.out.println(JSON.toJSONString(builder, JSONWriter.Feature.PrettyFormat)); + builder.put("a1", "1"); + builder.put("a2", "2"); + builder.put("a3", "3"); + builder.put("a4", "4"); + builder.put("1", "4"); + builder.put("a4", "4"); + System.out.println(JSON.toJSONString(builder, JSONWriter.Feature.PrettyFormat)); + System.out.println(builder); + System.out.println(); + success.put("测试1", "test1") + .put("test2", "test2") + .put("test3", "test3"); + System.out.println(JSON.toJSONString(success, JSONWriter.Feature.PrettyFormat)); + Object code1 = ((AjaxResult1Impl) success).remove("code"); + System.out.println(code1); + System.out.println(success.getCode()); + } + +} + + diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BaseEntity.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BaseEntity.java new file mode 100644 index 0000000..86e3f42 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BaseEntity.java @@ -0,0 +1,118 @@ +package com.limap.common.core.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +/** + * Entity基类 + * + * @author limap + */ +public class BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 搜索值 */ + @JsonIgnore + private String searchValue; + + /** 创建者 */ + private String createBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + private String updateBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** 备注 */ + private String remark; + + /** 请求参数 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map params; + + public String getSearchValue() + { + return searchValue; + } + + public void setSearchValue(String searchValue) + { + this.searchValue = searchValue; + } + + public String getCreateBy() + { + return createBy; + } + + public void setCreateBy(String createBy) + { + this.createBy = createBy; + } + + public Date getCreateTime() + { + return createTime; + } + + public void setCreateTime(Date createTime) + { + this.createTime = createTime; + } + + public String getUpdateBy() + { + return updateBy; + } + + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; + } + + public Date getUpdateTime() + { + return updateTime; + } + + public void setUpdateTime(Date updateTime) + { + this.updateTime = updateTime; + } + + public String getRemark() + { + return remark; + } + + public void setRemark(String remark) + { + this.remark = remark; + } + + public Map getParams() + { + if (params == null) + { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) + { + this.params = params; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BasePlusEntity.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BasePlusEntity.java new file mode 100644 index 0000000..6547e4a --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/BasePlusEntity.java @@ -0,0 +1,72 @@ +package com.limap.common.core.domain; + +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; + +import lombok.Data; + +/** + * Entity基类 + * + * @author limap + */ +@Data +public class BasePlusEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** 搜索值 */ + @TableField(exist = false) + @JsonIgnore + private String searchValue; + + /** 创建者 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 创建时间 */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 更新者 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + +// /** 删除标志（0逻辑未删除值 1逻辑已删除值） */ +// @TableLogic +// @TableField(fill = FieldFill.INSERT) +// private Integer delFlag; + + /** 备注 */ + private String remark; + + /** 请求参数 */ + @TableField(exist = false) + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map params; + + public Map getParams() { + if (params == null) { + params = new HashMap<>(); + } + return params; + } + + public void setParams(Map params) { + this.params = params; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/R.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/R.java new file mode 100644 index 0000000..e3a7c08 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/R.java @@ -0,0 +1,115 @@ +package com.limap.common.core.domain; + +import java.io.Serializable; +import com.limap.common.constant.HttpStatus; + +/** + * 响应信息主体 + * + * @author limap + */ +public class R implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 成功 */ + public static final int SUCCESS = HttpStatus.SUCCESS; + + /** 失败 */ + public static final int FAIL = HttpStatus.ERROR; + + private int code; + + private String msg; + + private T data; + + public static R ok() + { + return restResult(null, SUCCESS, "操作成功"); + } + + public static R ok(T data) + { + return restResult(data, SUCCESS, "操作成功"); + } + + public static R ok(T data, String msg) + { + return restResult(data, SUCCESS, msg); + } + + public static R fail() + { + return restResult(null, FAIL, "操作失败"); + } + + public static R fail(String msg) + { + return restResult(null, FAIL, msg); + } + + public static R fail(T data) + { + return restResult(data, FAIL, "操作失败"); + } + + public static R fail(T data, String msg) + { + return restResult(data, FAIL, msg); + } + + public static R fail(int code, String msg) + { + return restResult(null, code, msg); + } + + private static R restResult(T data, int code, String msg) + { + R apiResult = new R<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } + + public int getCode() + { + return code; + } + + public void setCode(int code) + { + this.code = code; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public T getData() + { + return data; + } + + public void setData(T data) + { + this.data = data; + } + + public static Boolean isError(R ret) + { + return !isSuccess(ret); + } + + public static Boolean isSuccess(R ret) + { + return R.SUCCESS == ret.getCode(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeEntity.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeEntity.java new file mode 100644 index 0000000..de23059 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeEntity.java @@ -0,0 +1,79 @@ +package com.limap.common.core.domain; + +import java.util.ArrayList; +import java.util.List; + +/** + * Tree基类 + * + * @author limap + */ +public class TreeEntity extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 祖级列表 */ + private String ancestors; + + /** 子部门 */ + private List children = new ArrayList<>(); + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreePlusEntity.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreePlusEntity.java new file mode 100644 index 0000000..9fb7399 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreePlusEntity.java @@ -0,0 +1,37 @@ +package com.limap.common.core.domain; + +import java.util.ArrayList; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.TableField; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * Tree基类 + * + * @author limap + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TreePlusEntity extends BasePlusEntity { + private static final long serialVersionUID = 1L; + + /** 父菜单名称 */ + @TableField(exist = false) + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 祖级列表 */ + private String ancestors; + + /** 子部门 */ + @TableField(exist = false) + private List children = new ArrayList<>(); +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeSelect.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeSelect.java new file mode 100644 index 0000000..34adf9f --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/TreeSelect.java @@ -0,0 +1,77 @@ +package com.limap.common.core.domain; + +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.core.domain.entity.SysMenu; + +/** + * Treeselect树结构实体类 + * + * @author limap + */ +public class TreeSelect implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 节点ID */ + private Long id; + + /** 节点名称 */ + private String label; + + /** 子节点 */ + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List children; + + public TreeSelect() + { + + } + + public TreeSelect(SysDept dept) + { + this.id = dept.getDeptId(); + this.label = dept.getDeptName(); + this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + public TreeSelect(SysMenu menu) + { + this.id = menu.getMenuId(); + this.label = menu.getMenuName(); + this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + public Long getId() + { + return id; + } + + public void setId(Long id) + { + this.id = id; + } + + public String getLabel() + { + return label; + } + + public void setLabel(String label) + { + this.label = label; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDept.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDept.java new file mode 100644 index 0000000..64c409c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDept.java @@ -0,0 +1,203 @@ +package com.limap.common.core.domain.entity; + +import java.util.ArrayList; +import java.util.List; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.core.domain.BaseEntity; + +/** + * 部门表 sys_dept + * + * @author limap + */ +public class SysDept extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 部门ID */ + private Long deptId; + + /** 父部门ID */ + private Long parentId; + + /** 祖级列表 */ + private String ancestors; + + /** 部门名称 */ + private String deptName; + + /** 显示顺序 */ + private Integer orderNum; + + /** 负责人 */ + private String leader; + + /** 联系电话 */ + private String phone; + + /** 邮箱 */ + private String email; + + /** 部门状态:0正常,1停用 */ + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 父部门名称 */ + private String parentName; + + /** 子部门 */ + private List children = new ArrayList(); + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + @NotBlank(message = "部门名称不能为空") + @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + public String getLeader() + { + return leader; + } + + public void setLeader(String leader) + { + this.leader = leader; + } + + @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") + public String getPhone() + { + return phone; + } + + public void setPhone(String phone) + { + this.phone = phone; + } + + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("deptId", getDeptId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("deptName", getDeptName()) + .append("orderNum", getOrderNum()) + .append("leader", getLeader()) + .append("phone", getPhone()) + .append("email", getEmail()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictData.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictData.java new file mode 100644 index 0000000..7e973fa --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictData.java @@ -0,0 +1,176 @@ +package com.limap.common.core.domain.entity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.BaseEntity; + +/** + * 字典数据表 sys_dict_data + * + * @author limap + */ +public class SysDictData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典编码 */ + @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + private Long dictCode; + + /** 字典排序 */ + @Excel(name = "字典排序", cellType = ColumnType.NUMERIC) + private Long dictSort; + + /** 字典标签 */ + @Excel(name = "字典标签") + private String dictLabel; + + /** 字典键值 */ + @Excel(name = "字典键值") + private String dictValue; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + + /** 样式属性（其他样式扩展） */ + private String cssClass; + + /** 表格字典样式 */ + private String listClass; + + /** 是否默认（Y是 N否） */ + @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") + private String isDefault; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictCode() + { + return dictCode; + } + + public void setDictCode(Long dictCode) + { + this.dictCode = dictCode; + } + + public Long getDictSort() + { + return dictSort; + } + + public void setDictSort(Long dictSort) + { + this.dictSort = dictSort; + } + + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") + public String getDictLabel() + { + return dictLabel; + } + + public void setDictLabel(String dictLabel) + { + this.dictLabel = dictLabel; + } + + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") + public String getDictValue() + { + return dictValue; + } + + public void setDictValue(String dictValue) + { + this.dictValue = dictValue; + } + + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") + public String getCssClass() + { + return cssClass; + } + + public void setCssClass(String cssClass) + { + this.cssClass = cssClass; + } + + public String getListClass() + { + return listClass; + } + + public void setListClass(String listClass) + { + this.listClass = listClass; + } + + public boolean getDefault() + { + return UserConstants.YES.equals(this.isDefault); + } + + public String getIsDefault() + { + return isDefault; + } + + public void setIsDefault(String isDefault) + { + this.isDefault = isDefault; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictCode", getDictCode()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictType.java new file mode 100644 index 0000000..8f2e5e0 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysDictType.java @@ -0,0 +1,96 @@ +package com.limap.common.core.domain.entity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 字典类型表 sys_dict_type + * + * @author limap + */ +public class SysDictType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 字典主键 */ + @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) + private Long dictId; + + /** 字典名称 */ + @Excel(name = "字典名称") + private String dictName; + + /** 字典类型 */ + @Excel(name = "字典类型") + private String dictType; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + public Long getDictId() + { + return dictId; + } + + public void setDictId(Long dictId) + { + this.dictId = dictId; + } + + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") + public String getDictName() + { + return dictName; + } + + public void setDictName(String dictName) + { + this.dictName = dictName; + } + + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") + @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") + public String getDictType() + { + return dictType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("dictId", getDictId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysLogininfor.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysLogininfor.java new file mode 100644 index 0000000..ff01011 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysLogininfor.java @@ -0,0 +1,144 @@ +package com.limap.common.core.domain.entity; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 系统访问记录表 sys_logininfor + * + * @author limap + */ +public class SysLogininfor extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "序号", cellType = ColumnType.NUMERIC) + private Long infoId; + + /** 用户账号 */ + @Excel(name = "用户账号") + private String userName; + + /** 登录状态 0成功 1失败 */ + @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败") + private String status; + + /** 登录IP地址 */ + @Excel(name = "登录地址") + private String ipaddr; + + /** 登录地点 */ + @Excel(name = "登录地点") + private String loginLocation; + + /** 浏览器类型 */ + @Excel(name = "浏览器") + private String browser; + + /** 操作系统 */ + @Excel(name = "操作系统") + private String os; + + /** 提示消息 */ + @Excel(name = "提示消息") + private String msg; + + /** 访问时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date loginTime; + + public Long getInfoId() + { + return infoId; + } + + public void setInfoId(Long infoId) + { + this.infoId = infoId; + } + + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } + + public Date getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Date loginTime) + { + this.loginTime = loginTime; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysMenu.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysMenu.java new file mode 100644 index 0000000..a0f8820 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysMenu.java @@ -0,0 +1,259 @@ +package com.limap.common.core.domain.entity; + +import java.util.ArrayList; +import java.util.List; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.core.domain.BaseEntity; + +/** + * 菜单权限表 sys_menu + * + * @author limap + */ +public class SysMenu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单ID */ + private Long menuId; + + /** 菜单名称 */ + private String menuName; + + /** 父菜单名称 */ + private String parentName; + + /** 父菜单ID */ + private Long parentId; + + /** 显示顺序 */ + private Integer orderNum; + + /** 路由地址 */ + private String path; + + /** 组件路径 */ + private String component; + + /** 路由参数 */ + private String query; + + /** 是否为外链（0是 1否） */ + private String isFrame; + + /** 是否缓存（0缓存 1不缓存） */ + private String isCache; + + /** 类型（M目录 C菜单 F按钮） */ + private String menuType; + + /** 显示状态（0显示 1隐藏） */ + private String visible; + + /** 菜单状态（0正常 1停用） */ + private String status; + + /** 权限字符串 */ + private String perms; + + /** 菜单图标 */ + private String icon; + + /** 子菜单 */ + private List children = new ArrayList(); + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @NotBlank(message = "菜单名称不能为空") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") + public String getMenuName() + { + return menuName; + } + + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getParentName() + { + return parentName; + } + + public void setParentName(String parentName) + { + this.parentName = parentName; + } + + public Long getParentId() + { + return parentId; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() + { + return orderNum; + } + + public void setOrderNum(Integer orderNum) + { + this.orderNum = orderNum; + } + + @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") + public String getPath() + { + return path; + } + + public void setPath(String path) + { + this.path = path; + } + + @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") + public String getComponent() + { + return component; + } + + public void setComponent(String component) + { + this.component = component; + } + + public String getQuery() + { + return query; + } + + public void setQuery(String query) + { + this.query = query; + } + + public String getIsFrame() + { + return isFrame; + } + + public void setIsFrame(String isFrame) + { + this.isFrame = isFrame; + } + + public String getIsCache() + { + return isCache; + } + + public void setIsCache(String isCache) + { + this.isCache = isCache; + } + + @NotBlank(message = "菜单类型不能为空") + public String getMenuType() + { + return menuType; + } + + public void setMenuType(String menuType) + { + this.menuType = menuType; + } + + public String getVisible() + { + return visible; + } + + public void setVisible(String visible) + { + this.visible = visible; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") + public String getPerms() + { + return perms; + } + + public void setPerms(String perms) + { + this.perms = perms; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("path", getPath()) + .append("component", getComponent()) + .append("isFrame", getIsFrame()) + .append("IsCache", getIsCache()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("status ", getStatus()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysOperLog.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysOperLog.java new file mode 100644 index 0000000..6e198fd --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysOperLog.java @@ -0,0 +1,269 @@ +package com.limap.common.core.domain.entity; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 操作日志记录表 oper_log + * + * @author limap + */ +public class SysOperLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 日志主键 */ + @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) + private Long operId; + + /** 操作模块 */ + @Excel(name = "操作模块") + private String title; + + /** 业务类型（0其它 1新增 2修改 3删除） */ + @Excel(name = "业务类型", readConverterExp = "0=其它,1=新增,2=修改,3=删除,4=授权,5=导出,6=导入,7=强退,8=生成代码,9=清空数据") + private Integer businessType; + + /** 业务类型数组 */ + private Integer[] businessTypes; + + /** 请求方法 */ + @Excel(name = "请求方法") + private String method; + + /** 请求方式 */ + @Excel(name = "请求方式") + private String requestMethod; + + /** 操作类别（0其它 1后台用户 2手机端用户） */ + @Excel(name = "操作类别", readConverterExp = "0=其它,1=后台用户,2=手机端用户") + private Integer operatorType; + + /** 操作人员 */ + @Excel(name = "操作人员") + private String operName; + + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + + /** 请求url */ + @Excel(name = "请求地址") + private String operUrl; + + /** 操作地址 */ + @Excel(name = "操作地址") + private String operIp; + + /** 操作地点 */ + @Excel(name = "操作地点") + private String operLocation; + + /** 请求参数 */ + @Excel(name = "请求参数") + private String operParam; + + /** 返回参数 */ + @Excel(name = "返回参数") + private String jsonResult; + + /** 操作状态（0正常 1异常） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=异常") + private Integer status; + + /** 错误消息 */ + @Excel(name = "错误消息") + private String errorMsg; + + /** 操作时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date operTime; + + /** 消耗时间 */ + @Excel(name = "消耗时间", suffix = "毫秒") + private Long costTime; + + public Long getOperId() + { + return operId; + } + + public void setOperId(Long operId) + { + this.operId = operId; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public Integer getBusinessType() + { + return businessType; + } + + public void setBusinessType(Integer businessType) + { + this.businessType = businessType; + } + + public Integer[] getBusinessTypes() + { + return businessTypes; + } + + public void setBusinessTypes(Integer[] businessTypes) + { + this.businessTypes = businessTypes; + } + + public String getMethod() + { + return method; + } + + public void setMethod(String method) + { + this.method = method; + } + + public String getRequestMethod() + { + return requestMethod; + } + + public void setRequestMethod(String requestMethod) + { + this.requestMethod = requestMethod; + } + + public Integer getOperatorType() + { + return operatorType; + } + + public void setOperatorType(Integer operatorType) + { + this.operatorType = operatorType; + } + + public String getOperName() + { + return operName; + } + + public void setOperName(String operName) + { + this.operName = operName; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getOperUrl() + { + return operUrl; + } + + public void setOperUrl(String operUrl) + { + this.operUrl = operUrl; + } + + public String getOperIp() + { + return operIp; + } + + public void setOperIp(String operIp) + { + this.operIp = operIp; + } + + public String getOperLocation() + { + return operLocation; + } + + public void setOperLocation(String operLocation) + { + this.operLocation = operLocation; + } + + public String getOperParam() + { + return operParam; + } + + public void setOperParam(String operParam) + { + this.operParam = operParam; + } + + public String getJsonResult() + { + return jsonResult; + } + + public void setJsonResult(String jsonResult) + { + this.jsonResult = jsonResult; + } + + public Integer getStatus() + { + return status; + } + + public void setStatus(Integer status) + { + this.status = status; + } + + public String getErrorMsg() + { + return errorMsg; + } + + public void setErrorMsg(String errorMsg) + { + this.errorMsg = errorMsg; + } + + public Date getOperTime() + { + return operTime; + } + + public void setOperTime(Date operTime) + { + this.operTime = operTime; + } + + public Long getCostTime() + { + return costTime; + } + + public void setCostTime(Long costTime) + { + this.costTime = costTime; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysRole.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysRole.java new file mode 100644 index 0000000..8b44683 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysRole.java @@ -0,0 +1,241 @@ +package com.limap.common.core.domain.entity; + +import java.util.Set; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 角色表 sys_role + * + * @author limap + */ +public class SysRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 角色ID */ + @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) + private Long roleId; + + /** 角色名称 */ + @Excel(name = "角色名称") + private String roleName; + + /** 角色权限 */ + @Excel(name = "角色权限") + private String roleKey; + + /** 角色排序 */ + @Excel(name = "角色排序") + private Integer roleSort; + + /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */ + @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") + private String dataScope; + + /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */ + private boolean menuCheckStrictly; + + /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */ + private boolean deptCheckStrictly; + + /** 角色状态（0正常 1停用） */ + @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 用户是否存在此角色标识 默认不存在 */ + private boolean flag = false; + + /** 菜单组 */ + private Long[] menuIds; + + /** 部门组（数据权限） */ + private Long[] deptIds; + + /** 角色菜单权限 */ + private Set permissions; + + public SysRole() + { + + } + + public SysRole(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public boolean isAdmin() + { + return isAdmin(this.roleId); + } + + public static boolean isAdmin(Long roleId) + { + return roleId != null && 1L == roleId; + } + + @NotBlank(message = "角色名称不能为空") + @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") + public String getRoleName() + { + return roleName; + } + + public void setRoleName(String roleName) + { + this.roleName = roleName; + } + + @NotBlank(message = "权限字符不能为空") + @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") + public String getRoleKey() + { + return roleKey; + } + + public void setRoleKey(String roleKey) + { + this.roleKey = roleKey; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getRoleSort() + { + return roleSort; + } + + public void setRoleSort(Integer roleSort) + { + this.roleSort = roleSort; + } + + public String getDataScope() + { + return dataScope; + } + + public void setDataScope(String dataScope) + { + this.dataScope = dataScope; + } + + public boolean isMenuCheckStrictly() + { + return menuCheckStrictly; + } + + public void setMenuCheckStrictly(boolean menuCheckStrictly) + { + this.menuCheckStrictly = menuCheckStrictly; + } + + public boolean isDeptCheckStrictly() + { + return deptCheckStrictly; + } + + public void setDeptCheckStrictly(boolean deptCheckStrictly) + { + this.deptCheckStrictly = deptCheckStrictly; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + public Long[] getMenuIds() + { + return menuIds; + } + + public void setMenuIds(Long[] menuIds) + { + this.menuIds = menuIds; + } + + public Long[] getDeptIds() + { + return deptIds; + } + + public void setDeptIds(Long[] deptIds) + { + this.deptIds = deptIds; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("roleName", getRoleName()) + .append("roleKey", getRoleKey()) + .append("roleSort", getRoleSort()) + .append("dataScope", getDataScope()) + .append("menuCheckStrictly", isMenuCheckStrictly()) + .append("deptCheckStrictly", isDeptCheckStrictly()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysUser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysUser.java new file mode 100644 index 0000000..2528f94 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/entity/SysUser.java @@ -0,0 +1,389 @@ +package com.limap.common.core.domain.entity; + +import java.util.Date; +import java.util.List; +import javax.validation.constraints.*; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.annotation.Excel.Type; +import com.limap.common.annotation.Excels; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.xss.Xss; + +/** + * 用户对象 sys_user + * + * @author limap + */ +public class SysUser extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号") + private Long userId; + + /** 部门ID */ + @Excel(name = "部门编号", type = Type.IMPORT) + private Long deptId; + private Long parentId; + + /** 用户账号 */ + @Excel(name = "登录名称") + private String userName; + + private String userType; + private String title; + private Boolean hasScreen; + + /** 用户昵称 */ + @Excel(name = "用户名称") + private String nickName; + + /** 用户邮箱 */ + @Excel(name = "用户邮箱") + private String email; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String phonenumber; + + /** 用户性别 */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; + + /** 用户头像 */ + private String avatar; + + /** 密码 */ + private String password; + + /** 帐号状态（0正常 1停用） */ + @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 最后登录IP */ + @Excel(name = "最后登录IP", type = Type.EXPORT) + private String loginIp; + + /** 最后登录时间 */ + @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) + private Date loginDate; + + private Date registerTime; + private String openId; + private String userArea; + + /** 部门对象 */ + @Excels({ + @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT), + @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT) + }) + private SysDept dept; + + /** 角色对象 */ + private List roles; + + /** 角色组 */ + private Long[] roleIds; + + /** 岗位组 */ + private Long[] postIds; + + /** 角色ID */ + private Long roleId; + + public SysUser() + { + + } + + public SysUser(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public boolean isAdmin() + { + return isAdmin(this.userId); + } + + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + @Xss(message = "用户昵称不能包含脚本字符") + @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") + public String getNickName() + { + return nickName; + } + + public void setNickName(String nickName) + { + this.nickName = nickName; + } + + @Xss(message = "用户账号不能包含脚本字符") + @NotBlank(message = "用户账号不能为空") + @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + @Email(message = "邮箱格式不正确") + @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符") + public String getPhonenumber() + { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public String getSex() + { + return sex; + } + + public void setSex(String sex) + { + this.sex = sex; + } + + public String getAvatar() + { + return avatar; + } + + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getDelFlag() + { + return delFlag; + } + + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getLoginIp() + { + return loginIp; + } + + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public Date getLoginDate() + { + return loginDate; + } + + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public SysDept getDept() + { + return dept; + } + + public void setDept(SysDept dept) + { + this.dept = dept; + } + + public List getRoles() + { + return roles; + } + + public void setRoles(List roles) + { + this.roles = roles; + } + + public Long[] getRoleIds() + { + return roleIds; + } + + public void setRoleIds(Long[] roleIds) + { + this.roleIds = roleIds; + } + + public Long[] getPostIds() + { + return postIds; + } + + public void setPostIds(Long[] postIds) + { + this.postIds = postIds; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Date getRegisterTime() { + return registerTime; + } + + public void setRegisterTime(Date registerTime) { + this.registerTime = registerTime; + } + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getUserArea() { + return userArea; + } + + public void setUserArea(String userArea) { + this.userArea = userArea; + } + + public String getUserType() { + return userType; + } + + public void setUserType(String userType) { + this.userType = userType; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Boolean getHasScreen() { + return hasScreen; + } + + public void setHasScreen(Boolean hasScreen) { + this.hasScreen = hasScreen; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("deptId", getDeptId()) + .append("userName", getUserName()) + .append("nickName", getNickName()) + .append("email", getEmail()) + .append("phonenumber", getPhonenumber()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("password", getPassword()) + .append("status", getStatus()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .append("dept", getDept()) + .toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginBody.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginBody.java new file mode 100644 index 0000000..1d25b28 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginBody.java @@ -0,0 +1,79 @@ +package com.limap.common.core.domain.model; + +/** + * 用户登录对象 + * + * @author limap + */ +public class LoginBody +{ + /** + * 用户名 + */ + private String username; + + private String tel; + + /** + * 用户密码 + */ + private String password; + + /** + * 验证码 + */ + private String code; + + /** + * 唯一标识 + */ + private String uuid; + + public String getUsername() + { + return username; + } + + public void setUsername(String username) + { + this.username = username; + } + + public String getPassword() + { + return password; + } + + public void setPassword(String password) + { + this.password = password; + } + + public String getCode() + { + return code; + } + + public void setCode(String code) + { + this.code = code; + } + + public String getUuid() + { + return uuid; + } + + public void setUuid(String uuid) + { + this.uuid = uuid; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginUser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginUser.java new file mode 100644 index 0000000..5528e8c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/LoginUser.java @@ -0,0 +1,266 @@ +package com.limap.common.core.domain.model; + +import java.util.Collection; +import java.util.Set; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import com.alibaba.fastjson2.annotation.JSONField; +import com.limap.common.core.domain.entity.SysUser; + +/** + * 登录用户身份权限 + * + * @author limap + */ +public class LoginUser implements UserDetails +{ + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户唯一标识 + */ + private String token; + + /** + * 登录时间 + */ + private Long loginTime; + + /** + * 过期时间 + */ + private Long expireTime; + + /** + * 登录IP地址 + */ + private String ipaddr; + + /** + * 登录地点 + */ + private String loginLocation; + + /** + * 浏览器类型 + */ + private String browser; + + /** + * 操作系统 + */ + private String os; + + /** + * 权限列表 + */ + private Set permissions; + + /** + * 用户信息 + */ + private SysUser user; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public String getToken() + { + return token; + } + + public void setToken(String token) + { + this.token = token; + } + + public LoginUser() + { + } + + public LoginUser(SysUser user, Set permissions) + { + this.user = user; + this.permissions = permissions; + } + + public LoginUser(Long userId, Long deptId, SysUser user, Set permissions) + { + this.userId = userId; + this.deptId = deptId; + this.user = user; + this.permissions = permissions; + } + + @JSONField(serialize = false) + @Override + public String getPassword() + { + return user.getPassword(); + } + + @Override + public String getUsername() + { + return user.getUserName(); + } + + /** + * 账户是否未过期,过期无法验证 + */ + @JSONField(serialize = false) + @Override + public boolean isAccountNonExpired() + { + return true; + } + + /** + * 指定用户是否解锁,锁定的用户无法进行身份验证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isAccountNonLocked() + { + return true; + } + + /** + * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isCredentialsNonExpired() + { + return true; + } + + /** + * 是否可用 ,禁用的用户不能身份验证 + * + * @return + */ + @JSONField(serialize = false) + @Override + public boolean isEnabled() + { + return true; + } + + public Long getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Long loginTime) + { + this.loginTime = loginTime; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public Long getExpireTime() + { + return expireTime; + } + + public void setExpireTime(Long expireTime) + { + this.expireTime = expireTime; + } + + public Set getPermissions() + { + return permissions; + } + + public void setPermissions(Set permissions) + { + this.permissions = permissions; + } + + public SysUser getUser() + { + return user; + } + + public void setUser(SysUser user) + { + this.user = user; + } + + @Override + public Collection getAuthorities() + { + return null; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/RegisterBody.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/RegisterBody.java new file mode 100644 index 0000000..0438742 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/domain/model/RegisterBody.java @@ -0,0 +1,11 @@ +package com.limap.common.core.domain.model; + +/** + * 用户注册对象 + * + * @author limap + */ +public class RegisterBody extends LoginBody +{ + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/PageDomain.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/PageDomain.java new file mode 100644 index 0000000..6839d25 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/PageDomain.java @@ -0,0 +1,101 @@ +package com.limap.common.core.page; + +import com.limap.common.utils.StringUtils; + +/** + * 分页数据 + * + * @author limap + */ +public class PageDomain +{ + /** 当前记录起始索引 */ + private Integer pageNum; + + /** 每页显示记录数 */ + private Integer pageSize; + + /** 排序列 */ + private String orderByColumn; + + /** 排序的方向desc或者asc */ + private String isAsc = "asc"; + + /** 分页参数合理化 */ + private Boolean reasonable = true; + + public String getOrderBy() + { + if (StringUtils.isEmpty(orderByColumn)) + { + return ""; + } + return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; + } + + public Integer getPageNum() + { + return pageNum; + } + + public void setPageNum(Integer pageNum) + { + this.pageNum = pageNum; + } + + public Integer getPageSize() + { + return pageSize; + } + + public void setPageSize(Integer pageSize) + { + this.pageSize = pageSize; + } + + public String getOrderByColumn() + { + return orderByColumn; + } + + public void setOrderByColumn(String orderByColumn) + { + this.orderByColumn = orderByColumn; + } + + public String getIsAsc() + { + return isAsc; + } + + public void setIsAsc(String isAsc) + { + if (StringUtils.isNotEmpty(isAsc)) + { + // 兼容前端排序类型 + if ("ascending".equals(isAsc)) + { + isAsc = "asc"; + } + else if ("descending".equals(isAsc)) + { + isAsc = "desc"; + } + this.isAsc = isAsc; + } + } + + public Boolean getReasonable() + { + if (StringUtils.isNull(reasonable)) + { + return Boolean.TRUE; + } + return reasonable; + } + + public void setReasonable(Boolean reasonable) + { + this.reasonable = reasonable; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableDataInfo.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableDataInfo.java new file mode 100644 index 0000000..c81b9f5 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableDataInfo.java @@ -0,0 +1,85 @@ +package com.limap.common.core.page; + +import java.io.Serializable; +import java.util.List; + +/** + * 表格分页数据对象 + * + * @author limap + */ +public class TableDataInfo implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 总记录数 */ + private long total; + + /** 列表数据 */ + private List rows; + + /** 消息状态码 */ + private int code; + + /** 消息内容 */ + private String msg; + + /** + * 表格数据对象 + */ + public TableDataInfo() + { + } + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public TableDataInfo(List list, int total) + { + this.rows = list; + this.total = total; + } + + public long getTotal() + { + return total; + } + + public void setTotal(long total) + { + this.total = total; + } + + public List getRows() + { + return rows; + } + + public void setRows(List rows) + { + this.rows = rows; + } + + public int getCode() + { + return code; + } + + public void setCode(int code) + { + this.code = code; + } + + public String getMsg() + { + return msg; + } + + public void setMsg(String msg) + { + this.msg = msg; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableSupport.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableSupport.java new file mode 100644 index 0000000..051d18c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/page/TableSupport.java @@ -0,0 +1,56 @@ +package com.limap.common.core.page; + +import com.limap.common.core.text.Convert; +import com.limap.common.utils.ServletUtils; + +/** + * 表格数据处理 + * + * @author limap + */ +public class TableSupport +{ + /** + * 当前记录起始索引 + */ + public static final String PAGE_NUM = "pageNum"; + + /** + * 每页显示记录数 + */ + public static final String PAGE_SIZE = "pageSize"; + + /** + * 排序列 + */ + public static final String ORDER_BY_COLUMN = "orderByColumn"; + + /** + * 排序的方向 "desc" 或者 "asc". + */ + public static final String IS_ASC = "isAsc"; + + /** + * 分页参数合理化 + */ + public static final String REASONABLE = "reasonable"; + + /** + * 封装分页对象 + */ + public static PageDomain getPageDomain() + { + PageDomain pageDomain = new PageDomain(); + pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); + pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); + pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); + pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); + pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); + return pageDomain; + } + + public static PageDomain buildPageRequest() + { + return getPageDomain(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/redis/RedisCache.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/redis/RedisCache.java new file mode 100644 index 0000000..e6686cd --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/redis/RedisCache.java @@ -0,0 +1,268 @@ +package com.limap.common.core.redis; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.BoundSetOperations; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; + +/** + * spring redis 工具类 + * + * @author limap + **/ +@SuppressWarnings(value = { "unchecked", "rawtypes" }) +@Component +public class RedisCache +{ + @Autowired + public RedisTemplate redisTemplate; + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + */ + public void setCacheObject(final String key, final T value) + { + redisTemplate.opsForValue().set(key, value); + } + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + * @param timeout 时间 + * @param timeUnit 时间颗粒度 + */ + public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) + { + redisTemplate.opsForValue().set(key, value, timeout, timeUnit); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @return true=设置成功；false=设置失败 + */ + public boolean expire(final String key, final long timeout) + { + return expire(key, timeout, TimeUnit.SECONDS); + } + + /** + * 设置有效时间 + * + * @param key Redis键 + * @param timeout 超时时间 + * @param unit 时间单位 + * @return true=设置成功；false=设置失败 + */ + public boolean expire(final String key, final long timeout, final TimeUnit unit) + { + return redisTemplate.expire(key, timeout, unit); + } + + /** + * 获取有效时间 + * + * @param key Redis键 + * @return 有效时间 + */ + public long getExpire(final String key) + { + return redisTemplate.getExpire(key); + } + + /** + * 判断 key是否存在 + * + * @param key 键 + * @return true 存在 false不存在 + */ + public Boolean hasKey(String key) + { + return redisTemplate.hasKey(key); + } + + /** + * 获得缓存的基本对象。 + * + * @param key 缓存键值 + * @return 缓存键值对应的数据 + */ + public T getCacheObject(final String key) + { + ValueOperations operation = redisTemplate.opsForValue(); + return operation.get(key); + } + + /** + * 删除单个对象 + * + * @param key + */ + public boolean deleteObject(final String key) + { + return redisTemplate.delete(key); + } + + /** + * 删除集合对象 + * + * @param collection 多个对象 + * @return + */ + public boolean deleteObject(final Collection collection) + { + return redisTemplate.delete(collection) > 0; + } + + /** + * 缓存List数据 + * + * @param key 缓存的键值 + * @param dataList 待缓存的List数据 + * @return 缓存的对象 + */ + public long setCacheList(final String key, final List dataList) + { + Long count = redisTemplate.opsForList().rightPushAll(key, dataList); + return count == null ? 0 : count; + } + + /** + * 获得缓存的list对象 + * + * @param key 缓存的键值 + * @return 缓存键值对应的数据 + */ + public List getCacheList(final String key) + { + return redisTemplate.opsForList().range(key, 0, -1); + } + + /** + * 缓存Set + * + * @param key 缓存键值 + * @param dataSet 缓存的数据 + * @return 缓存数据的对象 + */ + public BoundSetOperations setCacheSet(final String key, final Set dataSet) + { + BoundSetOperations setOperation = redisTemplate.boundSetOps(key); + Iterator it = dataSet.iterator(); + while (it.hasNext()) + { + setOperation.add(it.next()); + } + return setOperation; + } + + /** + * 获得缓存的set + * + * @param key + * @return + */ + public Set getCacheSet(final String key) + { + return redisTemplate.opsForSet().members(key); + } + + /** + * 缓存Map + * + * @param key + * @param dataMap + */ + public void setCacheMap(final String key, final Map dataMap) + { + if (dataMap != null) { + redisTemplate.opsForHash().putAll(key, dataMap); + } + } + + /** + * 获得缓存的Map + * + * @param key + * @return + */ + public Map getCacheMap(final String key) + { + return redisTemplate.opsForHash().entries(key); + } + + /** + * 往Hash中存入数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @param value 值 + */ + public void setCacheMapValue(final String key, final String hKey, final T value) + { + redisTemplate.opsForHash().put(key, hKey, value); + } + + /** + * 获取Hash中的数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @return Hash中的对象 + */ + public T getCacheMapValue(final String key, final String hKey) + { + HashOperations opsForHash = redisTemplate.opsForHash(); + return opsForHash.get(key, hKey); + } + + /** + * 获取多个Hash中的数据 + * + * @param key Redis键 + * @param hKeys Hash键集合 + * @return Hash对象集合 + */ + public List getMultiCacheMapValue(final String key, final Collection hKeys) + { + return redisTemplate.opsForHash().multiGet(key, hKeys); + } + + /** + * 删除Hash中的某条数据 + * + * @param key Redis键 + * @param hKey Hash键 + * @return 是否成功 + */ + public boolean deleteCacheMapValue(final String key, final String hKey) + { + return redisTemplate.opsForHash().delete(key, hKey) > 0; + } + + /** + * 获得缓存的基本对象列表 + * + * @param pattern 字符串前缀 + * @return 对象列表 + */ + public Collection keys(final String pattern) + { + return redisTemplate.keys(pattern); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/CharsetKit.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/CharsetKit.java new file mode 100644 index 0000000..34a8138 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/CharsetKit.java @@ -0,0 +1,86 @@ +package com.limap.common.core.text; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import com.limap.common.utils.StringUtils; + +/** + * 字符集工具类 + * + * @author limap + */ +public class CharsetKit +{ + /** ISO-8859-1 */ + public static final String ISO_8859_1 = "ISO-8859-1"; + /** UTF-8 */ + public static final String UTF_8 = "UTF-8"; + /** GBK */ + public static final String GBK = "GBK"; + + /** ISO-8859-1 */ + public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1); + /** UTF-8 */ + public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8); + /** GBK */ + public static final Charset CHARSET_GBK = Charset.forName(GBK); + + /** + * 转换为Charset对象 + * + * @param charset 字符集，为空则返回默认字符集 + * @return Charset + */ + public static Charset charset(String charset) + { + return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset); + } + + /** + * 转换字符串的字符集编码 + * + * @param source 字符串 + * @param srcCharset 源字符集，默认ISO-8859-1 + * @param destCharset 目标字符集，默认UTF-8 + * @return 转换后的字符集 + */ + public static String convert(String source, String srcCharset, String destCharset) + { + return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset)); + } + + /** + * 转换字符串的字符集编码 + * + * @param source 字符串 + * @param srcCharset 源字符集，默认ISO-8859-1 + * @param destCharset 目标字符集，默认UTF-8 + * @return 转换后的字符集 + */ + public static String convert(String source, Charset srcCharset, Charset destCharset) + { + if (null == srcCharset) + { + srcCharset = StandardCharsets.ISO_8859_1; + } + + if (null == destCharset) + { + destCharset = StandardCharsets.UTF_8; + } + + if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) + { + return source; + } + return new String(source.getBytes(srcCharset), destCharset); + } + + /** + * @return 系统字符集编码 + */ + public static String systemCharset() + { + return Charset.defaultCharset().name(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/Convert.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/Convert.java new file mode 100644 index 0000000..f0a30b6 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/Convert.java @@ -0,0 +1,1000 @@ +package com.limap.common.core.text; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.text.NumberFormat; +import java.util.Set; +import com.limap.common.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; + +/** + * 类型转换器 + * + * @author limap + */ +public class Convert +{ + /** + * 转换为字符串
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static String toStr(Object value, String defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof String) + { + return (String) value; + } + return value.toString(); + } + + /** + * 转换为字符串
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static String toStr(Object value) + { + return toStr(value, null); + } + + /** + * 转换为字符
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Character toChar(Object value, Character defaultValue) + { + if (null == value) + { + return defaultValue; + } + if (value instanceof Character) + { + return (Character) value; + } + + final String valueStr = toStr(value, null); + return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0); + } + + /** + * 转换为字符
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Character toChar(Object value) + { + return toChar(value, null); + } + + /** + * 转换为byte
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Byte toByte(Object value, Byte defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Byte) + { + return (Byte) value; + } + if (value instanceof Number) + { + return ((Number) value).byteValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Byte.parseByte(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为byte
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Byte toByte(Object value) + { + return toByte(value, null); + } + + /** + * 转换为Short
+ * 如果给定的值为null，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Short toShort(Object value, Short defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Short) + { + return (Short) value; + } + if (value instanceof Number) + { + return ((Number) value).shortValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Short.parseShort(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Short
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Short toShort(Object value) + { + return toShort(value, null); + } + + /** + * 转换为Number
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Number toNumber(Object value, Number defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Number) + { + return (Number) value; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return NumberFormat.getInstance().parse(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Number
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Number toNumber(Object value) + { + return toNumber(value, null); + } + + /** + * 转换为int
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Integer toInt(Object value, Integer defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Integer) + { + return (Integer) value; + } + if (value instanceof Number) + { + return ((Number) value).intValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Integer.parseInt(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为int
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Integer toInt(Object value) + { + return toInt(value, null); + } + + /** + * 转换为Integer数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String str) + { + return toIntArray(",", str); + } + + /** + * 转换为Long数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String str) + { + return toLongArray(",", str); + } + + /** + * 转换为Integer数组
+ * + * @param split 分隔符 + * @param split 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Integer[] {}; + } + String[] arr = str.split(split); + final Integer[] ints = new Integer[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Integer v = toInt(arr[i], 0); + ints[i] = v; + } + return ints; + } + + /** + * 转换为Long数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String split, String str) + { + if (StringUtils.isEmpty(str)) + { + return new Long[] {}; + } + String[] arr = str.split(split); + final Long[] longs = new Long[arr.length]; + for (int i = 0; i < arr.length; i++) + { + final Long v = toLong(arr[i], null); + longs[i] = v; + } + return longs; + } + + /** + * 转换为String数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String str) + { + return toStrArray(",", str); + } + + /** + * 转换为String数组
+ * + * @param split 分隔符 + * @param split 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String split, String str) + { + return str.split(split); + } + + /** + * 转换为long
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Long toLong(Object value, Long defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Long) + { + return (Long) value; + } + if (value instanceof Number) + { + return ((Number) value).longValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).longValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为long
+ * 如果给定的值为null，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Long toLong(Object value) + { + return toLong(value, null); + } + + /** + * 转换为double
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Double toDouble(Object value, Double defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Double) + { + return (Double) value; + } + if (value instanceof Number) + { + return ((Number) value).doubleValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + // 支持科学计数法 + return new BigDecimal(valueStr.trim()).doubleValue(); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为double
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Double toDouble(Object value) + { + return toDouble(value, null); + } + + /** + * 转换为Float
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Float toFloat(Object value, Float defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Float) + { + return (Float) value; + } + if (value instanceof Number) + { + return ((Number) value).floatValue(); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Float.parseFloat(valueStr.trim()); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Float
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Float toFloat(Object value) + { + return toFloat(value, null); + } + + /** + * 转换为boolean
+ * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static Boolean toBool(Object value, Boolean defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof Boolean) + { + return (Boolean) value; + } + String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + valueStr = valueStr.trim().toLowerCase(); + switch (valueStr) + { + case "true": + case "yes": + case "ok": + case "1": + return true; + case "false": + case "no": + case "0": + return false; + default: + return defaultValue; + } + } + + /** + * 转换为boolean
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static Boolean toBool(Object value) + { + return toBool(value, null); + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * + * @param clazz Enum的Class + * @param value 值 + * @param defaultValue 默认值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value, E defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (clazz.isAssignableFrom(value.getClass())) + { + @SuppressWarnings("unchecked") + E myE = (E) value; + return myE; + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return Enum.valueOf(clazz, valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为Enum对象
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * + * @param clazz Enum的Class + * @param value 值 + * @return Enum + */ + public static > E toEnum(Class clazz, Object value) + { + return toEnum(clazz, value, null); + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value, BigInteger defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigInteger) + { + return (BigInteger) value; + } + if (value instanceof Long) + { + return BigInteger.valueOf((Long) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigInteger(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigInteger
+ * 如果给定的值为空，或者转换失败，返回默认值null
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigInteger toBigInteger(Object value) + { + return toBigInteger(value, null); + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @param defaultValue 转换错误时的默认值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) + { + if (value == null) + { + return defaultValue; + } + if (value instanceof BigDecimal) + { + return (BigDecimal) value; + } + if (value instanceof Long) + { + return new BigDecimal((Long) value); + } + if (value instanceof Double) + { + return BigDecimal.valueOf((Double) value); + } + if (value instanceof Integer) + { + return new BigDecimal((Integer) value); + } + final String valueStr = toStr(value, null); + if (StringUtils.isEmpty(valueStr)) + { + return defaultValue; + } + try + { + return new BigDecimal(valueStr); + } + catch (Exception e) + { + return defaultValue; + } + } + + /** + * 转换为BigDecimal
+ * 如果给定的值为空，或者转换失败，返回默认值
+ * 转换失败不会报错 + * + * @param value 被转换的值 + * @return 结果 + */ + public static BigDecimal toBigDecimal(Object value) + { + return toBigDecimal(value, null); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @return 字符串 + */ + public static String utf8Str(Object obj) + { + return str(obj, CharsetKit.CHARSET_UTF_8); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charsetName 字符集 + * @return 字符串 + */ + public static String str(Object obj, String charsetName) + { + return str(obj, Charset.forName(charsetName)); + } + + /** + * 将对象转为字符串
+ * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法 + * + * @param obj 对象 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(Object obj, Charset charset) + { + if (null == obj) + { + return null; + } + + if (obj instanceof String) + { + return (String) obj; + } + else if (obj instanceof byte[]) + { + return str((byte[]) obj, charset); + } + else if (obj instanceof Byte[]) + { + byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj); + return str(bytes, charset); + } + else if (obj instanceof ByteBuffer) + { + return str((ByteBuffer) obj, charset); + } + return obj.toString(); + } + + /** + * 将byte数组转为字符串 + * + * @param bytes byte数组 + * @param charset 字符集 + * @return 字符串 + */ + public static String str(byte[] bytes, String charset) + { + return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset)); + } + + /** + * 解码字节码 + * + * @param data 字符串 + * @param charset 字符集，如果此字段为空，则解码的结果取决于平台 + * @return 解码后的字符串 + */ + public static String str(byte[] data, Charset charset) + { + if (data == null) + { + return null; + } + + if (null == charset) + { + return new String(data); + } + return new String(data, charset); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集，如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, String charset) + { + if (data == null) + { + return null; + } + + return str(data, Charset.forName(charset)); + } + + /** + * 将编码的byteBuffer数据转换为字符串 + * + * @param data 数据 + * @param charset 字符集，如果为空使用当前系统字符集 + * @return 字符串 + */ + public static String str(ByteBuffer data, Charset charset) + { + if (null == charset) + { + charset = Charset.defaultCharset(); + } + return charset.decode(data).toString(); + } + + // ----------------------------------------------------------------------- 全角半角转换 + /** + * 半角转全角 + * + * @param input String. + * @return 全角字符串. + */ + public static String toSBC(String input) + { + return toSBC(input, null); + } + + /** + * 半角转全角 + * + * @param input String + * @param notConvertSet 不替换的字符集合 + * @return 全角字符串. + */ + public static String toSBC(String input, Set notConvertSet) + { + char[] c = input.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == ' ') + { + c[i] = '\u3000'; + } + else if (c[i] < '\177') + { + c[i] = (char) (c[i] + 65248); + + } + } + return new String(c); + } + + /** + * 全角转半角 + * + * @param input String. + * @return 半角字符串 + */ + public static String toDBC(String input) + { + return toDBC(input, null); + } + + /** + * 替换全角为半角 + * + * @param text 文本 + * @param notConvertSet 不替换的字符集合 + * @return 替换后的字符 + */ + public static String toDBC(String text, Set notConvertSet) + { + char[] c = text.toCharArray(); + for (int i = 0; i < c.length; i++) + { + if (null != notConvertSet && notConvertSet.contains(c[i])) + { + // 跳过不替换的字符 + continue; + } + + if (c[i] == '\u3000') + { + c[i] = ' '; + } + else if (c[i] > '\uFF00' && c[i] < '\uFF5F') + { + c[i] = (char) (c[i] - 65248); + } + } + String returnString = new String(c); + + return returnString; + } + + /** + * 数字金额大写转换 先写个完整的然后将如零拾替换成零 + * + * @param n 数字 + * @return 中文大写数字 + */ + public static String digitUppercase(double n) + { + String[] fraction = { "角", "分" }; + String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" }; + String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } }; + + String head = n < 0 ? "负" : ""; + n = Math.abs(n); + + String s = ""; + for (int i = 0; i < fraction.length; i++) + { + s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); + } + if (s.length() < 1) + { + s = "整"; + } + int integerPart = (int) Math.floor(n); + + for (int i = 0; i < unit[0].length && integerPart > 0; i++) + { + String p = ""; + for (int j = 0; j < unit[1].length && n > 0; j++) + { + p = digit[integerPart % 10] + unit[1][j] + p; + integerPart = integerPart / 10; + } + s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; + } + return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/StrFormatter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/StrFormatter.java new file mode 100644 index 0000000..b8005bd --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/core/text/StrFormatter.java @@ -0,0 +1,92 @@ +package com.limap.common.core.text; + +import com.limap.common.utils.StringUtils; + +/** + * 字符串格式化 + * + * @author limap + */ +public class StrFormatter +{ + public static final String EMPTY_JSON = "{}"; + public static final char C_BACKSLASH = '\\'; + public static final char C_DELIM_START = '{'; + public static final char C_DELIM_END = '}'; + + /** + * 格式化字符串
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param strPattern 字符串模板 + * @param argArray 参数列表 + * @return 结果 + */ + public static String format(final String strPattern, final Object... argArray) + { + if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) + { + return strPattern; + } + final int strPatternLength = strPattern.length(); + + // 初始化定义好的长度以获得更好的性能 + StringBuilder sbuf = new StringBuilder(strPatternLength + 50); + + int handledPosition = 0; + int delimIndex;// 占位符所在位置 + for (int argIndex = 0; argIndex < argArray.length; argIndex++) + { + delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition); + if (delimIndex == -1) + { + if (handledPosition == 0) + { + return strPattern; + } + else + { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果 + sbuf.append(strPattern, handledPosition, strPatternLength); + return sbuf.toString(); + } + } + else + { + if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) + { + if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) + { + // 转义符之前还有一个转义符，占位符依旧有效 + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(Convert.utf8Str(argArray[argIndex])); + handledPosition = delimIndex + 2; + } + else + { + // 占位符被转义 + argIndex--; + sbuf.append(strPattern, handledPosition, delimIndex - 1); + sbuf.append(C_DELIM_START); + handledPosition = delimIndex + 1; + } + } + else + { + // 正常占位符 + sbuf.append(strPattern, handledPosition, delimIndex); + sbuf.append(Convert.utf8Str(argArray[argIndex])); + handledPosition = delimIndex + 2; + } + } + } + // 加入最后一个占位符后所有的字符 + sbuf.append(strPattern, handledPosition, strPattern.length()); + + return sbuf.toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessStatus.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessStatus.java new file mode 100644 index 0000000..0ca3df8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessStatus.java @@ -0,0 +1,20 @@ +package com.limap.common.enums; + +/** + * 操作状态 + * + * @author limap + * + */ +public enum BusinessStatus +{ + /** + * 成功 + */ + SUCCESS, + + /** + * 失败 + */ + FAIL, +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessType.java new file mode 100644 index 0000000..0b280a3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/BusinessType.java @@ -0,0 +1,59 @@ +package com.limap.common.enums; + +/** + * 业务操作类型 + * + * @author limap + */ +public enum BusinessType +{ + /** + * 其它 + */ + OTHER, + + /** + * 新增 + */ + INSERT, + + /** + * 修改 + */ + UPDATE, + + /** + * 删除 + */ + DELETE, + + /** + * 授权 + */ + GRANT, + + /** + * 导出 + */ + EXPORT, + + /** + * 导入 + */ + IMPORT, + + /** + * 强退 + */ + FORCE, + + /** + * 生成代码 + */ + GENCODE, + + /** + * 清空数据 + */ + CLEAN, +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/CaptchaEnum.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/CaptchaEnum.java new file mode 100644 index 0000000..0ac3dca --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/CaptchaEnum.java @@ -0,0 +1,27 @@ +package com.limap.common.enums; + +/** + * 验证码配置枚举 + * + * @author: theodo + */ +public enum CaptchaEnum { + /** + * 算数 + */ + arithmetic, + /** + * 中文 + */ + chinese, + /** + * 中文闪图 + */ + chinese_gif, + /** + * 闪图 + */ + gif, + + spec +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/HttpMethod.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/HttpMethod.java new file mode 100644 index 0000000..00d40c7 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/HttpMethod.java @@ -0,0 +1,36 @@ +package com.limap.common.enums; + +import java.util.HashMap; +import java.util.Map; +import org.springframework.lang.Nullable; + +/** + * 请求方式 + * + * @author limap + */ +public enum HttpMethod +{ + GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; + + private static final Map mappings = new HashMap<>(16); + + static + { + for (HttpMethod httpMethod : values()) + { + mappings.put(httpMethod.name(), httpMethod); + } + } + + @Nullable + public static HttpMethod resolve(@Nullable String method) + { + return (method != null ? mappings.get(method) : null); + } + + public boolean matches(String method) + { + return (this == resolve(method)); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/LimitType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/LimitType.java new file mode 100644 index 0000000..a9f8873 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/LimitType.java @@ -0,0 +1,20 @@ +package com.limap.common.enums; + +/** + * 限流类型 + * + * @author limap + */ + +public enum LimitType +{ + /** + * 默认策略全局限流 + */ + DEFAULT, + + /** + * 根据请求者IP进行限流 + */ + IP +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/OperatorType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/OperatorType.java new file mode 100644 index 0000000..2724e3b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/OperatorType.java @@ -0,0 +1,24 @@ +package com.limap.common.enums; + +/** + * 操作人类别 + * + * @author limap + */ +public enum OperatorType +{ + /** + * 其它 + */ + OTHER, + + /** + * 后台用户 + */ + MANAGE, + + /** + * 手机端用户 + */ + MOBILE +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/UserStatus.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/UserStatus.java new file mode 100644 index 0000000..9275244 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/UserStatus.java @@ -0,0 +1,30 @@ +package com.limap.common.enums; + +/** + * 用户状态 + * + * @author limap + */ +public enum UserStatus +{ + OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); + + private final String code; + private final String info; + + UserStatus(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/CellStatusType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/CellStatusType.java new file mode 100644 index 0000000..1f842cb --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/CellStatusType.java @@ -0,0 +1,46 @@ +package com.limap.common.enums.iot; + +/** + * @author Lenovo + */ +public enum CellStatusType { + CurrentTemperature("1","温度报警通知","TTS_247435100","currentTemperature"), + current("4","控制器电流异常报警","TTS_268760005",""), + OCP("5","控制器开关过流停机保护通知","TTS_268740005",""), + abnormal("6","控制器开关异常通知","TTS_247430125",""), + DissolvedOxygen("0","溶解氧报警通知","TTS_247445088","dissolvedOxygen"), + ProbeOffline("7","探头离线","TTS_282185026","errorCode"), + ProbeOffline_C("7","探头离线","TTS_282185026","sensorErrorCode"), + ControlError("8","控制器控制异常","TTS_282250048","errorCode"), + Offline("3","设备下线通知","TTS_239317213","offline"); + + private String code; + private String value; + + private String flag; + + private String ttsCode; + + CellStatusType(String code, String value, String ttsCode,String flag){ + this.code = code; + this.value = value; + this.ttsCode = ttsCode; + this.flag = flag; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + + public String getTtsCode() { + return ttsCode; + } + + public String getFlag() { + return flag; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerErrorCode.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerErrorCode.java new file mode 100644 index 0000000..b057257 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerErrorCode.java @@ -0,0 +1,157 @@ +package com.limap.common.enums.iot; + +/** + * @author Lenovo + */ +public enum ControllerErrorCode { + + /** + * 异常码对应的信息 + */ + A_phase_miss("1001","1201","输入缺A相",null,null,null, null), + B_phase_miss("1002","1202","输入缺B相",null,null ,null, null), + C_phase_miss("1003","1203","输入缺C相",null,null ,null, null), + queXiang_port1_A("1010","1210","输出缺A相","relayOneName",null ,null, null), + queXiang_port1_B("1011","1211","输出缺B相","relayOneName",null ,null, null), + queXiang_port1_C("1012","1212","输出缺C相","relayOneName",null ,null, null), + kongzai_port1_all("1046","1246","输出空载","relayOneName",true ,"Switch1", "电流"), + queXiang_port2_A("1013","1213","输出缺A相","relayTwoName",null ,null, null), + queXiang_port2_B("1014","1214","输出缺B相","relayTwoName",null ,null, null), + queXiang_port2_C("1015","1215","输出缺C相","relayTwoName",null ,null, null), + kongzai_port2_all("1047","1247","输出空载","relayTwoName",true ,"Switch2", "电流"), + kongzai_port3_all("1048","1248","输出空载","relayThreeName",true ,"Switch3", "电流"), + kongzai_port4_all("1049","1249","输出空载","relayFourName",true ,"Switch4", "电流"), + queXiang_port3_A("1016","1216","输出缺A相","relayThreeName",null ,"Switch3", null), + queXiang_port3_B("1017","1217","输出缺B相","relayThreeName",null ,"Switch3", null), + queXiang_port3_C("1018","1218","输出缺C相","relayThreeName",null ,"Switch3", null), + queXiang_port4_A("1019","1219","输出缺A相","relayFourName",null ,"Switch4", null), + queXiang_port4_B("1020","1220","输出缺B相","relayFourName",null ,"Switch4", null), + queXiang_port4_C("1021","1221","输出缺C相","relayFourName",null ,"Switch4", null), + + A_over_voltage("1004","1204","A相过压",null,false ,null, "电压"), + A_under_voltage("1005","1205","A相欠压",null,false ,null, "电压"), + B_over_voltage("1006","1206","B相过压",null,false ,null, "电压"), + B_under_voltage("1007","1207","B相欠压",null,false ,null, "电压"), + C_over_voltage("1008","1208","C相过压",null,false ,null, "电压"), + C_under_voltage("1009","1209","C相欠压",null,false ,null, "电压"), + guoYa_port1("2001","2201","输入过压","relayOneName",false ,"Switch1", "电压"), + guoYa_port2("2002","2202","输入过压","relayTwoName",false ,"Switch2", "电压"), + guoYa_port3("2003","2203","输入过压","relayThreeName",false ,"Switch3", "电压"), + guoYa_port4("2004","2204","输入过压","relayFourName",false ,"Switch4", "电压"), + qianYa_port1("2005","2205","输入欠压","relayOneName",false ,"Switch1", "电压"), + qianYa_port2("2006","2206","输入欠压","relayTwoName",false ,"Switch2", "电压"), + qianYa_port3("2007","2207","输入欠压","relayThreeName",false ,"Switch3", "电压"), + qianYa_port4("2008","2208","输入欠压","relayFourName",false ,"Switch4", "电压"), + + guoLiu_port1_A("1022","1222","输出A过流","relayOneName",true ,"Switch1", "电流"), + guoLiu_port1_B("1023","1223","输出B过流","relayOneName",true,"Switch1", "电流"), + guoLiu_port1_C("1024","1224","输出C过流","relayOneName",true,"Switch1", "电流"), + guoLiu_port2_A("1025","1225","输出A过流","relayTwoName",true,"Switch2", "电流"), + guoLiu_port2_B("1026","1226","输出B过流","relayTwoName",true,"Switch2", "电流"), + guoLiu_port2_C("1027","1227","输出C过流","relayTwoName",true,"Switch2", "电流"), + guoLiu_port3_A("1028","1228","输出A过流","relayThreeName",true,"Switch3", "电流"), + guoLiu_port3_B("1029","1229","输出B过流","relayThreeName",true,"Switch3", "电流"), + guoLiu_port3_C("1030","1230","输出C过流","relayThreeName",true,"Switch3", "电流"), + guoLiu_port4_A("1031","1231","输出A过流","relayFourName",true,"Switch4", "电流"), + guoLiu_port4_B("1032","1232","输出B过流","relayFourName",true,"Switch4", "电流"), + guoLiu_port4_C("1033","1233","输出C过流","relayFourName",true,"Switch4", "电流"), + qianLiu_port1_A("1034","1234","输出A欠流","relayOneName",true,"Switch1", "电流"), + qianLiu_port1_B("1035","1235","输出B欠流","relayOneName",true,"Switch1", "电流"), + qianLiu_port1_C("1036","1236","输出C欠流","relayOneName",true,"Switch1", "电流"), + qianLiu_port2_A("1037","1237","输出A欠流","relayTwoName",true,"Switch2", "电流"), + qianLiu_port2_B("1038","1238","输出B欠流","relayTwoName",true,"Switch2", "电流"), + qianLiu_port2_C("1039","1239","输出C欠流","relayTwoName",true,"Switch2", "电流"), + qianLiu_port3_A("1040","1240","输出A欠流","relayThreeName",true,"Switch3", "电流"), + qianLiu_port3_B("1041","1241","输出B欠流","relayThreeName",true,"Switch3", "电流"), + qianLiu_port3_C("1042","1242","输出C欠流","relayThreeName",true,"Switch3", "电流"), + qianLiu_port4_A("1043","1243","输出A欠流","relayFourName",true,"Switch4", "电流"), + qianLiu_port4_B("1044","1244","输出B欠流","relayFourName",true,"Switch4", "电流"), + qianLiu_port4_C("1045","1245","输出C欠流","relayFourName",true,"Switch4", "电流"), + guoLiu_port1("2009","2209","输出过流","relayOneName",true,"Switch1", "电流"), + guoLiu_port2("2010","2210","输出过流","relayTwoName",true,"Switch2", "电流"), + guoLiu_port3("2011","2211","输出过流","relayThreeName",true,"Switch3", "电流"), + guoLiu_port4("2012","2212","输出过流","relayFourName",true,"Switch4", "电流"), + qianLiu_port1("2013","2213","输出欠流","relayOneName",true,"Switch1", "电流"), + qianLiu_port2("2014","2214","输出欠流","relayTwoName",true,"Switch2", "电流"), + qianLiu_port3("2015","2215","输出欠流","relayThreeName",true,"Switch3", "电流"), + qianLiu_port4("2016","2216","输出欠流","relayFourName",true,"Switch4", "电流"), + + kongzai_port1("2017","2217","输出空载","relayOneName",true ,"Switch1", "电流"), + kongzai_port2("2018","2218","输出空载","relayTwoName",true ,"Switch2", "电流"), + kongzai_port3("2019","2219","输出空载","relayThreeName",true ,"Switch3", "电流"), + kongzai_port4("2020","2220","输出空载","relayFourName",true ,"Switch4", "电流"), + + DyingGasp("8001","8201","断电告警",null,null,null, null), + ControlBoard("8002","8202","控制板通信故障",null,null,null, null), + AbnormalMetering("8003","8203","计量芯片异常",null,null,null, null); + + + private String code; + + private String s_code; + + private String value; + + private String portName; + + private Boolean determine; + + private String switchFlag; + + private String flag; + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + + public String getSCode() { + return s_code; + } + + public String getPortName() { + return portName; + } + + public Boolean getDetermine() { + return determine; + } + + public String getSwitchFlag() { + return switchFlag; + } + public String getFlag() { + return flag; + } + + ControllerErrorCode(String code, String sCode, String value, String portName, Boolean determine , String switchFlag, String flag){ + this.code = code; + this.value = value; + this.s_code = sCode; + this.portName = portName; + this.determine = determine; + this.switchFlag = switchFlag; + this.flag = flag; + } + + public static ControllerErrorCode getByCode(String code) { + for (ControllerErrorCode e : ControllerErrorCode.values()) { + if (e.code.equals(code)) { + return e; + } + } + return null; + } + + public static ControllerErrorCode getBySCode(String sCode) { + for (ControllerErrorCode e : ControllerErrorCode.values()) { + if (e.s_code.equals(sCode)) { + return e; + } + } + return null; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerOperateFlag.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerOperateFlag.java new file mode 100644 index 0000000..26cfe0c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ControllerOperateFlag.java @@ -0,0 +1,102 @@ +package com.limap.common.enums.iot; + +/** + * @author jjb + * 控制器操作类型 + */ + +public enum ControllerOperateFlag { + /** + * 开关一 + */ + ONE("Switch1","Current1","Switch1_volt","switch1_VoltCur","rating_switch1","localTimer_switch1"), + /** + * 开关二 + */ + TWO("Switch2","Current2","Switch2_volt","switch2_VoltCur","rating_switch2","localTimer_switch2"), + /** + * 开关三 + */ + THREE("Switch3","Current3","Switch3_volt","switch3_VoltCur","rating_switch3","localTimer_switch3"), + /** + * 开关四 + */ + FOUR("Switch4","Current4","Switch4_volt","switch4_VoltCur","rating_switch4","localTimer_switch4"); + + + /** + * 开关标识 + */ + private final String flag; + /** + * 电流标识 + */ + private final String currentFlag; + /** + * 开关额定电压 + */ + private final String voltFlag; + /** + * 电压电流标识 + */ + private final String voltCurFlag; + /** + * 额定电流标识 + */ + private final String ratingFlag; + /** + * 本地定时标识 + */ + private final String localTimerFlag; + + ControllerOperateFlag(String flag, String currentFlag, String voltFlag, String voltCurFlag, String ratingFlag, String localTimerFlag){ + this.flag = flag; + this.currentFlag = currentFlag; + this.voltFlag = voltFlag; + this.voltCurFlag = voltCurFlag; + this.ratingFlag = ratingFlag; + this.localTimerFlag = localTimerFlag; + } + + public static ControllerOperateFlag getByLocalTimerFlag(String flag) { + for (ControllerOperateFlag e : ControllerOperateFlag.values()) { + if (e.localTimerFlag.equals(flag)) { + return e; + } + } + return null; + } + + public static ControllerOperateFlag getByFlag(String flag) { + for (ControllerOperateFlag e : ControllerOperateFlag.values()) { + if (e.flag.equals(flag)) { + return e; + } + } + return null; + } + + public String getFlag() { + return flag; + } + + public String getCurrentFlag() { + return currentFlag; + } + + public String getVoltFlag() { + return voltFlag; + } + + public String getVoltCurFlag() { + return voltCurFlag; + } + + public String getRatingFlag() { + return ratingFlag; + } + + public String getLocalTimerFlag() { + return localTimerFlag; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/DeviceType.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/DeviceType.java new file mode 100644 index 0000000..935b34d --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/DeviceType.java @@ -0,0 +1,29 @@ +package com.limap.common.enums.iot; + +/** + * @author jjb + */ + +public enum DeviceType { + + doxygen("1","溶解氧设备"), + control("2","控制器设备"); + + private String code; + private String value; + + + DeviceType(String code, String value){ + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeCEnums.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeCEnums.java new file mode 100644 index 0000000..916871b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeCEnums.java @@ -0,0 +1,34 @@ +package com.limap.common.enums.iot; + +public enum ProbeCEnums { + + one(1,"溶解氧探头掉线"), + two(10,"pH探头掉线"), + three(100,"盐度探头掉线"), + four(1000,"浊度掉线"); + + private Integer code; + private String value; + + ProbeCEnums(Integer code, String value){ + this.code = code; + this.value = value; + } + + public Integer getCode() { + return code; + } + + public String getValue() { + return value; + } + + public static ProbeCEnums getByCode(Integer code) { + for (ProbeCEnums e : ProbeCEnums.values()) { + if (e.code.equals(code)) { + return e; + } + } + return null; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeEnums.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeEnums.java new file mode 100644 index 0000000..346397e --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/ProbeEnums.java @@ -0,0 +1,63 @@ +package com.limap.common.enums.iot; + +/** + * @author Lenovo + */ +public enum ProbeEnums { + ONE(1,"溶解氧探头掉线"), + TWO(2,"pH探头掉线"), + THREE(3,"溶解氧和pH探头掉线"), + FOUR(4,"盐度探头掉线"), + FIVE(5,"溶解氧和盐度探头掉线"), + SIX(6,"pH和盐度探头掉线"), + SEVEN(7,"溶解氧和pH和盐度探头都掉线"), + EIGHT(8,"氨氮探头掉线"), + NINE(9,"氨氮和氧探头掉线"), + TEN(10,"氨氮和pH掉线"), + eleven(11,"氨氮pH氧掉线"), + twelve(12,"氨氮和盐度掉线"), + thirteen(13,"氨氮和盐度和氧掉线"), + fourteen(14,"氨氮盐度ph掉线"), + fifteen(15,"氨氮氧ph盐度掉线"), + sixteen(16,"亚盐离线"), + seventeen(17,"亚盐和氧离线"), + eighteen(18,"亚盐pH离线"), + nineteen(19,"亚盐pH氧离线"), + twenty(20,"亚盐盐度离线"), + twentyOne(21,"亚盐盐度氧离线"), + twentyTwo(22,"亚盐pH盐度离线"), + twentyThree(23,"亚盐盐度ph氧离线"), + twentyFour(24,"亚盐氨氮离线"), + twentyFive(25,"亚盐氨氮氧离线"), + twentySix(26,"亚盐氨氮pH离线"), + twentySeven(27,"亚盐氨氮ph氧离线"), + twentyEight(28,"亚盐氨氮盐度离线"), + twentyNine(29,"亚盐氨氮盐度氧离线"), + thirty(30,"亚盐氨氮盐度pH离线"), + thirtyOne(31,"所有离线"); + + private Integer code; + private String value; + + ProbeEnums(Integer code, String value){ + this.code = code; + this.value = value; + } + + public Integer getCode() { + return code; + } + + public String getValue() { + return value; + } + + public static ProbeEnums getByCode(Integer code) { + for (ProbeEnums e : ProbeEnums.values()) { + if (e.code.equals(code)) { + return e; + } + } + return null; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/RedisKey.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/RedisKey.java new file mode 100644 index 0000000..d9dc646 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/RedisKey.java @@ -0,0 +1,51 @@ +package com.limap.common.enums.iot; + +/** + * @author Lenovo + */ + +public enum RedisKey { + /** + * 开关1 + */ + offlineD("offlineD","offlineD:","离线监测键值"), + offline("offline","offline:","离线实际数据"), + command("command","command:","控制器操作键值"), + controlStatus("controlStatus","controlStatus:","控制器标识"), + commandStatus("commandStatus","commandStatus:","控制器操作实际数据"); + + + private String code; + /** + * 阿里对应字段 + */ + private String value; + private String field; + + RedisKey(String code, String value, String field){ + this.code = code; + this.value = value; + this.field = field; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } + public String getField() { + return field; + } + + + public static RedisKey getByCode(String code) { + for (RedisKey e : RedisKey.values()) { + if (e.code.equals(code)) { + return e; + } + } + return null; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/TimeIntervalEnums.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/TimeIntervalEnums.java new file mode 100644 index 0000000..4632747 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/enums/iot/TimeIntervalEnums.java @@ -0,0 +1,37 @@ +package com.limap.common.enums.iot; + +/** + * @author Lenovo + */ + +public enum TimeIntervalEnums { + + /** + * 个时间段拨打范围 + */ + morningTime(8,"上午时间段",13), + afterTime(14,"下午时间段",19), + nightTime(20,"夜间时间段",7); + + private Integer startTime; + private Integer endTime; + private String value; + + + TimeIntervalEnums(Integer startTime, String value, Integer endTime){ + this.endTime = endTime; + this.value = value; + this.startTime = startTime; + } + + public Integer getStartTime() { + return startTime; + } + + public String getValue() { + return value; + } + public Integer getEndTime() { + return endTime; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/DemoModeException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/DemoModeException.java new file mode 100644 index 0000000..17b5f63 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/DemoModeException.java @@ -0,0 +1,15 @@ +package com.limap.common.exception; + +/** + * 演示模式异常 + * + * @author limap + */ +public class DemoModeException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public DemoModeException() + { + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/GlobalException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/GlobalException.java new file mode 100644 index 0000000..9b9975c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/GlobalException.java @@ -0,0 +1,58 @@ +package com.limap.common.exception; + +/** + * 全局异常 + * + * @author limap + */ +public class GlobalException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细，内部调试错误 + * + * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法，避免反序列化问题 + */ + public GlobalException() + { + } + + public GlobalException(String message) + { + this.message = message; + } + + public String getDetailMessage() + { + return detailMessage; + } + + public GlobalException setDetailMessage(String detailMessage) + { + this.detailMessage = detailMessage; + return this; + } + + @Override + public String getMessage() + { + return message; + } + + public GlobalException setMessage(String message) + { + this.message = message; + return this; + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/ServiceException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/ServiceException.java new file mode 100644 index 0000000..eb79745 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/ServiceException.java @@ -0,0 +1,74 @@ +package com.limap.common.exception; + +/** + * 业务异常 + * + * @author limap + */ +public final class ServiceException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细，内部调试错误 + * + * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法，避免反序列化问题 + */ + public ServiceException() + { + } + + public ServiceException(String message) + { + this.message = message; + } + + public ServiceException(String message, Integer code) + { + this.message = message; + this.code = code; + } + + public String getDetailMessage() + { + return detailMessage; + } + + @Override + public String getMessage() + { + return message; + } + + public Integer getCode() + { + return code; + } + + public ServiceException setMessage(String message) + { + this.message = message; + return this; + } + + public ServiceException setDetailMessage(String detailMessage) + { + this.detailMessage = detailMessage; + return this; + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/UtilException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/UtilException.java new file mode 100644 index 0000000..1c509a6 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/UtilException.java @@ -0,0 +1,26 @@ +package com.limap.common.exception; + +/** + * 工具类异常 + * + * @author limap + */ +public class UtilException extends RuntimeException +{ + private static final long serialVersionUID = 8247610319171014183L; + + public UtilException(Throwable e) + { + super(e.getMessage(), e); + } + + public UtilException(String message) + { + super(message); + } + + public UtilException(String message, Throwable throwable) + { + super(message, throwable); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/base/BaseException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/base/BaseException.java new file mode 100644 index 0000000..b111ae8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/base/BaseException.java @@ -0,0 +1,97 @@ +package com.limap.common.exception.base; + +import com.limap.common.utils.MessageUtils; +import com.limap.common.utils.StringUtils; + +/** + * 基础异常 + * + * @author limap + */ +public class BaseException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + /** + * 所属模块 + */ + private String module; + + /** + * 错误码 + */ + private String code; + + /** + * 错误码对应的参数 + */ + private Object[] args; + + /** + * 错误消息 + */ + private String defaultMessage; + + public BaseException(String module, String code, Object[] args, String defaultMessage) + { + this.module = module; + this.code = code; + this.args = args; + this.defaultMessage = defaultMessage; + } + + public BaseException(String module, String code, Object[] args) + { + this(module, code, args, null); + } + + public BaseException(String module, String defaultMessage) + { + this(module, null, null, defaultMessage); + } + + public BaseException(String code, Object[] args) + { + this(null, code, args, null); + } + + public BaseException(String defaultMessage) + { + this(null, null, null, defaultMessage); + } + + @Override + public String getMessage() + { + String message = null; + if (!StringUtils.isEmpty(code)) + { + message = MessageUtils.message(code, args); + } + if (message == null) + { + message = defaultMessage; + } + return message; + } + + public String getModule() + { + return module; + } + + public String getCode() + { + return code; + } + + public Object[] getArgs() + { + return args; + } + + public String getDefaultMessage() + { + return defaultMessage; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileException.java new file mode 100644 index 0000000..b180ac7 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileException.java @@ -0,0 +1,19 @@ +package com.limap.common.exception.file; + +import com.limap.common.exception.base.BaseException; + +/** + * 文件信息异常类 + * + * @author limap + */ +public class FileException extends BaseException +{ + private static final long serialVersionUID = 1L; + + public FileException(String code, Object[] args) + { + super("file", code, args, null); + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileNameLengthLimitExceededException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileNameLengthLimitExceededException.java new file mode 100644 index 0000000..2a67a8b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileNameLengthLimitExceededException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.file; + +/** + * 文件名称超长限制异常类 + * + * @author limap + */ +public class FileNameLengthLimitExceededException extends FileException +{ + private static final long serialVersionUID = 1L; + + public FileNameLengthLimitExceededException(int defaultFileNameLength) + { + super("upload.filename.exceed.length", new Object[] { defaultFileNameLength }); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileSizeLimitExceededException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileSizeLimitExceededException.java new file mode 100644 index 0000000..66c1c3a --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileSizeLimitExceededException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.file; + +/** + * 文件名大小限制异常类 + * + * @author limap + */ +public class FileSizeLimitExceededException extends FileException +{ + private static final long serialVersionUID = 1L; + + public FileSizeLimitExceededException(long defaultMaxSize) + { + super("upload.exceed.maxSize", new Object[] { defaultMaxSize }); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileUploadException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileUploadException.java new file mode 100644 index 0000000..d551e49 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/FileUploadException.java @@ -0,0 +1,61 @@ +package com.limap.common.exception.file; + +import java.io.PrintStream; +import java.io.PrintWriter; + +/** + * 文件上传异常类 + * + * @author limap + */ +public class FileUploadException extends Exception +{ + + private static final long serialVersionUID = 1L; + + private final Throwable cause; + + public FileUploadException() + { + this(null, null); + } + + public FileUploadException(final String msg) + { + this(msg, null); + } + + public FileUploadException(String msg, Throwable cause) + { + super(msg); + this.cause = cause; + } + + @Override + public void printStackTrace(PrintStream stream) + { + super.printStackTrace(stream); + if (cause != null) + { + stream.println("Caused by:"); + cause.printStackTrace(stream); + } + } + + @Override + public void printStackTrace(PrintWriter writer) + { + super.printStackTrace(writer); + if (cause != null) + { + writer.println("Caused by:"); + cause.printStackTrace(writer); + } + } + + @Override + public Throwable getCause() + { + return cause; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/InvalidExtensionException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/InvalidExtensionException.java new file mode 100644 index 0000000..2c07ce3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/file/InvalidExtensionException.java @@ -0,0 +1,80 @@ +package com.limap.common.exception.file; + +import java.util.Arrays; + +/** + * 文件上传 误异常类 + * + * @author limap + */ +public class InvalidExtensionException extends FileUploadException +{ + private static final long serialVersionUID = 1L; + + private String[] allowedExtension; + private String extension; + private String filename; + + public InvalidExtensionException(String[] allowedExtension, String extension, String filename) + { + super("文件[" + filename + "]后缀[" + extension + "]不正确，请上传" + Arrays.toString(allowedExtension) + "格式"); + this.allowedExtension = allowedExtension; + this.extension = extension; + this.filename = filename; + } + + public String[] getAllowedExtension() + { + return allowedExtension; + } + + public String getExtension() + { + return extension; + } + + public String getFilename() + { + return filename; + } + + public static class InvalidImageExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidFlashExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidMediaExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } + + public static class InvalidVideoExtensionException extends InvalidExtensionException + { + private static final long serialVersionUID = 1L; + + public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) + { + super(allowedExtension, extension, filename); + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/job/TaskException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/job/TaskException.java new file mode 100644 index 0000000..6833c7f --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/job/TaskException.java @@ -0,0 +1,34 @@ +package com.limap.common.exception.job; + +/** + * 计划策略异常 + * + * @author limap + */ +public class TaskException extends Exception +{ + private static final long serialVersionUID = 1L; + + private Code code; + + public TaskException(String msg, Code code) + { + this(msg, code, null); + } + + public TaskException(String msg, Code code, Exception nestedEx) + { + super(msg, nestedEx); + this.code = code; + } + + public Code getCode() + { + return code; + } + + public enum Code + { + TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/BlackListException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/BlackListException.java new file mode 100644 index 0000000..35c264b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/BlackListException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 黑名单IP异常类 + * + * @author limap + */ +public class BlackListException extends UserException +{ + private static final long serialVersionUID = 1L; + + public BlackListException() + { + super("login.blocked", null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaException.java new file mode 100644 index 0000000..f0eabce --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 验证码错误异常类 + * + * @author limap + */ +public class CaptchaException extends UserException +{ + private static final long serialVersionUID = 1L; + + public CaptchaException() + { + super("user.jcaptcha.error", null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaExpireException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaExpireException.java new file mode 100644 index 0000000..c635867 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/CaptchaExpireException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 验证码失效异常类 + * + * @author limap + */ +public class CaptchaExpireException extends UserException +{ + private static final long serialVersionUID = 1L; + + public CaptchaExpireException() + { + super("user.jcaptcha.expire", null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserException.java new file mode 100644 index 0000000..2785b4b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserException.java @@ -0,0 +1,18 @@ +package com.limap.common.exception.user; + +import com.limap.common.exception.base.BaseException; + +/** + * 用户信息异常类 + * + * @author limap + */ +public class UserException extends BaseException +{ + private static final long serialVersionUID = 1L; + + public UserException(String code, Object[] args) + { + super("user", code, args, null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserNotExistsException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserNotExistsException.java new file mode 100644 index 0000000..bf70892 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserNotExistsException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 用户不存在异常类 + * + * @author limap + */ +public class UserNotExistsException extends UserException +{ + private static final long serialVersionUID = 1L; + + public UserNotExistsException() + { + super("user.not.exists", null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordNotMatchException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordNotMatchException.java new file mode 100644 index 0000000..2018588 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordNotMatchException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 用户密码不正确或不符合规范异常类 + * + * @author limap + */ +public class UserPasswordNotMatchException extends UserException +{ + private static final long serialVersionUID = 1L; + + public UserPasswordNotMatchException() + { + super("user.password.not.match", null); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordRetryLimitExceedException.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordRetryLimitExceedException.java new file mode 100644 index 0000000..84944d9 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -0,0 +1,16 @@ +package com.limap.common.exception.user; + +/** + * 用户错误最大次数异常类 + * + * @author limap + */ +public class UserPasswordRetryLimitExceedException extends UserException +{ + private static final long serialVersionUID = 1L; + + public UserPasswordRetryLimitExceedException(int retryLimitCount, int lockTime) + { + super("user.password.retry.limit.exceed", new Object[] { retryLimitCount, lockTime }); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/PropertyPreExcludeFilter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/PropertyPreExcludeFilter.java new file mode 100644 index 0000000..804f9c8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/PropertyPreExcludeFilter.java @@ -0,0 +1,24 @@ +package com.limap.common.filter; + +import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; + +/** + * 排除JSON敏感属性 + * + * @author limap + */ +public class PropertyPreExcludeFilter extends SimplePropertyPreFilter +{ + public PropertyPreExcludeFilter() + { + } + + public PropertyPreExcludeFilter addExcludes(String... filters) + { + for (int i = 0; i < filters.length; i++) + { + this.getExcludes().add(filters[i]); + } + return this; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatableFilter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatableFilter.java new file mode 100644 index 0000000..e5002a9 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatableFilter.java @@ -0,0 +1,52 @@ +package com.limap.common.filter; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import org.springframework.http.MediaType; +import com.limap.common.utils.StringUtils; + +/** + * Repeatable 过滤器 + * + * @author limap + */ +public class RepeatableFilter implements Filter +{ + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + ServletRequest requestWrapper = null; + if (request instanceof HttpServletRequest + && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) + { + requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); + } + if (null == requestWrapper) + { + chain.doFilter(request, response); + } + else + { + chain.doFilter(requestWrapper, response); + } + } + + @Override + public void destroy() + { + + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatedlyRequestWrapper.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatedlyRequestWrapper.java new file mode 100644 index 0000000..a6e03c7 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/RepeatedlyRequestWrapper.java @@ -0,0 +1,76 @@ +package com.limap.common.filter; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import com.limap.common.utils.http.HttpHelper; +import com.limap.common.constant.Constants; + +/** + * 构建可重复读取inputStream的request + * + * @author limap + */ +public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper +{ + private final byte[] body; + + public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException + { + super(request); + request.setCharacterEncoding(Constants.UTF8); + response.setCharacterEncoding(Constants.UTF8); + + body = HttpHelper.getBodyString(request).getBytes(Constants.UTF8); + } + + @Override + public BufferedReader getReader() throws IOException + { + return new BufferedReader(new InputStreamReader(getInputStream())); + } + + @Override + public ServletInputStream getInputStream() throws IOException + { + final ByteArrayInputStream bais = new ByteArrayInputStream(body); + return new ServletInputStream() + { + @Override + public int read() throws IOException + { + return bais.read(); + } + + @Override + public int available() throws IOException + { + return body.length; + } + + @Override + public boolean isFinished() + { + return false; + } + + @Override + public boolean isReady() + { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) + { + + } + }; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssFilter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssFilter.java new file mode 100644 index 0000000..dd50486 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssFilter.java @@ -0,0 +1,75 @@ +package com.limap.common.filter; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.limap.common.utils.StringUtils; +import com.limap.common.enums.HttpMethod; + +/** + * 防止XSS攻击的过滤器 + * + * @author limap + */ +public class XssFilter implements Filter +{ + /** + * 排除链接 + */ + public List excludes = new ArrayList<>(); + + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + String tempExcludes = filterConfig.getInitParameter("excludes"); + if (StringUtils.isNotEmpty(tempExcludes)) + { + String[] url = tempExcludes.split(","); + for (int i = 0; url != null && i < url.length; i++) + { + excludes.add(url[i]); + } + } + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException + { + HttpServletRequest req = (HttpServletRequest) request; + HttpServletResponse resp = (HttpServletResponse) response; + if (handleExcludeURL(req, resp)) + { + chain.doFilter(request, response); + return; + } + XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request); + chain.doFilter(xssRequest, response); + } + + private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) + { + String url = request.getServletPath(); + String method = request.getMethod(); + // GET DELETE 不过滤 + if (method == null || HttpMethod.GET.matches(method) || HttpMethod.DELETE.matches(method)) + { + return true; + } + return StringUtils.matches(url, excludes); + } + + @Override + public void destroy() + { + + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssHttpServletRequestWrapper.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssHttpServletRequestWrapper.java new file mode 100644 index 0000000..d440a81 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/filter/XssHttpServletRequestWrapper.java @@ -0,0 +1,111 @@ +package com.limap.common.filter; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import javax.servlet.ReadListener; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; +import org.apache.commons.io.IOUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.html.EscapeUtil; + +/** + * XSS过滤处理 + * + * @author limap + */ +public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper +{ + /** + * @param request + */ + public XssHttpServletRequestWrapper(HttpServletRequest request) + { + super(request); + } + + @Override + public String[] getParameterValues(String name) + { + String[] values = super.getParameterValues(name); + if (values != null) + { + int length = values.length; + String[] escapesValues = new String[length]; + for (int i = 0; i < length; i++) + { + // 防xss攻击和过滤前后空格 + escapesValues[i] = EscapeUtil.clean(values[i]).trim(); + } + return escapesValues; + } + return super.getParameterValues(name); + } + + @Override + public ServletInputStream getInputStream() throws IOException + { + // 非json类型，直接返回 + if (!isJsonRequest()) + { + return super.getInputStream(); + } + + // 为空，直接返回 + String json = IOUtils.toString(super.getInputStream(), "utf-8"); + if (StringUtils.isEmpty(json)) + { + return super.getInputStream(); + } + + // xss过滤 + json = EscapeUtil.clean(json).trim(); + byte[] jsonBytes = json.getBytes("utf-8"); + final ByteArrayInputStream bis = new ByteArrayInputStream(jsonBytes); + return new ServletInputStream() + { + @Override + public boolean isFinished() + { + return true; + } + + @Override + public boolean isReady() + { + return true; + } + + @Override + public int available() throws IOException + { + return jsonBytes.length; + } + + @Override + public void setReadListener(ReadListener readListener) + { + } + + @Override + public int read() throws IOException + { + return bis.read(); + } + }; + } + + /** + * 是否是Json请求 + * + * @param request + */ + public boolean isJsonRequest() + { + String header = super.getHeader(HttpHeaders.CONTENT_TYPE); + return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Arith.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Arith.java new file mode 100644 index 0000000..6edf0cf --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Arith.java @@ -0,0 +1,114 @@ +package com.limap.common.utils; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +/** + * 精确的浮点数运算 + * + * @author limap + */ +public class Arith +{ + + /** 默认除法运算精度 */ + private static final int DEF_DIV_SCALE = 10; + + /** 这个类不能实例化 */ + private Arith() + { + } + + /** + * 提供精确的加法运算。 + * @param v1 被加数 + * @param v2 加数 + * @return 两个参数的和 + */ + public static double add(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.add(b2).doubleValue(); + } + + /** + * 提供精确的减法运算。 + * @param v1 被减数 + * @param v2 减数 + * @return 两个参数的差 + */ + public static double sub(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.subtract(b2).doubleValue(); + } + + /** + * 提供精确的乘法运算。 + * @param v1 被乘数 + * @param v2 乘数 + * @return 两个参数的积 + */ + public static double mul(double v1, double v2) + { + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + return b1.multiply(b2).doubleValue(); + } + + /** + * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到 + * 小数点以后10位，以后的数字四舍五入。 + * @param v1 被除数 + * @param v2 除数 + * @return 两个参数的商 + */ + public static double div(double v1, double v2) + { + return div(v1, v2, DEF_DIV_SCALE); + } + + /** + * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 + * 定精度，以后的数字四舍五入。 + * @param v1 被除数 + * @param v2 除数 + * @param scale 表示表示需要精确到小数点以后几位。 + * @return 两个参数的商 + */ + public static double div(double v1, double v2, int scale) + { + if (scale < 0) + { + throw new IllegalArgumentException( + "The scale must be a positive integer or zero"); + } + BigDecimal b1 = new BigDecimal(Double.toString(v1)); + BigDecimal b2 = new BigDecimal(Double.toString(v2)); + if (b1.compareTo(BigDecimal.ZERO) == 0) + { + return BigDecimal.ZERO.doubleValue(); + } + return b1.divide(b2, scale, RoundingMode.HALF_UP).doubleValue(); + } + + /** + * 提供精确的小数位四舍五入处理。 + * @param v 需要四舍五入的数字 + * @param scale 小数点后保留几位 + * @return 四舍五入后的结果 + */ + public static double round(double v, int scale) + { + if (scale < 0) + { + throw new IllegalArgumentException( + "The scale must be a positive integer or zero"); + } + BigDecimal b = new BigDecimal(Double.toString(v)); + BigDecimal one = BigDecimal.ONE; + return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DateUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DateUtils.java new file mode 100644 index 0000000..102351a --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DateUtils.java @@ -0,0 +1,278 @@ +package com.limap.common.utils; + +import java.lang.management.ManagementFactory; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +import org.apache.commons.lang3.time.DateFormatUtils; + +/** + * 时间工具类 + * + * @author limap + */ +public class DateUtils extends org.apache.commons.lang3.time.DateUtils +{ + public static String YYYY = "yyyy"; + + public static String YYYY_MM = "yyyy-MM"; + + public static String YYYY_MM_DD = "yyyy-MM-dd"; + + public static String format_yyyyMMdd = "yyyyMMdd"; + + public static final String format_yyyy_MM_dd_HHmm = "yyyy-MM-dd HH:mm"; + + public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + + public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + + private static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + + /** + * 获取当前Date型日期 + * + * @return Date() 当前日期 + */ + public static Date getNowDate() + { + return new Date(); + } + + /** + * 获取当前日期, 默认格式为yyyy-MM-dd + * + * @return String + */ + public static String getDate() + { + return dateTimeNow(YYYY_MM_DD); + } + + public static final String getTime() + { + return dateTimeNow(YYYY_MM_DD_HH_MM_SS); + } + + public static final String dateTimeNow() + { + return dateTimeNow(YYYYMMDDHHMMSS); + } + + public static final String dateTimeNow(final String format) + { + return parseDateToStr(format, new Date()); + } + + public static final String dateTime(final Date date) + { + return parseDateToStr(YYYY_MM_DD, date); + } + + public static final String parseDateToStr(final String format, final Date date) + { + return new SimpleDateFormat(format).format(date); + } + + public static final Date dateTime(final String format, final String ts) + { + try + { + return new SimpleDateFormat(format).parse(ts); + } + catch (ParseException e) + { + throw new RuntimeException(e); + } + } + + /** + * 日期路径 即年/月/日 如2018/08/08 + */ + public static final String datePath() + { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyy/MM/dd"); + } + + /** + * 日期路径 即年/月/日 如20180808 + */ + public static final String dateTime() + { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyyMMdd"); + } + + /** + * 日期型字符串转化为日期 格式 + */ + public static Date parseDate(Object str) + { + if (str == null) + { + return null; + } + try + { + return parseDate(str.toString(), parsePatterns); + } + catch (ParseException e) + { + return null; + } + } + + /** + * 获取服务器启动时间 + */ + public static Date getServerStartDate() + { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + /** + * 计算相差天数 + */ + public static int differentDaysByMillisecond(Date date1, Date date2) + { + return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24))); + } + + public static int differentDays(Date date1, Date date2) + { + return (int) ((date1.getTime() - date2.getTime()) / (1000 * 3600 * 24)); + } + + /** + * 计算时间差 + * + * @param endTime 最后时间 + * @param startTime 开始时间 + * @return 时间差（天/小时/分钟） + */ + public static String timeDistance(Date endDate, Date startTime) + { + long nd = 1000 * 24 * 60 * 60; + long nh = 1000 * 60 * 60; + long nm = 1000 * 60; + // long ns = 1000; + // 获得两个时间的毫秒时间差异 + long diff = endDate.getTime() - startTime.getTime(); + // 计算差多少天 + long day = diff / nd; + // 计算差多少小时 + long hour = diff % nd / nh; + // 计算差多少分钟 + long min = diff % nd % nh / nm; + // 计算差多少秒//输出结果 + // long sec = diff % nd % nh % nm / ns; + return day + "天" + hour + "小时" + min + "分钟"; + } + + /** + * 增加 LocalDateTime ==> Date + */ + public static Date toDate(LocalDateTime temporalAccessor) + { + ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + /** + * 增加 LocalDate ==> Date + */ + public static Date toDate(LocalDate temporalAccessor) + { + LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0)); + ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); + return Date.from(zdt.toInstant()); + } + + public static Long nearbyTimeZone(Date date, int day) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + int td = calendar.get(Calendar.DATE); + calendar.set(Calendar.DATE, td + day); + return calendar.getTime().getTime(); + } + + + public static Date addDateByYear(Date date, int year) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.YEAR, year); + date = calendar.getTime(); + return date; + } + + public static Date addDateByMonth(Date date, int month) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.MONTH, month); + date = calendar.getTime(); + return date; + } + + + /** + * 把日期时间格式化为指定格式，如：yyyy-MM-dd HH:mm + * + * @param dt java.util.Date + * @param formatType : 指定日期转化格式字符串模板,例如:yyyy-MM-dd + * @return 格式化后的日期时间字符串 + */ + public static String formatDateTime(Date dt, String formatType) { + String newDate = ""; + if (dt != null) { + Locale locale = Locale.CHINESE; + SimpleDateFormat dateStyle = new SimpleDateFormat(formatType, locale); + newDate = dateStyle.format(dt); + } + return newDate; + } + + public static String nearbyMinute(Date date, int minute) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.MINUTE, minute); + date = calendar.getTime(); + return DateUtils.formatDateTime(date, DateUtils.format_yyyyMMdd); + } + + public static int differentMinutes(Date date1, Date date2) { + int minutes = (int) ((date2.getTime() - date1.getTime()) / (1000 * 60 )); + return minutes; + } + + public static Integer getNowHour() { + Calendar calendar = Calendar.getInstance(); + return calendar.get(Calendar.HOUR_OF_DAY); + } + + public static String nearbyDay(Date date, int day) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DATE, day); + date = calendar.getTime(); + return DateUtils.formatDateTime(date, DateUtils.YYYY_MM_DD); + } + + public static int getDifferDay(Date startDate, Date endDate) { + long differ = endDate.getTime() - startDate.getTime(); + long hour = differ / 24 / 60 / 60 / 1000; + return Integer.parseInt(String.valueOf(hour)); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DictUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DictUtils.java new file mode 100644 index 0000000..ae51b90 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/DictUtils.java @@ -0,0 +1,186 @@ +package com.limap.common.utils; + +import java.util.Collection; +import java.util.List; +import com.alibaba.fastjson2.JSONArray; +import com.limap.common.constant.CacheConstants; +import com.limap.common.core.domain.entity.SysDictData; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.utils.spring.SpringUtils; + +/** + * 字典工具类 + * + * @author limap + */ +public class DictUtils +{ + /** + * 分隔符 + */ + public static final String SEPARATOR = ","; + + /** + * 设置字典缓存 + * + * @param key 参数键 + * @param dictDatas 字典数据列表 + */ + public static void setDictCache(String key, List dictDatas) + { + SpringUtils.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas); + } + + /** + * 获取字典缓存 + * + * @param key 参数键 + * @return dictDatas 字典数据列表 + */ + public static List getDictCache(String key) + { + JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key)); + if (StringUtils.isNotNull(arrayCache)) + { + return arrayCache.toList(SysDictData.class); + } + return null; + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @return 字典标签 + */ + public static String getDictLabel(String dictType, String dictValue) + { + return getDictLabel(dictType, dictValue, SEPARATOR); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @return 字典值 + */ + public static String getDictValue(String dictType, String dictLabel) + { + return getDictValue(dictType, dictLabel, SEPARATOR); + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @param separator 分隔符 + * @return 字典标签 + */ + public static String getDictLabel(String dictType, String dictValue, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.isNotNull(datas)) + { + if (StringUtils.containsAny(separator, dictValue)) + { + for (SysDictData dict : datas) + { + for (String value : dictValue.split(separator)) + { + if (value.equals(dict.getDictValue())) + { + propertyString.append(dict.getDictLabel()).append(separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictValue.equals(dict.getDictValue())) + { + return dict.getDictLabel(); + } + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @param separator 分隔符 + * @return 字典值 + */ + public static String getDictValue(String dictType, String dictLabel, String separator) + { + StringBuilder propertyString = new StringBuilder(); + List datas = getDictCache(dictType); + + if (StringUtils.containsAny(separator, dictLabel) && StringUtils.isNotEmpty(datas)) + { + for (SysDictData dict : datas) + { + for (String label : dictLabel.split(separator)) + { + if (label.equals(dict.getDictLabel())) + { + propertyString.append(dict.getDictValue()).append(separator); + break; + } + } + } + } + else + { + for (SysDictData dict : datas) + { + if (dictLabel.equals(dict.getDictLabel())) + { + return dict.getDictValue(); + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 删除指定字典缓存 + * + * @param key 字典键 + */ + public static void removeDictCache(String key) + { + SpringUtils.getBean(RedisCache.class).deleteObject(getCacheKey(key)); + } + + /** + * 清空字典缓存 + */ + public static void clearDictCache() + { + Collection keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.SYS_DICT_KEY + "*"); + SpringUtils.getBean(RedisCache.class).deleteObject(keys); + } + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + public static String getCacheKey(String configKey) + { + return CacheConstants.SYS_DICT_KEY + configKey; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ExceptionUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ExceptionUtil.java new file mode 100644 index 0000000..8433789 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ExceptionUtil.java @@ -0,0 +1,39 @@ +package com.limap.common.utils; + +import java.io.PrintWriter; +import java.io.StringWriter; +import org.apache.commons.lang3.exception.ExceptionUtils; + +/** + * 错误信息处理类。 + * + * @author limap + */ +public class ExceptionUtil +{ + /** + * 获取exception的详细错误信息。 + */ + public static String getExceptionMessage(Throwable e) + { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw, true)); + return sw.toString(); + } + + public static String getRootErrorMessage(Exception e) + { + Throwable root = ExceptionUtils.getRootCause(e); + root = (root == null ? e : root); + if (root == null) + { + return ""; + } + String msg = root.getMessage(); + if (msg == null) + { + return "null"; + } + return StringUtils.defaultString(msg); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/LogUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/LogUtils.java new file mode 100644 index 0000000..0edb2d9 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/LogUtils.java @@ -0,0 +1,18 @@ +package com.limap.common.utils; + +/** + * 处理并记录日志文件 + * + * @author limap + */ +public class LogUtils +{ + public static String getBlock(Object msg) + { + if (msg == null) + { + msg = ""; + } + return "[" + msg.toString() + "]"; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MailUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MailUtils.java new file mode 100644 index 0000000..9f1903c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MailUtils.java @@ -0,0 +1,135 @@ +package com.limap.common.utils; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.mail.BodyPart; +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; +import javax.mail.internet.MimeUtility; +import java.io.File; +import java.util.*; + +/** + * @author Lenovo + */ +public class MailUtils { + /** + * 发送简单的文本邮件 + * @param contentMap 邮件配置和邮件内容 + */ + public static void sendSimpleMail(Map contentMap){ + //获取系统属性 + Properties pros = new Properties(); + pros.setProperty("mail.transport.protocol", "smtp");// 使用的协议 + pros.setProperty("mail.smtp.host", contentMap.get("host").toString());// 发件人的邮箱的SMTP服务器地址 + pros.setProperty("mail.smtp.auth", "true");// 需要请求认证 + pros.setProperty("mail.user", "小叮塘助手");// 需要请求认证 + //设置邮件服务器 + Session session = Session.getInstance(pros); + + //创建默认的MimeMessage 对象 + MimeMessage msg = new MimeMessage(session); + try { + //邮件发送人 + msg.setFrom(contentMap.get("mailFrom").toString()); + //邮件接收人 + msg.setRecipients(Message.RecipientType.TO, contentMap.get("mailTo").toString()); + //邮件标题头 + msg.setSubject(contentMap.get("mailTittle").toString()); + //邮件发送日期 + msg.setSentDate(new Date()); + //邮件文本内容 + msg.setContent(contentMap.get("mailContent").toString(), "text/html;charset=UTF-8"); + //保存邮件 + msg.saveChanges(); + Transport.send(msg, contentMap.get("mailFrom").toString(), contentMap.get("passwd").toString()); + }catch (Exception mex){ + mex.printStackTrace(); + } + } + /** + * 发送带有附件的邮件 + * @param contentMap 邮件配置和邮件内容 + * @param attachments 邮件附件 + * @return MimeMessage + */ + + public static void SendAttachMail(Map contentMap, List attachments){ + //获取系统属性 + Properties pros = new Properties(); + pros.setProperty("mail.transport.protocol", "smtp");// 使用的协议 + pros.setProperty("mail.smtp.host", contentMap.get("host").toString());// 发件人的邮箱的SMTP服务器地址 + pros.setProperty("mail.smtp.auth", "true");// 需要请求认证 + +// properties.put("mail.smtp.auth",true); +// properties.put("mail.smtp.host", EntityCode.HOST); +// properties.put("mail.user",EntityCode.USER); +// properties.put("mail.password",EntityCode.PWD); + + + //设置邮件服务器 + Session session = Session.getInstance(pros); + // 创建邮件对象 + MimeMessage mimeMessage = new MimeMessage(session); + try { + //邮件发送人 + mimeMessage.setFrom(contentMap.get("mailFrom").toString()); + //邮件接收人 + mimeMessage.setRecipients(Message.RecipientType.TO, contentMap.get("mailTo").toString()); + //邮件主题 + mimeMessage.setSubject(contentMap.get("mailTittle").toString()); + //创建多重消息 + MimeMultipart multipart = new MimeMultipart(); + //邮件正文 + BodyPart contentPart = new MimeBodyPart(); + contentPart.setContent(contentMap.get("mailContent").toString(),"text/html;charset=UTF-8"); + multipart.addBodyPart(contentPart); + //邮件附件 + if(attachments != null) { + for(File attachment : attachments) { + BodyPart attachmentPart = new MimeBodyPart(); + DataSource source = new FileDataSource(attachment); + attachmentPart.setDataHandler(new DataHandler(source)); + //避免中文乱码的处理 + attachmentPart.setFileName(MimeUtility.encodeWord(attachment.getName())); + multipart.addBodyPart(attachmentPart); + } + } + mimeMessage.setContent(multipart,"UTF-8"); + //保存邮件 + mimeMessage.saveChanges(); + Transport.send(mimeMessage, contentMap.get("mailFrom").toString(), contentMap.get("passwd").toString()); + } + catch (Exception mex){ + mex.printStackTrace(); + } + } + + public static void main(String[] args) { + Map map = new HashMap<>(); + map.put("host","smtp.163.com"); + map.put("mailFrom","17863938131@163.com"); + map.put("passwd","DPVROHZZPETWTCDV"); +// map.put("mailTo","niuwj@qdlimap.com"); + map.put("mailTo","623044253@qq.com"); + //标题和内容配置 + map.put("mailTittle","测试发邮件，邮件主题"); + map.put("mailContent","测试发邮件，邮件内容"); + //发送简单邮件 + sendSimpleMail(map); + //附件配置 +// List attaches = new ArrayList<>(); +// File attach1 = new File("./data.csv"); +// File attach2 = new File("./11.log"); +// attaches.add(attach1); +// attaches.add(attach2); +// //发送带附件邮件 +// SendAttachMail(map,attaches); + + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MessageUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MessageUtils.java new file mode 100644 index 0000000..bb45db1 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/MessageUtils.java @@ -0,0 +1,26 @@ +package com.limap.common.utils; + +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import com.limap.common.utils.spring.SpringUtils; + +/** + * 获取i18n资源文件 + * + * @author limap + */ +public class MessageUtils +{ + /** + * 根据消息键和参数 获取消息 委托给spring messageSource + * + * @param code 消息键 + * @param args 参数 + * @return 获取国际化翻译值 + */ + public static String message(String code, Object... args) + { + MessageSource messageSource = SpringUtils.getBean(MessageSource.class); + return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/PageUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/PageUtils.java new file mode 100644 index 0000000..fa18210 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/PageUtils.java @@ -0,0 +1,35 @@ +package com.limap.common.utils; + +import com.github.pagehelper.PageHelper; +import com.limap.common.core.page.PageDomain; +import com.limap.common.core.page.TableSupport; +import com.limap.common.utils.sql.SqlUtil; + +/** + * 分页工具类 + * + * @author limap + */ +public class PageUtils extends PageHelper +{ + /** + * 设置请求分页数据 + */ + public static void startPage() + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + Boolean reasonable = pageDomain.getReasonable(); + PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); + } + + /** + * 清理分页的线程变量 + */ + public static void clearPage() + { + PageHelper.clearPage(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/RegionUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/RegionUtil.java new file mode 100644 index 0000000..869dfb2 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/RegionUtil.java @@ -0,0 +1,114 @@ +package com.limap.common.utils; + +import java.io.File; +import java.io.InputStream; +import java.lang.reflect.Method; +import org.apache.commons.io.FileUtils; +import org.lionsoul.ip2region.DataBlock; +import org.lionsoul.ip2region.DbConfig; +import org.lionsoul.ip2region.DbSearcher; +import org.lionsoul.ip2region.Util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.io.ClassPathResource; + +/** + * 根据ip离线查询地址 + * + * @author limap + */ +public class RegionUtil +{ + private static final Logger log = LoggerFactory.getLogger(RegionUtil.class); + + private static final String JAVA_TEMP_DIR = "java.io.tmpdir"; + + static DbConfig config = null; + static DbSearcher searcher = null; + + /** + * 初始化IP库 + */ + static + { + try + { + // 因为jar无法读取文件,复制创建临时文件 + String dbPath = RegionUtil.class.getResource("/ip2region/ip2region.db").getPath(); + File file = new File(dbPath); + if (!file.exists()) + { + String tmpDir = System.getProperties().getProperty(JAVA_TEMP_DIR); + dbPath = tmpDir + "ip2region.db"; + file = new File(dbPath); + ClassPathResource cpr = new ClassPathResource("ip2region" + File.separator + "ip2region.db"); + InputStream resourceAsStream = cpr.getInputStream(); + if (resourceAsStream != null) + { + FileUtils.copyInputStreamToFile(resourceAsStream, file); + } + } + config = new DbConfig(); + searcher = new DbSearcher(config, dbPath); + log.info("bean [{}]", config); + log.info("bean [{}]", searcher); + } + catch (Exception e) + { + log.error("init ip region error:{}", e); + } + } + + /** + * 解析IP + * + * @param ip + * @return + */ + public static String getRegion(String ip) + { + try + { + // db + if (searcher == null || StringUtils.isEmpty(ip)) + { + log.error("DbSearcher is null"); + return StringUtils.EMPTY; + } + long startTime = System.currentTimeMillis(); + // 查询算法 + int algorithm = DbSearcher.MEMORY_ALGORITYM; + Method method = null; + switch (algorithm) + { + case DbSearcher.BTREE_ALGORITHM: + method = searcher.getClass().getMethod("btreeSearch", String.class); + break; + case DbSearcher.BINARY_ALGORITHM: + method = searcher.getClass().getMethod("binarySearch", String.class); + break; + case DbSearcher.MEMORY_ALGORITYM: + method = searcher.getClass().getMethod("memorySearch", String.class); + break; + } + + DataBlock dataBlock = null; + if (Util.isIpAddress(ip) == false) + { + log.warn("warning: Invalid ip address"); + } + dataBlock = (DataBlock) method.invoke(searcher, ip); + String result = dataBlock.getRegion(); + long endTime = System.currentTimeMillis(); + log.debug("region use time[{}] result[{}]", endTime - startTime, result); + return result; + + } + catch (Exception e) + { + log.error("error:{}", e); + } + return StringUtils.EMPTY; + } + +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/SecurityUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/SecurityUtils.java new file mode 100644 index 0000000..c7d8bf8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/SecurityUtils.java @@ -0,0 +1,120 @@ +package com.limap.common.utils; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import com.limap.common.constant.HttpStatus; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.exception.ServiceException; + +/** + * 安全服务工具类 + * + * @author limap + */ +public class SecurityUtils +{ + /** + * 用户ID + **/ + public static Long getUserId() + { + try + { + return getLoginUser().getUserId(); + } + catch (Exception e) + { + throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取部门ID + **/ + public static Long getDeptId() + { + try + { + return getLoginUser().getDeptId(); + } + catch (Exception e) + { + throw new ServiceException("获取部门ID异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取用户账户 + **/ + public static String getUsername() + { + try + { + return getLoginUser().getUsername(); + } + catch (Exception e) + { + throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取用户 + **/ + public static LoginUser getLoginUser() + { + try + { + return (LoginUser) getAuthentication().getPrincipal(); + } + catch (Exception e) + { + throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * 获取Authentication + */ + public static Authentication getAuthentication() + { + return SecurityContextHolder.getContext().getAuthentication(); + } + + /** + * 生成BCryptPasswordEncoder密码 + * + * @param password 密码 + * @return 加密字符串 + */ + public static String encryptPassword(String password) + { + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.encode(password); + } + + /** + * 判断密码是否相同 + * + * @param rawPassword 真实密码 + * @param encodedPassword 加密后字符 + * @return 结果 + */ + public static boolean matchesPassword(String rawPassword, String encodedPassword) + { + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + return passwordEncoder.matches(rawPassword, encodedPassword); + } + + /** + * 是否为管理员 + * + * @param userId 用户ID + * @return 结果 + */ + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ServletUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ServletUtils.java new file mode 100644 index 0000000..27395fe --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ServletUtils.java @@ -0,0 +1,218 @@ +package com.limap.common.utils; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import com.limap.common.constant.Constants; +import com.limap.common.core.text.Convert; + +/** + * 客户端工具类 + * + * @author limap + */ +public class ServletUtils +{ + /** + * 获取String参数 + */ + public static String getParameter(String name) + { + return getRequest().getParameter(name); + } + + /** + * 获取String参数 + */ + public static String getParameter(String name, String defaultValue) + { + return Convert.toStr(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取Integer参数 + */ + public static Integer getParameterToInt(String name) + { + return Convert.toInt(getRequest().getParameter(name)); + } + + /** + * 获取Integer参数 + */ + public static Integer getParameterToInt(String name, Integer defaultValue) + { + return Convert.toInt(getRequest().getParameter(name), defaultValue); + } + + /** + * 获取Boolean参数 + */ + public static Boolean getParameterToBool(String name) + { + return Convert.toBool(getRequest().getParameter(name)); + } + + /** + * 获取Boolean参数 + */ + public static Boolean getParameterToBool(String name, Boolean defaultValue) + { + return Convert.toBool(getRequest().getParameter(name), defaultValue); + } + + /** + * 获得所有请求参数 + * + * @param request 请求对象{@link ServletRequest} + * @return Map + */ + public static Map getParams(ServletRequest request) + { + final Map map = request.getParameterMap(); + return Collections.unmodifiableMap(map); + } + + /** + * 获得所有请求参数 + * + * @param request 请求对象{@link ServletRequest} + * @return Map + */ + public static Map getParamMap(ServletRequest request) + { + Map params = new HashMap<>(); + for (Map.Entry entry : getParams(request).entrySet()) + { + params.put(entry.getKey(), StringUtils.join(entry.getValue(), ",")); + } + return params; + } + + /** + * 获取request + */ + public static HttpServletRequest getRequest() + { + return getRequestAttributes().getRequest(); + } + + /** + * 获取response + */ + public static HttpServletResponse getResponse() + { + return getRequestAttributes().getResponse(); + } + + /** + * 获取session + */ + public static HttpSession getSession() + { + return getRequest().getSession(); + } + + public static ServletRequestAttributes getRequestAttributes() + { + RequestAttributes attributes = RequestContextHolder.getRequestAttributes(); + return (ServletRequestAttributes) attributes; + } + + /** + * 将字符串渲染到客户端 + * + * @param response 渲染对象 + * @param string 待渲染的字符串 + */ + public static void renderString(HttpServletResponse response, String string) + { + try + { + response.setStatus(200); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().print(string); + } + catch (IOException e) + { + e.printStackTrace(); + } + } + + /** + * 是否是Ajax异步请求 + * + * @param request + */ + public static boolean isAjaxRequest(HttpServletRequest request) + { + String accept = request.getHeader("accept"); + if (accept != null && accept.contains("application/json")) + { + return true; + } + + String xRequestedWith = request.getHeader("X-Requested-With"); + if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) + { + return true; + } + + String uri = request.getRequestURI(); + if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) + { + return true; + } + + String ajax = request.getParameter("__ajax"); + return StringUtils.inStringIgnoreCase(ajax, "json", "xml"); + } + + /** + * 内容编码 + * + * @param str 内容 + * @return 编码后的内容 + */ + public static String urlEncode(String str) + { + try + { + return URLEncoder.encode(str, Constants.UTF8); + } + catch (UnsupportedEncodingException e) + { + return StringUtils.EMPTY; + } + } + + /** + * 内容解码 + * + * @param str 内容 + * @return 解码后的内容 + */ + public static String urlDecode(String str) + { + try + { + return URLDecoder.decode(str, Constants.UTF8); + } + catch (UnsupportedEncodingException e) + { + return StringUtils.EMPTY; + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/StringUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/StringUtils.java new file mode 100644 index 0000000..e6dbf18 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/StringUtils.java @@ -0,0 +1,624 @@ +package com.limap.common.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; + +import org.springframework.util.AntPathMatcher; +import com.limap.common.constant.Constants; +import com.limap.common.core.text.StrFormatter; + +/** + * 字符串工具类 + * + * @author limap + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils +{ + /** 空字符串 */ + private static final String NULLSTR = ""; + + /** 下划线 */ + private static final char SEPARATOR = '_'; + + /** + * 获取参数不为空值 + * + * @param value defaultValue 要判断的value + * @return value 返回值 + */ + public static T nvl(T value, T defaultValue) + { + return value != null ? value : defaultValue; + } + + /** + * * 判断一个Collection是否为空， 包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Collection coll) + { + return isNull(coll) || coll.isEmpty(); + } + + /** + * * 判断一个Collection是否非空，包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Collection coll) + { + return !isEmpty(coll); + } + + /** + * * 判断一个对象数组是否为空 + * + * @param objects 要判断的对象数组 + ** @return true：为空 false：非空 + */ + public static boolean isEmpty(Object[] objects) + { + return isNull(objects) || (objects.length == 0); + } + + /** + * * 判断一个对象数组是否非空 + * + * @param objects 要判断的对象数组 + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Object[] objects) + { + return !isEmpty(objects); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Map map) + { + return isNull(map) || map.isEmpty(); + } + + /** + * * 判断一个Map是否为空 + * + * @param map 要判断的Map + * @return true：非空 false：空 + */ + public static boolean isNotEmpty(Map map) + { + return !isEmpty(map); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true：为空 false：非空 + */ + public static boolean isEmpty(String str) + { + return isNull(str) || NULLSTR.equals(str.trim()); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true：非空串 false：空串 + */ + public static boolean isNotEmpty(String str) + { + return !isEmpty(str); + } + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true：为空 false：非空 + */ + public static boolean isNull(Object object) + { + return object == null; + } + + /** + * * 判断一个对象是否非空 + * + * @param object Object + * @return true：非空 false：空 + */ + public static boolean isNotNull(Object object) + { + return !isNull(object); + } + + /** + * * 判断一个对象是否是数组类型（Java基本型别的数组） + * + * @param object 对象 + * @return true：是数组 false：不是数组 + */ + public static boolean isArray(Object object) + { + return isNotNull(object) && object.getClass().isArray(); + } + + /** + * 去空格 + */ + public static String trim(String str) + { + return (str == null ? "" : str.trim()); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) + { + if (str == null) + { + return NULLSTR; + } + + if (start < 0) + { + start = str.length() + start; + } + + if (start < 0) + { + start = 0; + } + if (start > str.length()) + { + return NULLSTR; + } + + return str.substring(start); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) + { + if (str == null) + { + return NULLSTR; + } + + if (end < 0) + { + end = str.length() + end; + } + if (start < 0) + { + start = str.length() + start; + } + + if (end > str.length()) + { + end = str.length(); + } + + if (start > end) + { + return NULLSTR; + } + + if (start < 0) + { + start = 0; + } + if (end < 0) + { + end = 0; + } + + return str.substring(start, end); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板，被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) + { + if (isEmpty(params) || isEmpty(template)) + { + return template; + } + return StrFormatter.format(template, params); + } + + /** + * 是否为http(s)://开头 + * + * @param link 链接 + * @return 结果 + */ + public static boolean ishttp(String link) + { + return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS); + } + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static final Set str2Set(String str, String sep) + { + return new HashSet(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static final List str2List(String str, String sep, boolean filterBlank, boolean trim) + { + List list = new ArrayList(); + if (StringUtils.isEmpty(str)) + { + return list; + } + + // 过滤空白字符串 + if (filterBlank && StringUtils.isBlank(str)) + { + return list; + } + String[] split = str.split(sep); + for (String string : split) + { + if (filterBlank && StringUtils.isBlank(string)) + { + continue; + } + if (trim) + { + string = string.trim(); + } + list.add(string); + } + + return list; + } + + /** + * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value + * + * @param set 给定的集合 + * @param array 给定的数组 + * @return boolean 结果 + */ + public static boolean containsAny(Collection collection, String... array) + { + if (isEmpty(collection) || isEmpty(array)) + { + return false; + } + else + { + for (String str : array) + { + if (collection.contains(str)) + { + return true; + } + } + return false; + } + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) + { + if (isEmpty(cs) || isEmpty(searchCharSequences)) + { + return false; + } + for (CharSequence testStr : searchCharSequences) + { + if (containsIgnoreCase(cs, testStr)) + { + return true; + } + } + return false; + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) + { + if (str == null) + { + return null; + } + StringBuilder sb = new StringBuilder(); + // 前置字符是否大写 + boolean preCharIsUpperCase = true; + // 当前字符是否大写 + boolean curreCharIsUpperCase = true; + // 下一字符是否大写 + boolean nexteCharIsUpperCase = true; + for (int i = 0; i < str.length(); i++) + { + char c = str.charAt(i); + if (i > 0) + { + preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1)); + } + else + { + preCharIsUpperCase = false; + } + + curreCharIsUpperCase = Character.isUpperCase(c); + + if (i < (str.length() - 1)) + { + nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1)); + } + + if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) + { + sb.append(SEPARATOR); + } + else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) + { + sb.append(SEPARATOR); + } + sb.append(Character.toLowerCase(c)); + } + + return sb.toString(); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) + { + if (str != null && strs != null) + { + for (String s : strs) + { + if (str.equalsIgnoreCase(trim(s))) + { + return true; + } + } + } + return false; + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) + { + StringBuilder result = new StringBuilder(); + // 快速检查 + if (name == null || name.isEmpty()) + { + // 没必要转换 + return ""; + } + else if (!name.contains("_")) + { + // 不含下划线，仅将首字母大写 + return name.substring(0, 1).toUpperCase() + name.substring(1); + } + // 用下划线将原始字符串分割 + String[] camels = name.split("_"); + for (String camel : camels) + { + // 跳过原始字符串中开头、结尾的下换线或双重下划线 + if (camel.isEmpty()) + { + continue; + } + // 首字母大写 + result.append(camel.substring(0, 1).toUpperCase()); + result.append(camel.substring(1).toLowerCase()); + } + return result.toString(); + } + + /** + * 驼峰式命名法 + * 例如：user_name->userName + */ + public static String toCamelCase(String s) + { + if (s == null) + { + return null; + } + if (s.indexOf(SEPARATOR) == -1) + { + return s; + } + s = s.toLowerCase(); + StringBuilder sb = new StringBuilder(s.length()); + boolean upperCase = false; + for (int i = 0; i < s.length(); i++) + { + char c = s.charAt(i); + + if (c == SEPARATOR) + { + upperCase = true; + } + else if (upperCase) + { + sb.append(Character.toUpperCase(c)); + upperCase = false; + } + else + { + sb.append(c); + } + } + return sb.toString(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) + { + if (isEmpty(str) || isEmpty(strs)) + { + return false; + } + for (String pattern : strs) + { + if (isMatch(pattern, str)) + { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) + { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + @SuppressWarnings("unchecked") + public static T cast(Object obj) + { + return (T) obj; + } + + /** + * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。 + * + * @param num 数字对象 + * @param size 字符串指定长度 + * @return 返回数字的字符串格式，该字符串为指定长度。 + */ + public static final String padl(final Number num, final int size) + { + return padl(num.toString(), size, '0'); + } + + /** + * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。 + * + * @param s 原始字符串 + * @param size 字符串指定长度 + * @param c 用于补齐的字符 + * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。 + */ + public static final String padl(final String s, final int size, final char c) + { + final StringBuilder sb = new StringBuilder(size); + if (s != null) + { + final int len = s.length(); + if (s.length() <= size) + { + for (int i = size - len; i > 0; i--) + { + sb.append(c); + } + sb.append(s); + } + else + { + return s.substring(len - size, len); + } + } + else + { + for (int i = size; i > 0; i--) + { + sb.append(c); + } + } + return sb.toString(); + } + + public static boolean isPhoneNumberValid(String phoneNumber) { + // 中国大陆手机号正则表达式 +// String regex = "^1[3-9]\\d{9}$"; + String regExp = "^((13[0-9])|(14[5,7,9])|(15[0-3,5-9])|(166)|(17[3,5,6,7,8])|(18[0-9])|(19[8,9]))\\d{8}$"; + Pattern pattern = Pattern.compile(regExp); + return pattern.matcher(phoneNumber).matches(); + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Threads.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Threads.java new file mode 100644 index 0000000..51f397b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/Threads.java @@ -0,0 +1,99 @@ +package com.limap.common.utils; + +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 线程相关工具类. + * + * @author limap + */ +public class Threads +{ + private static final Logger logger = LoggerFactory.getLogger(Threads.class); + + /** + * sleep等待,单位为毫秒 + */ + public static void sleep(long milliseconds) + { + try + { + Thread.sleep(milliseconds); + } + catch (InterruptedException e) + { + return; + } + } + + /** + * 停止线程池 + * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务. + * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数. + * 如果仍然超時，則強制退出. + * 另对在shutdown时线程本身被调用中断做了处理. + */ + public static void shutdownAndAwaitTermination(ExecutorService pool) + { + if (pool != null && !pool.isShutdown()) + { + pool.shutdown(); + try + { + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) + { + pool.shutdownNow(); + if (!pool.awaitTermination(120, TimeUnit.SECONDS)) + { + logger.info("Pool did not terminate"); + } + } + } + catch (InterruptedException ie) + { + pool.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + } + + /** + * 打印线程异常信息 + */ + public static void printException(Runnable r, Throwable t) + { + if (t == null && r instanceof Future) + { + try + { + Future future = (Future) r; + if (future.isDone()) + { + future.get(); + } + } + catch (CancellationException ce) + { + t = ce; + } + catch (ExecutionException ee) + { + t = ee.getCause(); + } + catch (InterruptedException ie) + { + Thread.currentThread().interrupt(); + } + } + if (t != null) + { + logger.error(t.getMessage(), t); + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/ALiConfigEntity.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/ALiConfigEntity.java new file mode 100644 index 0000000..a128878 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/ALiConfigEntity.java @@ -0,0 +1,16 @@ +package com.limap.common.utils.ali; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +@Component +@Order(1) +@ConfigurationProperties(prefix = "ali") +@Data +public class ALiConfigEntity { + + private String accessKeyId; + private String accessKeySecret; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/CallUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/CallUtil.java new file mode 100644 index 0000000..d24b306 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/CallUtil.java @@ -0,0 +1,10 @@ +package com.limap.common.utils.ali; + +import org.springframework.stereotype.Component; + +/** + * @author jjb + */ +@Component +public class CallUtil { +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/SendSmsUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/SendSmsUtil.java new file mode 100644 index 0000000..f9f9793 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/SendSmsUtil.java @@ -0,0 +1,70 @@ +package com.limap.common.utils.ali; + +import com.alibaba.fastjson2.JSONObject; +import com.aliyun.dysmsapi20170525.models.SendSmsResponse; +import com.aliyun.tea.*; + +import javax.annotation.Resource; + +/** + * 阿里云短信发送 + * @author limap + */ +public class SendSmsUtil { + + @Resource + private ALiConfigEntity aLiConfigEntity; + + + /** + * 发送短信验证码 + * @param param 验证码 + * @param tel 发送手机号 + * @throws Exception + */ + public static boolean sendCodeSms(JSONObject param, String tel) throws Exception { + com.aliyun.dysmsapi20170525.Client client = createClient("LTAI5tKv3CygUJwCd8W9p6aR", "KjOSdAMh4Tgdyj0he1mM5xk6JBYiY5"); + com.aliyun.dysmsapi20170525.models.SendSmsRequest sendSmsRequest = new com.aliyun.dysmsapi20170525.models.SendSmsRequest() + .setPhoneNumbers(tel) + .setSignName("鱼测云") + .setTemplateCode("SMS_465720430") + .setTemplateParam(param.toJSONString()); + com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); + try { + // 复制代码运行请自行打印 API 的返回值 + SendSmsResponse sendSmsResponse = client.sendSmsWithOptions(sendSmsRequest, runtime); + String statusCode = sendSmsResponse.getBody().getCode(); + if("OK".equals(statusCode)){ + return true; + } + } catch (TeaException error) { + // 错误 message + System.out.println(error.getMessage()); + // 诊断地址 + System.out.println(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } catch (Exception _error) { + TeaException error = new TeaException(_error.getMessage(), _error); + // 错误 message + System.out.println(error.getMessage()); + // 诊断地址 + System.out.println(error.getData().get("Recommend")); + com.aliyun.teautil.Common.assertAsString(error.message); + } + return false; + } + + + + public static com.aliyun.dysmsapi20170525.Client createClient(String accessKeyId, String accessKeySecret) throws Exception { + com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() + // 必填，您的 AccessKey ID + .setAccessKeyId(accessKeyId) + // 必填，您的 AccessKey Secret + .setAccessKeySecret(accessKeySecret); + // Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi + config.endpoint = "dysmsapi.aliyuncs.com"; + return new com.aliyun.dysmsapi20170525.Client(config); + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/AbstractManager.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/AbstractManager.java new file mode 100644 index 0000000..36400f8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/AbstractManager.java @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2014-2016 Alibaba Group. All rights reserved. + * License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.limap.common.utils.ali.iot; + +import com.aliyuncs.AcsResponse; +import com.aliyuncs.CommonRequest; +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.RpcAcsRequest; +import com.aliyuncs.http.MethodType; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +public class AbstractManager { + + private static DefaultAcsClient client; + + /** + * 初始化客户端 + * 用户的 ak + * 用户的 Secret + */ + static { + client = IotClient.getClient(); + } + + /** + * 接口请求地址 action 接口名称 domain 线上地址 version 接口版本 + */ + public static CommonRequest executeTests(String action) { + CommonRequest request = new CommonRequest(); + request.setDomain(IotClient.getDomain()); + request.setMethod(MethodType.POST); + request.setVersion(IotClient.getVersion()); + request.setAction(action); + + return request; + } + + //@SuppressWarnings({ "unchecked", "rawtypes" }) + public static AcsResponse executeTest(RpcAcsRequest request) { + AcsResponse response = null; + try { + response = client.getAcsResponse(request); + } catch (Exception e) { + LogUtil.print("执行失败：e:" + e.getMessage()); + } + return response; + } + + public static DefaultAcsClient getClient() { + return client; + } + + public void showResult(Object response) { + if (response == null) { + System.err.println("null response can not be invocked."); + return; + } + Class objClass = response.getClass(); + + try { + Method method1 = objClass.getDeclaredMethod("getRequestId"); + String requestId = (String)method1.invoke(response); + System.out.println("requestId: " + requestId); + + Method method2 = objClass.getDeclaredMethod("getCode"); + String code = (String)method2.invoke(response); + System.out.println("code: " + code); + + Method method3 = objClass.getDeclaredMethod("getErrorMessage"); + String errorMessage = (String)method3.invoke(response); + System.out.println("errorMessage: " + errorMessage); + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ClientUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ClientUtil.java new file mode 100644 index 0000000..7c6b783 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ClientUtil.java @@ -0,0 +1,150 @@ +package com.limap.common.utils.ali.iot; + +import com.alibaba.cloudapi.sdk.model.ApiResponse; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.limap.common.utils.http.HttpUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Component; + +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; + +@Slf4j +@Component +public class ClientUtil { + final static String appKey ="334224397"; +// final static String appKey ="LTAI5tKv3CygUJwCd8W9p6aR"; + final static String appSecret = "70de3018ec39423e9ca1e1b6a6a84ad6"; +// final static String appSecret = "KjOSdAMh4Tgdyj0he1mM5xk6JBYiY5"; + + public static ApiResponse postRequestDemo(IoTApiRequest request,String path) throws UnsupportedEncodingException { + IoTApiClientBuilderParams builderParams = new IoTApiClientBuilderParams(); + builderParams.setAppKey(appKey); + builderParams.setAppSecret(appSecret); + SyncApiClient syncClient = new SyncApiClient(builderParams); + + + //请求参数域名、path、request + String host = "api.link.aliyun.com"; + ApiResponse response = syncClient.postBody(host, path, request); + + log.info( + "response code = " + response.getCode() + " response content = " + new String(response.getBody(), + "utf-8")); + return response; + } + + public String getCloudToken() { + String s = HttpUtils.sendGet("http://120.46.184.148:6232/assistant/weatherHourData"); + return s.substring(1,s.length()-1); + } + + public Boolean propertiesSet(String iotId,String items) { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + //设置参数 + request.putParam("iotId", iotId); + request.putParam("items",items); + try { + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/properties/set"); + System.out.println(JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8))); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + Integer code = jsonObject.getInteger("code"); + return code.equals(200); + }catch (Exception e) { + log.error("设备属性设置失败,设备id:{},设置参数{}，失败原因{}",iotId,items,e.getMessage()); + return false; + } + } + + /** + * + * @param iotId + * @param items + * @return + */ + public Boolean propertiesSet(String iotId,Object items) { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + //设置参数 + request.putParam("iotId", iotId); + request.putParam("items",items); + try { + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/properties/set"); + System.out.println(JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8))); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + Integer code = jsonObject.getInteger("code"); + return code.equals(200); + }catch (Exception e) { + log.error("设备属性设置失败,设备id:{},设置参数{}，失败原因{}",iotId,items.toString(),e.getMessage()); + return false; + } + } + + public JSONArray propertiesGet(String iotId) { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + //设置参数 + request.putParam("iotId", iotId); + try { + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/properties/get"); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + return jsonObject.getJSONArray("data"); + }catch (Exception e) { + + return null; + } + } + + public JSONObject thingInfoGet(String cloudToken,String iotId) { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + request.setCloudToken(cloudToken); + //设置参数 + request.putParam("iotId", iotId); + try { + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/info/get"); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + return jsonObject.getJSONObject("data"); + }catch (Exception e) { + return null; + } + } + + public JSONObject thingStatusGet(String iotId) { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + //设置参数 + request.putParam("iotId", iotId); + try { + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/status/get"); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + return jsonObject.getJSONObject("data"); + }catch (Exception e) { + try{ + HttpUtils.sendGet("http://localhost:6223/assistant/weatherHourData/refresh"); + return thingStatusGet(iotId); + }catch (Exception ec){ + + } + return null; + } + } + + public static void main(String[] args) throws UnsupportedEncodingException { + IoTApiRequest request = new IoTApiRequest(); + request.setApiVer("1.0.2"); + request.setCloudToken("f5bef20cc3b24cb18a069a0d3a0009e6"); + JSONObject object = JSONObject.parseObject("{\"rated_voltage\":{\"phase\":\"A\",\"voltage\":220}}"); + //设置参数 + request.putParam("deviceName", "866145063650952"); + request.putParam("productKey", "a1g8Z6yzWqv"); + request.putParam("items",object); + + ApiResponse apiResponse = ClientUtil.postRequestDemo(request, "/cloud/thing/properties/set"); + JSONObject jsonObject = JSONObject.parseObject(new String(apiResponse.getBody(), StandardCharsets.UTF_8)); + System.out.println(jsonObject); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/DeviceManager.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/DeviceManager.java new file mode 100644 index 0000000..10b6b6d --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/DeviceManager.java @@ -0,0 +1,753 @@ +package com.limap.common.utils.ali.iot; + +import com.alibaba.fastjson.JSON; +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.iot.model.v20180120.*; + +import java.util.List; + +public class DeviceManager extends AbstractManager { + + private static DefaultAcsClient client = AbstractManager.getClient(); + + /** + * 注册设备 + * + * @param productKey 产品名称 必须 + * @param deviceName 设备命名 非必须 + * @return 产品创建信息 + */ + public static RegisterDeviceResponse.Data registerDevice(String productKey, String deviceName) { + + RegisterDeviceResponse response = null; + + RegisterDeviceRequest request = new RegisterDeviceRequest(); + request.setDeviceName(deviceName); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("注册设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("注册设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("注册设备失败！" + JSON.toJSONString(response.getData())); + } + return null; + } + + /** + * 删除设备。 + * + * @param productKey 产品名称 非必须 + * @param deviceName 设备的名称 非必须 + * @param iotId 设备ID 非必须 + * @return 产品创建信息 + */ + public static void deleteDevice(String iotId, String productKey, String deviceName) { + + DeleteDeviceResponse response = null; + + DeleteDeviceRequest request = new DeleteDeviceRequest(); + request.setProductKey(productKey); + request.setIotId(iotId); + request.setDeviceName(deviceName); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("删除设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("删除设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("删除设备失败！" + JSON.toJSONString(response)); + } + } + + /** + * 查询指定设备的详细信息 + * + * @param iotId 设备ID 非必须 + * @param productKey 设备所隶属的产品Key。 非必须 + * @param deviceName 设备名 非必须 + * @return 产品创建信息 + */ + public static QueryDeviceDetailResponse.Data queryDeviceDetail(String iotId, String productKey, String deviceName) { + + QueryDeviceDetailResponse response = null; + QueryDeviceDetailRequest request = new QueryDeviceDetailRequest(); + request.setIotId(iotId); + request.setDeviceName(deviceName); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询设备详细信息成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询设备详细信息失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询设备详细信息失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定产品下的所有设备列表。 + * + * @param productKey 产品名称 必须 + * @param pageSize 设备命名 非必须 + * @param currentPage 设备命名 非必须 + * @return 产品创建信息 + */ + public static List queryDevice(String productKey, Integer pageSize, + Integer currentPage) { + + QueryDeviceResponse response = null; + QueryDeviceRequest request = new QueryDeviceRequest(); + request.setProductKey(productKey); + request.setCurrentPage(currentPage); + request.setPageSize(pageSize); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("产品下设备列表查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("产品下设备列表查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("产品下设备列表查询失败！" + JSON.toJSONString(response.getData())); + } + return null; + } + + /** + * 批量注册多个设备 + * + * @param productKey 产品名称 必须 + * @param count 设备的数量 必须 + * @Des 描述： + */ + public static BatchRegisterDeviceResponse.Data batchRegisterDevice(String productKey, Integer count) { + + BatchRegisterDeviceResponse response = null; + BatchRegisterDeviceRequest registerDeviceRequest = new BatchRegisterDeviceRequest(); + registerDeviceRequest.setCount(count); + registerDeviceRequest.setProductKey(productKey); + + try { + response = client.getAcsResponse(registerDeviceRequest); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量命名设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量命名设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量命名设备失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 在指定产品下批量自定义设备名称 + * + * @param productKey 产品名称 非必须 + * @param deviceNames 设备的名称 非必须 描述： 该接口需要和BatchRegisterDeviceWithApplyId接口结合使用，实现在一个产品下批量注册（即新建） + * 多个设备，并且为每个设备单独命名。单次调用，最多能传入1,000 个设备名称。 + */ + public static BatchCheckDeviceNamesResponse.Data batchCheckDeviceNames(String productKey, + List deviceNames) { + + BatchCheckDeviceNamesResponse response = null; + BatchCheckDeviceNamesRequest request = new BatchCheckDeviceNamesRequest(); + request.setDeviceNames(deviceNames); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量命名设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量命名设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量命名设备失败！" + JSON.toJSONString(response.getData())); + } + return null; + } + + /** + * 根据申请批次ID（ApplyId）批量注册设备 + * + * @param productKey 产品名称 必须 + * @param applyId 要批量注册的设备的申请批次ID。申请批次ID由调用BatchCheckDeviceNames接口返回。 必须 + * @Des 描述： 该接口需要和BatchCheckDeviceNames接口结合使用，实现在一个产品下批量注册（即新建）多个设备，并且为每个设备单独命名。 + */ + public static BatchRegisterDeviceWithApplyIdResponse.Data batchRegisterDeviceWithApplyId(String productKey, + Long applyId) { + + BatchRegisterDeviceWithApplyIdResponse response = null; + BatchRegisterDeviceWithApplyIdRequest request = new BatchRegisterDeviceWithApplyIdRequest(); + request.setApplyId(applyId); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量注册设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量注册设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量注册设备失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询批量注册设备申请的处理状态和结果 + * + * @param productKey 产品名称 必须 + * @param applyId 设备的数量 必须 + * @Des 描述： + */ + public static QueryBatchRegisterDeviceStatusResponse.Data queryBatchRegisterDeviceStatus(String productKey, + Long applyId) { + QueryBatchRegisterDeviceStatusResponse response = null; + QueryBatchRegisterDeviceStatusRequest request = new QueryBatchRegisterDeviceStatusRequest(); + request.setApplyId(applyId); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询批量注册设备申请成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询批量注册设备申请失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询批量注册设备申请失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询批量注册的设备信息 + * + * @param applyId 产品名称 必须 + * @param pageSize 必须 + * @param currentPage 必须 + * @Des 描述： + */ + public static List queryPageByApplyId(Long applyId, Integer pageSize, + Integer currentPage) { + QueryPageByApplyIdResponse response = null; + QueryPageByApplyIdRequest request = new QueryPageByApplyIdRequest(); + request.setApplyId(applyId); + request.setCurrentPage(currentPage); + request.setPageSize(pageSize); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询批量注册的设备信息成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询批量注册的设备信息失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getApplyDeviceList(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询批量注册的设备信息失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定产品下的设备统计数据 + * + * @param productKey 设备所隶属的产品Key + * @Des 描述： + */ + public static QueryDeviceStatisticsResponse.Data queryDeviceStatistics(String productKey) { + + QueryDeviceStatisticsResponse response = new QueryDeviceStatisticsResponse(); + QueryDeviceStatisticsRequest request = new QueryDeviceStatisticsRequest(); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询批量注册的设备信息成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询批量注册的设备信息失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询批量注册的设备信息失败！" + JSON.toJSONString(response)); + } + return null; + } + + /********************************操作设备***************************/ + + /** + * 查看指定设备的运行状态 + * + * @param productKey 产品名称 非必须 + * @param deviceName 设备的名称 非必须 + * @param iotId 设备ID 非必须 + * @return 产品创建信息 + */ + public static GetDeviceStatusResponse.Data getDeviceStatus(String productKey, String deviceName, String iotId) { + + GetDeviceStatusResponse response = null; + GetDeviceStatusRequest request = new GetDeviceStatusRequest(); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setIotId(iotId); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("设备状态查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("设备状态查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("设备状态查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 批量查看指定设备的运行状态 + * + * @param productKey 产品名称 非必须 + * @param deviceNames 设备的名称 非必须 + * @return 产品创建信息 + */ + public static List batchGetDeviceState(String productKey, + List deviceNames) { + + BatchGetDeviceStateResponse response = null; + BatchGetDeviceStateRequest request = new BatchGetDeviceStateRequest(); + request.setDeviceNames(deviceNames); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量设备状态查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量设备状态查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getDeviceStatusList(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量设备状态查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 禁用指定设备 + * + * @param iotId 设备的名称 非必须 + * @param productKey 产品名称 非必须 + * @param deviceName 设备的名称 非必须 + * @return 产品创建信息 + */ + public static void disableThing(String iotId, String productKey, String deviceName) { + DisableThingResponse response = null; + DisableThingRequest request = new DisableThingRequest(); + request.setDeviceName(deviceName); + request.setIotId(iotId); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("禁用设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("禁用设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("禁用设备失败！" + JSON.toJSONString(response)); + } + } + + /** + * 启用指定设备 + * + * @param iotId 设备的名称 非必须 + * @param productKey 产品名称 非必须 + * @param deviceName 设备的名称 非必须 + * @return 产品创建信息 + */ + public static void enableThing(String iotId, String productKey, String deviceName) { + EnableThingResponse response = null; + EnableThingRequest request = new EnableThingRequest(); + request.setIotId(iotId); + request.setDeviceName(deviceName); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("启用设备成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("启用设备失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("启用设备失败！" + JSON.toJSONString(response)); + } + } + + /** + * 批量查询设备详情。 + * + * @param productKey 产品PK 必需 + * @param deviceName 指定要查询的设备名称列表。最多可包含100个设备名称。必需 + */ + public static List batchQueryDeviceDetail(String productKey, + List deviceName) { + + BatchQueryDeviceDetailResponse response = null; + BatchQueryDeviceDetailRequest request = new BatchQueryDeviceDetailRequest(); + request.setProductKey(productKey); + request.setDeviceNames(deviceName); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量查询设备详情成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量查询设备详情失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量查询设备详情失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备上传到物联网平台的所有文件。 + * + * @param iotId 要查询的设备ID，设备唯一标识符。 + * @param productKey 产品PK + * @param deviceName 要查询的设备的名称 + * @param pageSize 产品PK 必需 + * @param currentPage 产品PK 必需 + */ + public static List queryDeviceFileList(String iotId, String productKey, + String deviceName, Integer pageSize, + Integer currentPage) { + QueryDeviceFileListResponse response = null; + QueryDeviceFileListRequest request = new QueryDeviceFileListRequest(); + request.setProductKey(productKey); + request.setIotId(iotId); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setCurrentPage(currentPage); + request.setPageSize(pageSize); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询指定设备上传到物联网平台的所有文件成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询指定设备上传到物联网平台的所有文件失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询指定设备上传到物联网平台的所有文件失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备上传到物联网平台的指定文件信息。 + * + * @param iotId 要查询的设备ID，设备唯一标识符。 + * @param productKey 产品PK + * @param deviceName 要查询的设备的名称 + * @param fileId 文件标识符 必需 + */ + public static QueryDeviceFileResponse.Data queryDeviceFile(String iotId, String productKey, String deviceName, + String fileId) { + QueryDeviceFileResponse response = null; + QueryDeviceFileRequest request = new QueryDeviceFileRequest(); + request.setIotId(iotId); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setFileId(fileId); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询指定设备上传到物联网平台的指定文件信息成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询指定设备上传到物联网平台的指定文件信息失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询指定设备上传到物联网平台的指定文件信息失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 删除指定设备上传到物联网平台的指定文件。 + * + * @param iotId 要查询的设备ID，设备唯一标识符。 + * @param productKey 产品PK + * @param deviceName 要查询的设备的名称 + * @param fileId 文件标识符 必需 + */ + public static void deleteDeviceFile(String iotId, String productKey, String deviceName, String fileId) { + DeleteDeviceFileResponse response = null; + DeleteDeviceFileRequest request = new DeleteDeviceFileRequest(); + request.setIotId(iotId); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setFileId(fileId); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("删除指定设备上传到物联网平台的指定文件成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("删除指定设备上传到物联网平台的指定文件失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("删除指定设备上传到物联网平台的指定文件失败！" + JSON.toJSONString(response)); + } + } + + /** + * 批量更新设备备注名称 + * + * @param deviceNicknameInfos 包含设备标识参数（ProductKey和DeviceName组合或IotId）和备注名称参数（Nickname） 必需 + */ + public static void batchUpdateDeviceNickname( + List deviceNicknameInfos) { + BatchUpdateDeviceNicknameResponse response = null; + BatchUpdateDeviceNicknameRequest request = new BatchUpdateDeviceNicknameRequest(); + + request.setDeviceNicknameInfos(deviceNicknameInfos); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量更新设备备注名称成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量更新设备备注名称失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量更新设备备注名称失败！" + JSON.toJSONString(response)); + } + + } + + /** + * 查询账号下的LoRaWAN入网凭证列表。 + */ + public static List queryLoRaJoinPermissions() { + QueryLoRaJoinPermissionsResponse response = null; + QueryLoRaJoinPermissionsRequest request = new QueryLoRaJoinPermissionsRequest(); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询账号下的LoRaWAN入网凭证列表成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询账号下的LoRaWAN入网凭证列表失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + return response.getJoinPermissions(); + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询账号下的LoRaWAN入网凭证列表失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 创建批量注册LoRaWAN设备的任务。 + * + * @param productKey 产品PK 必需 + * @param deviceInfos LoRaWAN设备信息列表 必需 \ + */ + public static CreateLoRaNodesTaskResponse createLoRaNodesTask(String productKey, + List deviceInfos) { + CreateLoRaNodesTaskResponse response = null; + CreateLoRaNodesTaskRequest request = new CreateLoRaNodesTaskRequest(); + request.setProductKey(productKey); + request.setDeviceInfos(deviceInfos); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("创建批量注册LoRaWAN设备的任务成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("创建批量注册LoRaWAN设备的任务失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + return response; + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("创建批量注册LoRaWAN设备的任务失败！" + JSON.toJSONString(response)); + } + return null; + + } + + /** + * 查询批量注册LoRaWAN设备任务的状态。 + * + * @param taskId 注册LoRaWAN设备任务的ID 必需 + */ + public static GetLoraNodesTaskResponse getLoraNodesTask(String taskId) { + GetLoraNodesTaskResponse response = null; + GetLoraNodesTaskRequest request = new GetLoraNodesTaskRequest(); + request.setTaskId(taskId); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询批量注册LoRaWAN设备任务的状态成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询批量注册LoRaWAN设备任务的状态失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response; + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询批量注册LoRaWAN设备任务的状态失败！" + JSON.toJSONString(response)); + } + return null; + + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiClientBuilderParams.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiClientBuilderParams.java new file mode 100644 index 0000000..790d9f6 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiClientBuilderParams.java @@ -0,0 +1,10 @@ +package com.limap.common.utils.ali.iot; + +import com.alibaba.cloudapi.sdk.model.HttpClientBuilderParams; + +/** + * @author yuxing.liyuxing@alibaba-inc.com + * @date 2018/9/7 + */ +public class IoTApiClientBuilderParams extends HttpClientBuilderParams { +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiRequest.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiRequest.java new file mode 100644 index 0000000..2d394af --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IoTApiRequest.java @@ -0,0 +1,67 @@ +package com.limap.common.utils.ali.iot; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * @author zhongfu.xiezf on 17/10/18. + */ +public class IoTApiRequest { + private String id; + private String version = "1.0"; + private Map request = new HashMap(); + private Map params = new HashMap(); + + public IoTApiRequest() { + id = UUID.randomUUID().toString(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public Map getRequest() { + return request; + } + + public void setRequest(Map request) { + this.request = request; + } + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } + + public void setApiVer(String apiVer) { + request.put("apiVer", apiVer); + } + + public void setIotToken(String iotToken) { + request.put("iotToken", iotToken); + } + + public void setCloudToken(String cloudToken) { + request.put("cloudToken", cloudToken); + } + + public void putParam(String key, Object value) { + params.put(key, value); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IotClient.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IotClient.java new file mode 100644 index 0000000..15fa04c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/IotClient.java @@ -0,0 +1,91 @@ +package com.limap.common.utils.ali.iot; + +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.profile.DefaultProfile; +import com.aliyuncs.profile.IClientProfile; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@Component +public class IotClient { + + private static String accessKeyID ; + + private static String accessKeySecret ; + + private static String regionId; + + private static String domain; + + private static String version; + + private static String productCode; + + public static DefaultAcsClient getClient() { + DefaultAcsClient client = null; + try { + IClientProfile profile = DefaultProfile.getProfile(regionId, accessKeyID, accessKeySecret); + DefaultProfile.addEndpoint(regionId, regionId, productCode,domain); + // 初始化client + client = new DefaultAcsClient(profile); + + } catch (Exception e) { + LogUtil.print("初始化client失败！exception:" + e.getMessage()); + } + return client; + } + + public String getAccessKeyID() { + return accessKeyID; + } + + @Value("${ali.accessKeyId}") + public void setAccessKeyID(String accessKeyID) { + IotClient.accessKeyID = accessKeyID; + } + + public String getAccessKeySecret() { + return accessKeySecret; + } + + @Value("${ali.accessKeySecret}") + public void setAccessKeySecret(String accessKeySecret) { + IotClient.accessKeySecret = accessKeySecret; + } + + public String getRegionId() { + return regionId; + } + + @Value("${ali.iot.regionId}") + public void setRegionId(String regionId) { + IotClient.regionId = regionId; + } + + public static String getDomain() { + return domain; + } + + @Value("${ali.iot.domain}") + public void setDomain(String domain) { + IotClient.domain = domain; + } + + public static String getVersion() { + return version; + } + + @Value("${ali.iot.version}") + public void setVersion(String version) { + IotClient.version = version; + } + + public String getProductCode() { + return productCode; + } + + @Value("${ali.iot.productCode}") + public void setProductCode(String productCode) { + IotClient.productCode = productCode; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/LogUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/LogUtil.java new file mode 100644 index 0000000..ac0466f --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/LogUtil.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2014-2016 Alibaba Group. All rights reserved. + * License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.limap.common.utils.ali.iot; + +import java.text.SimpleDateFormat; +import java.util.Date; + + +/** + * + * @version $Id: LogUtil.java,v 0.1 2016年6月2日 下午4:39:18 Exp $ + */ +public class LogUtil { + + /** 是否打印日志 **/ + public static boolean showLog = true; + + static SimpleDateFormat fm = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss.SSS"); + + /** + * 简单日志打印 + * + * @param msg + */ + public static void print(String msg) { + if (showLog) { + + String source = null; + + try { + StackTraceElement st = Thread.currentThread().getStackTrace()[2]; + source = "[" + st.getFileName() + "] - " + st.getMethodName() + "(" + + st.getLineNumber() + ")"; + } catch (Exception e) { + } + + System.out.println(fm.format(new Date()) + " - " + source + ":" + msg); + } + } + + public static void error(String msg){ + if (showLog) { + + String source = null; + + try { + StackTraceElement st = Thread.currentThread().getStackTrace()[2]; + source = "[" + st.getFileName() + "] - " + st.getMethodName() + "(" + + st.getLineNumber() + ")"; + } catch (Exception e) { + } + + System.err.println(fm.format(new Date()) + " - " + source + ":" + msg); + } + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiClient.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiClient.java new file mode 100644 index 0000000..cc07ca7 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiClient.java @@ -0,0 +1,71 @@ +package com.limap.common.utils.ali.iot; +/* + * Copyright 2017 Alibaba Group + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import com.alibaba.cloudapi.sdk.annotation.ThreadSafe; +import com.alibaba.cloudapi.sdk.client.ApacheHttpClient; +import com.alibaba.cloudapi.sdk.enums.HttpMethod; +import com.alibaba.cloudapi.sdk.enums.Scheme; +import com.alibaba.cloudapi.sdk.model.ApiRequest; +import com.alibaba.cloudapi.sdk.model.ApiResponse; +import com.alibaba.fastjson.JSONObject; + +import java.io.UnsupportedEncodingException; +import java.util.Arrays; +import java.util.Map; + +import static com.alibaba.cloudapi.sdk.enums.HttpConnectionModel.MULTIPLE_CONNECTION; + +/** + * @author zhongfu.xiezf + */ +@ThreadSafe +public final class SyncApiClient extends ApacheHttpClient { + + public SyncApiClient(IoTApiClientBuilderParams builderParams) { + super.init(builderParams); + } + + public ApiResponse postBody(String host, String path, IoTApiRequest request, boolean isHttps, + Map headers) + throws UnsupportedEncodingException { + byte[] body = JSONObject.toJSONString(request).getBytes("UTF-8"); + ApiRequest apiRequest = new ApiRequest(HttpMethod.POST_BODY, path, + body); + apiRequest.setHttpConnectionMode(MULTIPLE_CONNECTION); + apiRequest.setScheme(isHttps ? Scheme.HTTPS : Scheme.HTTP); + apiRequest.setHost(host); + if (null != headers && headers.size() > 0) { + for (Map.Entry header : headers.entrySet()) { + apiRequest.getHeaders().put(header.getKey(), Arrays.asList(header.getValue())); + } + } + return sendSyncRequest(apiRequest); + } + + public ApiResponse postBody(String host, String path, IoTApiRequest request, boolean isHttps) + throws UnsupportedEncodingException { + + return postBody(host, path, request, isHttps, null); + } + + public ApiResponse postBody(String host, String path, IoTApiRequest request) + throws UnsupportedEncodingException { + return postBody(host, path, request, true, null); + } + +} + diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiGetClient.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiGetClient.java new file mode 100644 index 0000000..f5c34db --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/SyncApiGetClient.java @@ -0,0 +1,43 @@ +package com.limap.common.utils.ali.iot; + +import com.alibaba.cloudapi.sdk.client.ApacheHttpClient; +import com.alibaba.cloudapi.sdk.enums.HttpMethod; +import com.alibaba.cloudapi.sdk.enums.Scheme; +import com.alibaba.cloudapi.sdk.model.ApiRequest; +import com.alibaba.cloudapi.sdk.model.ApiResponse; + +import java.util.Arrays; +import java.util.Map; + +import static com.alibaba.cloudapi.sdk.enums.HttpConnectionModel.MULTIPLE_CONNECTION; + +/** + * @author zhenzhao.czz + * @date 2018/2/2 + */ +public class SyncApiGetClient extends ApacheHttpClient { + + public SyncApiGetClient(IoTApiClientBuilderParams builderParams) { + super.init(builderParams); + } + + public ApiResponse doGet(String host, String path, boolean isHttps, Map headers, + Map querys) { + + ApiRequest apiRequest = new ApiRequest(HttpMethod.GET, path); + apiRequest.setHttpConnectionMode(MULTIPLE_CONNECTION); + apiRequest.setScheme(isHttps ? Scheme.HTTPS : Scheme.HTTP); + apiRequest.setHost(host); + if (null != headers && headers.size() > 0) { + for (Map.Entry header : headers.entrySet()) { + apiRequest.getHeaders().put(header.getKey(), Arrays.asList(header.getValue())); + } + } + if (null != querys && querys.size() > 0) { + for (Map.Entry query : querys.entrySet()) { + apiRequest.getQuerys().put(query.getKey(), query.getValue()); + } + } + return sendSyncRequest(apiRequest); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ThingModelManager.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ThingModelManager.java new file mode 100644 index 0000000..1e9196e --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ali/iot/ThingModelManager.java @@ -0,0 +1,471 @@ +package com.limap.common.utils.ali.iot; + +import com.alibaba.fastjson.JSON; +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.iot.model.v20180120.*; +import lombok.extern.slf4j.Slf4j; + +import java.util.List; + +@Slf4j +public class ThingModelManager extends AbstractManager { + + private static DefaultAcsClient client = AbstractManager.getClient(); + + /** + * 设置设备的属性 + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备名称 + * @param items 要设置的属性信息，组成为key:value，数据格式为 JSON String。 必须 + * @Des 描述： + */ + public static String setDeviceProperty(String iotId, String productKey, String deviceName, String items) { + SetDevicePropertyResponse response = null; + SetDevicePropertyRequest request = new SetDevicePropertyRequest(); + request.setDeviceName(deviceName); + request.setIotId(iotId); + request.setItems(items); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + log.info("设置设备的属性成功"); + log.info(JSON.toJSONString(response)); + LogUtil.print("设置设备的属性成功"); + LogUtil.print(JSON.toJSONString(response)); + return "OK"; + } else { + LogUtil.print("设置设备的属性失败"); + LogUtil.error(JSON.toJSONString(response)); + return JSON.toJSONString(response); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("设置设备的属性失败！" + JSON.toJSONString(response)); + return JSON.toJSONString(response); + } + } + + /** + * 批量设置设备属性 + * + * @param productKey 设置属性的设备所隶属的产品Key + * @param deviceNames 要设置属性的设备名称列表。目前，最多支持500个设备 + * @param items 要设置的属性信息，组成为key:value，数据格式为 JSON String。 必须 + * @Des 描述： + */ + public static void setDevicesProperty(String productKey, List deviceNames, String items) { + SetDevicesPropertyResponse response = new SetDevicesPropertyResponse(); + SetDevicesPropertyRequest request = new SetDevicesPropertyRequest(); + request.setDeviceNames(deviceNames); + request.setItems(items); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量设置设备属性成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量设置设备属性失败"); + LogUtil.error(JSON.toJSONString(response)); + } + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量设置设备属性失败！" + JSON.toJSONString(response)); + } + } + + /** + * 在一个设备上执行指定的服务（调用设备服务） + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备的名称 + * @param identifier 高级版设备的服务Identifier 必须 + * @param args 要启用服务的入参信息 必须 + * @Des 描述： + */ + public static InvokeThingServiceResponse.Data invokeThingService(String iotId, String productKey, String deviceName, + String identifier, String args) { + InvokeThingServiceResponse response = null; + InvokeThingServiceRequest request = new InvokeThingServiceRequest(); + request.setArgs(args); + request.setDeviceName(deviceName); + request.setIotId(iotId); + request.setIdentifier(identifier); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("服务执行成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("服务执行失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("服务执行失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 批量调用设备服务 + * + * @param iotId 要查询的设备ID 必须 + * @param productKey 设备所隶属的产品Key 必须 + * @param deviceNames 设备的名称列表。最多支持500个设备 必须 + * @param identifier 高级版设备的服务Identifier 必须 + * @param args 要启用服务的入参信息 必须 + * @Des 描述： + */ + public static void invokeThingsService(String iotId, String productKey, List deviceNames, + String identifier, String args) { + InvokeThingsServiceResponse response = null; + InvokeThingsServiceRequest request = new InvokeThingsServiceRequest(); + request.setArgs(args); + request.setIdentifier(identifier); + request.setDeviceNames(deviceNames); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量调用设备服务成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量调用设备服务失败"); + LogUtil.error(JSON.toJSONString(response)); + } + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量调用设备服务失败！" + JSON.toJSONString(response)); + } + } + + /** + * 查询指定设备的属性快照 + * + * @param iotId 要查询的设备ID 必须 + * @param productKey 设备所隶属的产品Key 必须 + * @param deviceName 设备的名称列表。最多支持500个设备 必须 + * @Des 描述： + */ + public static QueryDevicePropertyStatusResponse.Data queryDevicePropertyStatus(String iotId, String productKey, + String deviceName) { + + QueryDevicePropertyStatusResponse response = null; + QueryDevicePropertyStatusRequest request = new QueryDevicePropertyStatusRequest(); + request.setDeviceName(deviceName); + request.setIotId(iotId); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批属性快照查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("属性快照查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("属性快照查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备的事件记录 + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备的名称 + * @param eventType 事件类型 info：信息。alert：告警 。 error：故障。 + * @param identifier 事件标识符 必须 + * @param startTime 要查询的事件记录的开始时间 必须 + * @param endTime 要查询的事件记录的结束时间 必须 + * @param pageSize 返回结果中每页显示的记录数 + * @param asc 排序方式 + * @Des 描述： + */ + public static QueryDeviceEventDataResponse.Data queryDeviceEventData(String iotId, String productKey, + String deviceName, String eventType, + String identifier, + Long startTime, Long endTime, Integer pageSize, + Integer asc) { + QueryDeviceEventDataResponse response = null; + QueryDeviceEventDataRequest request = new QueryDeviceEventDataRequest(); + request.setAsc(asc); + request.setDeviceName(deviceName); + request.setEndTime(endTime); + request.setEventType(eventType); + request.setIotId(iotId); + request.setStartTime(startTime); + request.setIdentifier(identifier); + request.setPageSize(pageSize); + request.setProductKey(productKey); + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("事件记录查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("事件记录查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("事件记录查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备的属性记录 + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备的名称 + * @param identifier 事件标识符 必须 + * @param startTime 要查询的事件记录的开始时间 必须 + * @param endTime 要查询的事件记录的结束时间 必须 + * @param pageSize 返回结果中每页显示的记录数 + * @param asc 排序方式 + * @Des 描述： + */ + public static QueryDevicePropertyDataResponse.Data queryDevicePropertyData(String iotId, String productKey, + String deviceName, + String identifier, + Long startTime, Long endTime, + Integer pageSize, Integer asc) { + QueryDevicePropertyDataResponse response = null; + QueryDevicePropertyDataRequest request = new QueryDevicePropertyDataRequest(); + request.setAsc(asc); + request.setProductKey(productKey); + request.setIotId(iotId); + request.setDeviceName(deviceName); + request.setIdentifier(identifier); + request.setStartTime(startTime); + request.setEndTime(endTime); + request.setPageSize(pageSize); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("属性记录查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("属性记录查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("属性记录查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备的服务记录 + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备的名称 + * @param identifier 事件标识符 必须 + * @param startTime 要查询的事件记录的开始时间 必须 + * @param endTime 要查询的事件记录的结束时间 必须 + * @param pageSize 返回结果中每页显示的记录数 + * @param asc 排序方式 + * @Des 描述： + */ + public static QueryDeviceServiceDataResponse.Data queryDeviceServiceData(String iotId, String productKey, + String deviceName, + String identifier, + Long startTime, Long endTime, + Integer pageSize, Integer asc) { + QueryDeviceServiceDataResponse response = null; + QueryDeviceServiceDataRequest request = new QueryDeviceServiceDataRequest(); + request.setAsc(asc); + request.setDeviceName(deviceName); + request.setEndTime(endTime); + request.setIdentifier(identifier); + request.setIotId(iotId); + request.setStartTime(startTime); + request.setPageSize(pageSize); + request.setProductKey(productKey); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("服务记录查询成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("服务记录查询失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("属性记录查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 查询指定设备的属性上报数据 + * + * @param iotId 要查询的设备ID + * @param productKey 设备所隶属的产品Key + * @param deviceName 设备的名称 + * @param startTime 要查询的事件记录的开始时间 必须 + * @param endTime 要查询的事件记录的结束时间 必须 + * @param pageSize 返回结果中每页显示的记录数 + * @param asc 排序方式 + * @Des 描述： + */ + public static QueryDevicePropertiesDataResponse queryDevicePropertiesData(String iotId, + String productKey, + String deviceName, + List identifiers, + Long startTime, + Long endTime, + Integer pageSize, + Integer asc) { + QueryDevicePropertiesDataResponse response = null; + QueryDevicePropertiesDataRequest request = new QueryDevicePropertiesDataRequest(); + request.setAsc(asc); + request.setIotId(iotId); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setIdentifiers(identifiers); + request.setStartTime(startTime); + request.setEndTime(endTime); + request.setPageSize(pageSize); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询历史数据成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询历史数据失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response; + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("属性记录查询失败！" + JSON.toJSONString(response)); + } + return null; + } + + /** + * 为指定设备批量设置期望属性值 + * + * @param iotId 要设置期望属性值的设备ID + * @param productKey 产品PK + * @param deviceName 要设置期望属性值的设备的名称。 + * @param items 要设置的期望属性值，组成为key:value 必需 + * @param versions 当前期望属性值版本，组成为key:value + */ + public static SetDeviceDesiredPropertyResponse.Data setDeviceDesiredProperty(String iotId, String productKey, + String deviceName, String items, + String versions) { + SetDeviceDesiredPropertyResponse response = null; + SetDeviceDesiredPropertyRequest request = new SetDeviceDesiredPropertyRequest(); + request.setIotId(iotId); + request.setDeviceName(deviceName); + request.setProductKey(productKey); + request.setItems(items); + request.setVersions(versions); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("批量设置期望属性值成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("批量设置期望属性值失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("批量设置期望属性值失败！" + JSON.toJSONString(response)); + } + return null; + + } + + /** + * 查询指定设备的期望属性值。 + * + * @param iotId 要查询的设备ID + * @param productKey 要查询的设备所隶属的产品Key + * @param deviceName 要查询的设备的名称 + * @param identifiers 要查询期望值的属性的标识符 (identifier) 列表 + */ + public static QueryDeviceDesiredPropertyResponse.Data queryDeviceDesiredProperty(String iotId, String productKey, + String deviceName, + List identifiers) { + + QueryDeviceDesiredPropertyResponse response = null; + QueryDeviceDesiredPropertyRequest request = new QueryDeviceDesiredPropertyRequest(); + request.setIotId(iotId); + request.setProductKey(productKey); + request.setDeviceName(deviceName); + request.setIdentifiers(identifiers); + + try { + response = client.getAcsResponse(request); + + if (response.getSuccess() != null && response.getSuccess()) { + LogUtil.print("查询指定设备的期望属性值成功"); + LogUtil.print(JSON.toJSONString(response)); + } else { + LogUtil.print("查询指定设备的期望属性值失败"); + LogUtil.error(JSON.toJSONString(response)); + } + return response.getData(); + + } catch (ClientException e) { + e.printStackTrace(); + LogUtil.error("查询指定设备的期望属性值失败！" + JSON.toJSONString(response)); + } + return null; + + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanUtils.java new file mode 100644 index 0000000..977a8cb --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanUtils.java @@ -0,0 +1,110 @@ +package com.limap.common.utils.bean; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Bean 工具类 + * + * @author limap + */ +public class BeanUtils extends org.springframework.beans.BeanUtils +{ + /** Bean方法名中属性名开始的下标 */ + private static final int BEAN_METHOD_PROP_INDEX = 3; + + /** * 匹配getter方法的正则表达式 */ + private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)"); + + /** * 匹配setter方法的正则表达式 */ + private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)"); + + /** + * Bean属性复制工具方法。 + * + * @param dest 目标对象 + * @param src 源对象 + */ + public static void copyBeanProp(Object dest, Object src) + { + try + { + copyProperties(src, dest); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + /** + * 获取对象的setter方法。 + * + * @param obj 对象 + * @return 对象的setter方法列表 + */ + public static List getSetterMethods(Object obj) + { + // setter方法列表 + List setterMethods = new ArrayList(); + + // 获取所有方法 + Method[] methods = obj.getClass().getMethods(); + + // 查找setter方法 + + for (Method method : methods) + { + Matcher m = SET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 1)) + { + setterMethods.add(method); + } + } + // 返回setter方法列表 + return setterMethods; + } + + /** + * 获取对象的getter方法。 + * + * @param obj 对象 + * @return 对象的getter方法列表 + */ + + public static List getGetterMethods(Object obj) + { + // getter方法列表 + List getterMethods = new ArrayList(); + // 获取所有方法 + Method[] methods = obj.getClass().getMethods(); + // 查找getter方法 + for (Method method : methods) + { + Matcher m = GET_PATTERN.matcher(method.getName()); + if (m.matches() && (method.getParameterTypes().length == 0)) + { + getterMethods.add(method); + } + } + // 返回getter方法列表 + return getterMethods; + } + + /** + * 检查Bean方法名中的属性名是否相等。
+ * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。 + * + * @param m1 方法名1 + * @param m2 方法名2 + * @return 属性名一样返回true，否则返回false + */ + + public static boolean isMethodPropEquals(String m1, String m2) + { + return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX)); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanValidators.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanValidators.java new file mode 100644 index 0000000..783ae31 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/bean/BeanValidators.java @@ -0,0 +1,24 @@ +package com.limap.common.utils.bean; + +import java.util.Set; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Validator; + +/** + * bean对象属性验证 + * + * @author limap + */ +public class BeanValidators +{ + public static void validateWithException(Validator validator, Object object, Class... groups) + throws ConstraintViolationException + { + Set> constraintViolations = validator.validate(object, groups); + if (!constraintViolations.isEmpty()) + { + throw new ConstraintViolationException(constraintViolations); + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileTypeUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileTypeUtils.java new file mode 100644 index 0000000..dcd789b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileTypeUtils.java @@ -0,0 +1,76 @@ +package com.limap.common.utils.file; + +import java.io.File; +import org.apache.commons.lang3.StringUtils; + +/** + * 文件类型工具类 + * + * @author limap + */ +public class FileTypeUtils +{ + /** + * 获取文件类型 + *

+ * 例如: limap.txt, 返回: txt + * + * @param file 文件名 + * @return 后缀（不含".") + */ + public static String getFileType(File file) + { + if (null == file) + { + return StringUtils.EMPTY; + } + return getFileType(file.getName()); + } + + /** + * 获取文件类型 + *

+ * 例如: limap.txt, 返回: txt + * + * @param fileName 文件名 + * @return 后缀（不含".") + */ + public static String getFileType(String fileName) + { + int separatorIndex = fileName.lastIndexOf("."); + if (separatorIndex < 0) + { + return ""; + } + return fileName.substring(separatorIndex + 1).toLowerCase(); + } + + /** + * 获取文件类型 + * + * @param photoByte 文件字节码 + * @return 后缀（不含".") + */ + public static String getFileExtendName(byte[] photoByte) + { + String strFileExtendName = "JPG"; + if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) + && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) + { + strFileExtendName = "GIF"; + } + else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) + { + strFileExtendName = "JPG"; + } + else if ((photoByte[0] == 66) && (photoByte[1] == 77)) + { + strFileExtendName = "BMP"; + } + else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) + { + strFileExtendName = "PNG"; + } + return strFileExtendName; + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUploadUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUploadUtils.java new file mode 100644 index 0000000..210449f --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUploadUtils.java @@ -0,0 +1,232 @@ +package com.limap.common.utils.file; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; +import com.limap.common.config.LimapConfig; +import com.limap.common.constant.Constants; +import com.limap.common.exception.file.FileNameLengthLimitExceededException; +import com.limap.common.exception.file.FileSizeLimitExceededException; +import com.limap.common.exception.file.InvalidExtensionException; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.uuid.Seq; + +/** + * 文件上传工具类 + * + * @author limap + */ +public class FileUploadUtils +{ + /** + * 默认大小 50M + */ + public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + + /** + * 默认的文件名最大长度 100 + */ + public static final int DEFAULT_FILE_NAME_LENGTH = 100; + + /** + * 默认上传的地址 + */ + private static String defaultBaseDir = LimapConfig.getProfile(); + + public static void setDefaultBaseDir(String defaultBaseDir) + { + FileUploadUtils.defaultBaseDir = defaultBaseDir; + } + + public static String getDefaultBaseDir() + { + return defaultBaseDir; + } + + /** + * 以默认配置进行文件上传 + * + * @param file 上传的文件 + * @return 文件名称 + * @throws Exception + */ + public static final String upload(MultipartFile file) throws IOException + { + try + { + return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 根据文件路径上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @return 文件名称 + * @throws IOException + */ + public static final String upload(String baseDir, MultipartFile file) throws IOException + { + try + { + return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); + } + catch (Exception e) + { + throw new IOException(e.getMessage(), e); + } + } + + /** + * 文件上传 + * + * @param baseDir 相对应用的基目录 + * @param file 上传的文件 + * @param allowedExtension 上传文件类型 + * @return 返回上传成功的文件名 + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws FileNameLengthLimitExceededException 文件名太长 + * @throws IOException 比如读写文件出错时 + * @throws InvalidExtensionException 文件校验异常 + */ + public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException, + InvalidExtensionException + { + int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length(); + if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) + { + throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH); + } + + assertAllowed(file, allowedExtension); + + String fileName = extractFilename(file); + + String absPath = getAbsoluteFile(baseDir, fileName).getAbsolutePath(); + file.transferTo(Paths.get(absPath)); + return getPathFileName(baseDir, fileName); + } + + /** + * 编码文件名 + */ + public static final String extractFilename(MultipartFile file) + { + return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), + FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file)); + } + + public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException + { + File desc = new File(uploadDir + File.separator + fileName); + + if (!desc.exists()) + { + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + } + return desc; + } + + public static final String getPathFileName(String uploadDir, String fileName) throws IOException + { + int dirLastIndex = LimapConfig.getProfile().length() + 1; + String currentDir = StringUtils.substring(uploadDir, dirLastIndex); + return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; + } + + /** + * 文件大小校验 + * + * @param file 上传的文件 + * @return + * @throws FileSizeLimitExceededException 如果超出最大大小 + * @throws InvalidExtensionException + */ + public static final void assertAllowed(MultipartFile file, String[] allowedExtension) + throws FileSizeLimitExceededException, InvalidExtensionException + { + long size = file.getSize(); + if (size > DEFAULT_MAX_SIZE) + { + throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); + } + + String fileName = file.getOriginalFilename(); + String extension = getExtension(file); + if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) + { + if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) + { + throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) + { + throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) + { + throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension, + fileName); + } + else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) + { + throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension, + fileName); + } + else + { + throw new InvalidExtensionException(allowedExtension, extension, fileName); + } + } + } + + /** + * 判断MIME类型是否是允许的MIME类型 + * + * @param extension + * @param allowedExtension + * @return + */ + public static final boolean isAllowedExtension(String extension, String[] allowedExtension) + { + for (String str : allowedExtension) + { + if (str.equalsIgnoreCase(extension)) + { + return true; + } + } + return false; + } + + /** + * 获取文件名的后缀 + * + * @param file 表单文件 + * @return 后缀名 + */ + public static final String getExtension(MultipartFile file) + { + String extension = FilenameUtils.getExtension(file.getOriginalFilename()); + if (StringUtils.isEmpty(extension)) + { + extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType())); + } + return extension; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUtils.java new file mode 100644 index 0000000..c266254 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/FileUtils.java @@ -0,0 +1,291 @@ +package com.limap.common.utils.file; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; +import com.limap.common.config.LimapConfig; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.uuid.IdUtils; +import org.apache.commons.io.FilenameUtils; + +/** + * 文件处理工具类 + * + * @author limap + */ +public class FileUtils +{ + public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+"; + + /** + * 输出指定文件的byte数组 + * + * @param filePath 文件路径 + * @param os 输出流 + * @return + */ + public static void writeBytes(String filePath, OutputStream os) throws IOException + { + FileInputStream fis = null; + try + { + File file = new File(filePath); + if (!file.exists()) + { + throw new FileNotFoundException(filePath); + } + fis = new FileInputStream(file); + byte[] b = new byte[1024]; + int length; + while ((length = fis.read(b)) > 0) + { + os.write(b, 0, length); + } + } + catch (IOException e) + { + throw e; + } + finally + { + IOUtils.close(os); + IOUtils.close(fis); + } + } + + /** + * 写数据到文件中 + * + * @param data 数据 + * @return 目标文件 + * @throws IOException IO异常 + */ + public static String writeImportBytes(byte[] data) throws IOException + { + return writeBytes(data, LimapConfig.getImportPath()); + } + + /** + * 写数据到文件中 + * + * @param data 数据 + * @param uploadDir 目标文件 + * @return 目标文件 + * @throws IOException IO异常 + */ + public static String writeBytes(byte[] data, String uploadDir) throws IOException + { + FileOutputStream fos = null; + String pathName = ""; + try + { + String extension = getFileExtendName(data); + pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension; + File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName); + fos = new FileOutputStream(file); + fos.write(data); + } + finally + { + IOUtils.close(fos); + } + return FileUploadUtils.getPathFileName(uploadDir, pathName); + } + + /** + * 删除文件 + * + * @param filePath 文件 + * @return + */ + public static boolean deleteFile(String filePath) + { + boolean flag = false; + File file = new File(filePath); + // 路径为文件且不为空则进行删除 + if (file.isFile() && file.exists()) + { + flag = file.delete(); + } + return flag; + } + + /** + * 文件名称验证 + * + * @param filename 文件名称 + * @return true 正常 false 非法 + */ + public static boolean isValidFilename(String filename) + { + return filename.matches(FILENAME_PATTERN); + } + + /** + * 检查文件是否可下载 + * + * @param resource 需要下载的文件 + * @return true 正常 false 非法 + */ + public static boolean checkAllowDownload(String resource) + { + // 禁止目录上跳级别 + if (StringUtils.contains(resource, "..")) + { + return false; + } + + // 检查允许下载的文件规则 + if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) + { + return true; + } + + // 不在允许下载的文件规则 + return false; + } + + /** + * 下载文件名重新编码 + * + * @param request 请求对象 + * @param fileName 文件名 + * @return 编码后的文件名 + */ + public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException + { + final String agent = request.getHeader("USER-AGENT"); + String filename = fileName; + if (agent.contains("MSIE")) + { + // IE浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + filename = filename.replace("+", " "); + } + else if (agent.contains("Firefox")) + { + // 火狐浏览器 + filename = new String(fileName.getBytes(), "ISO8859-1"); + } + else if (agent.contains("Chrome")) + { + // google浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } + else + { + // 其它浏览器 + filename = URLEncoder.encode(filename, "utf-8"); + } + return filename; + } + + /** + * 下载文件名重新编码 + * + * @param response 响应对象 + * @param realFileName 真实文件名 + */ + public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException + { + String percentEncodedFileName = percentEncode(realFileName); + + StringBuilder contentDispositionValue = new StringBuilder(); + contentDispositionValue.append("attachment; filename=") + .append(percentEncodedFileName) + .append(";") + .append("filename*=") + .append("utf-8''") + .append(percentEncodedFileName); + + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename"); + response.setHeader("Content-disposition", contentDispositionValue.toString()); + response.setHeader("download-filename", percentEncodedFileName); + } + + /** + * 百分号编码工具方法 + * + * @param s 需要百分号编码的字符串 + * @return 百分号编码后的字符串 + */ + public static String percentEncode(String s) throws UnsupportedEncodingException + { + String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString()); + return encode.replaceAll("\\+", "%20"); + } + + /** + * 获取图像后缀 + * + * @param photoByte 图像数据 + * @return 后缀名 + */ + public static String getFileExtendName(byte[] photoByte) + { + String strFileExtendName = "jpg"; + if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56) + && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97)) + { + strFileExtendName = "gif"; + } + else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) + { + strFileExtendName = "jpg"; + } + else if ((photoByte[0] == 66) && (photoByte[1] == 77)) + { + strFileExtendName = "bmp"; + } + else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) + { + strFileExtendName = "png"; + } + return strFileExtendName; + } + + /** + * 获取文件名称 /profile/upload/2022/04/16/limap.png -- limap.png + * + * @param fileName 路径名称 + * @return 没有文件路径的名称 + */ + public static String getName(String fileName) + { + if (fileName == null) + { + return null; + } + int lastUnixPos = fileName.lastIndexOf('/'); + int lastWindowsPos = fileName.lastIndexOf('\\'); + int index = Math.max(lastUnixPos, lastWindowsPos); + return fileName.substring(index + 1); + } + + /** + * 获取不带后缀文件名称 /profile/upload/2022/04/16/limap.png -- limap + * + * @param fileName 路径名称 + * @return 没有文件路径和后缀的名称 + */ + public static String getNameNotSuffix(String fileName) + { + if (fileName == null) + { + return null; + } + String baseName = FilenameUtils.getBaseName(fileName); + return baseName; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/ImageUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/ImageUtils.java new file mode 100644 index 0000000..2fd13da --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/ImageUtils.java @@ -0,0 +1,98 @@ +package com.limap.common.utils.file; + +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.Arrays; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.config.LimapConfig; +import com.limap.common.constant.Constants; +import com.limap.common.utils.StringUtils; + +/** + * 图片处理工具类 + * + * @author limap + */ +public class ImageUtils +{ + private static final Logger log = LoggerFactory.getLogger(ImageUtils.class); + + public static byte[] getImage(String imagePath) + { + InputStream is = getFile(imagePath); + try + { + return IOUtils.toByteArray(is); + } + catch (Exception e) + { + log.error("图片加载异常 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(is); + } + } + + public static InputStream getFile(String imagePath) + { + try + { + byte[] result = readFile(imagePath); + result = Arrays.copyOf(result, result.length); + return new ByteArrayInputStream(result); + } + catch (Exception e) + { + log.error("获取图片异常 {}", e); + } + return null; + } + + /** + * 读取文件为字节数据 + * + * @param url 地址 + * @return 字节数据 + */ + public static byte[] readFile(String url) + { + InputStream in = null; + try + { + if (url.startsWith("http")) + { + // 网络地址 + URL urlObj = new URL(url); + URLConnection urlConnection = urlObj.openConnection(); + urlConnection.setConnectTimeout(30 * 1000); + urlConnection.setReadTimeout(60 * 1000); + urlConnection.setDoInput(true); + in = urlConnection.getInputStream(); + } + else + { + // 本机地址 + String localPath = LimapConfig.getProfile(); + String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); + in = new FileInputStream(downloadPath); + } + return IOUtils.toByteArray(in); + } + catch (Exception e) + { + log.error("获取文件路径异常 {}", e); + return null; + } + finally + { + IOUtils.closeQuietly(in); + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/MimeTypeUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/MimeTypeUtils.java new file mode 100644 index 0000000..b9d69bb --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/file/MimeTypeUtils.java @@ -0,0 +1,59 @@ +package com.limap.common.utils.file; + +/** + * 媒体类型工具类 + * + * @author limap + */ +public class MimeTypeUtils +{ + public static final String IMAGE_PNG = "image/png"; + + public static final String IMAGE_JPG = "image/jpg"; + + public static final String IMAGE_JPEG = "image/jpeg"; + + public static final String IMAGE_BMP = "image/bmp"; + + public static final String IMAGE_GIF = "image/gif"; + + public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" }; + + public static final String[] FLASH_EXTENSION = { "swf", "flv" }; + + public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg", + "asf", "rm", "rmvb" }; + + public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" }; + + public static final String[] DEFAULT_ALLOWED_EXTENSION = { + // 图片 + "bmp", "gif", "jpg", "jpeg", "png", + // word excel powerpoint + "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt", + // 压缩文件 + "rar", "zip", "gz", "bz2", + // 视频格式 + "mp4", "avi", "rmvb", + // pdf + "pdf" }; + + public static String getExtension(String prefix) + { + switch (prefix) + { + case IMAGE_PNG: + return "png"; + case IMAGE_JPG: + return "jpg"; + case IMAGE_JPEG: + return "jpeg"; + case IMAGE_BMP: + return "bmp"; + case IMAGE_GIF: + return "gif"; + default: + return ""; + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/EscapeUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/EscapeUtil.java new file mode 100644 index 0000000..9c0d6c8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/EscapeUtil.java @@ -0,0 +1,167 @@ +package com.limap.common.utils.html; + +import com.limap.common.utils.StringUtils; + +/** + * 转义和反转义工具类 + * + * @author limap + */ +public class EscapeUtil +{ + public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)"; + + private static final char[][] TEXT = new char[64][]; + + static + { + for (int i = 0; i < 64; i++) + { + TEXT[i] = new char[] { (char) i }; + } + + // special HTML characters + TEXT['\''] = "'".toCharArray(); // 单引号 + TEXT['"'] = """.toCharArray(); // 双引号 + TEXT['&'] = "&".toCharArray(); // &符 + TEXT['<'] = "<".toCharArray(); // 小于号 + TEXT['>'] = ">".toCharArray(); // 大于号 + } + + /** + * 转义文本中的HTML字符为安全的字符 + * + * @param text 被转义的文本 + * @return 转义后的文本 + */ + public static String escape(String text) + { + return encode(text); + } + + /** + * 还原被转义的HTML特殊字符 + * + * @param content 包含转义符的HTML内容 + * @return 转换后的字符串 + */ + public static String unescape(String content) + { + return decode(content); + } + + /** + * 清除所有HTML标签，但是不删除标签内的内容 + * + * @param content 文本 + * @return 清除标签后的文本 + */ + public static String clean(String content) + { + return new HTMLFilter().filter(content); + } + + /** + * Escape编码 + * + * @param text 被编码的文本 + * @return 编码后的字符 + */ + private static String encode(String text) + { + if (StringUtils.isEmpty(text)) + { + return StringUtils.EMPTY; + } + + final StringBuilder tmp = new StringBuilder(text.length() * 6); + char c; + for (int i = 0; i < text.length(); i++) + { + c = text.charAt(i); + if (c < 256) + { + tmp.append("%"); + if (c < 16) + { + tmp.append("0"); + } + tmp.append(Integer.toString(c, 16)); + } + else + { + tmp.append("%u"); + if (c <= 0xfff) + { + // issue#I49JU8@Gitee + tmp.append("0"); + } + tmp.append(Integer.toString(c, 16)); + } + } + return tmp.toString(); + } + + /** + * Escape解码 + * + * @param content 被转义的内容 + * @return 解码后的字符串 + */ + public static String decode(String content) + { + if (StringUtils.isEmpty(content)) + { + return content; + } + + StringBuilder tmp = new StringBuilder(content.length()); + int lastPos = 0, pos = 0; + char ch; + while (lastPos < content.length()) + { + pos = content.indexOf("%", lastPos); + if (pos == lastPos) + { + if (content.charAt(pos + 1) == 'u') + { + ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16); + tmp.append(ch); + lastPos = pos + 6; + } + else + { + ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16); + tmp.append(ch); + lastPos = pos + 3; + } + } + else + { + if (pos == -1) + { + tmp.append(content.substring(lastPos)); + lastPos = content.length(); + } + else + { + tmp.append(content.substring(lastPos, pos)); + lastPos = pos; + } + } + } + return tmp.toString(); + } + + public static void main(String[] args) + { + String html = ""; + String escape = EscapeUtil.escape(html); + // String html = "ipt>alert(\"XSS\")ipt>"; + // String html = "<123"; + // String html = "123>"; + System.out.println("clean: " + EscapeUtil.clean(html)); + System.out.println("escape: " + escape); + System.out.println("unescape: " + EscapeUtil.unescape(escape)); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/HTMLFilter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/HTMLFilter.java new file mode 100644 index 0000000..3bf6dc6 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/html/HTMLFilter.java @@ -0,0 +1,570 @@ +package com.limap.common.utils.html; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * HTML过滤器，用于去除XSS漏洞隐患。 + * + * @author limap + */ +public final class HTMLFilter +{ + /** + * regex flag union representing /si modifiers in php + **/ + private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL; + private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL); + private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI); + private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL); + private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI); + private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI); + private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI); + private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI); + private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI); + private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?"); + private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?"); + private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?"); + private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))"); + private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL); + private static final Pattern P_END_ARROW = Pattern.compile("^>"); + private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)"); + private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)"); + private static final Pattern P_AMP = Pattern.compile("&"); + private static final Pattern P_QUOTE = Pattern.compile("\""); + private static final Pattern P_LEFT_ARROW = Pattern.compile("<"); + private static final Pattern P_RIGHT_ARROW = Pattern.compile(">"); + private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>"); + + // @xxx could grow large... maybe use sesat's ReferenceMap + private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>(); + private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); + + /** + * set of allowed html elements, along with allowed attributes for each element + **/ + private final Map> vAllowed; + /** + * counts of open tags for each (allowable) html element + **/ + private final Map vTagCounts = new HashMap<>(); + + /** + * html elements which must always be self-closing (e.g. "") + **/ + private final String[] vSelfClosingTags; + /** + * html elements which must always have separate opening and closing tags (e.g. "") + **/ + private final String[] vNeedClosingTags; + /** + * set of disallowed html elements + **/ + private final String[] vDisallowed; + /** + * attributes which should be checked for valid protocols + **/ + private final String[] vProtocolAtts; + /** + * allowed protocols + **/ + private final String[] vAllowedProtocols; + /** + * tags which should be removed if they contain no content (e.g. "" or "") + **/ + private final String[] vRemoveBlanks; + /** + * entities allowed within html markup + **/ + private final String[] vAllowedEntities; + /** + * flag determining whether comments are allowed in input String. + */ + private final boolean stripComment; + private final boolean encodeQuotes; + /** + * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. "" + * becomes " text "). If set to false, unbalanced angle brackets will be html escaped. + */ + private final boolean alwaysMakeTags; + + /** + * Default constructor. + */ + public HTMLFilter() + { + vAllowed = new HashMap<>(); + + final ArrayList a_atts = new ArrayList<>(); + a_atts.add("href"); + a_atts.add("target"); + vAllowed.put("a", a_atts); + + final ArrayList img_atts = new ArrayList<>(); + img_atts.add("src"); + img_atts.add("width"); + img_atts.add("height"); + img_atts.add("alt"); + vAllowed.put("img", img_atts); + + final ArrayList no_atts = new ArrayList<>(); + vAllowed.put("b", no_atts); + vAllowed.put("strong", no_atts); + vAllowed.put("i", no_atts); + vAllowed.put("em", no_atts); + + vSelfClosingTags = new String[] { "img" }; + vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" }; + vDisallowed = new String[] {}; + vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp. + vProtocolAtts = new String[] { "src", "href" }; + vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" }; + vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" }; + stripComment = true; + encodeQuotes = true; + alwaysMakeTags = false; + } + + /** + * Map-parameter configurable constructor. + * + * @param conf map containing configuration. keys match field names. + */ + @SuppressWarnings("unchecked") + public HTMLFilter(final Map conf) + { + + assert conf.containsKey("vAllowed") : "configuration requires vAllowed"; + assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags"; + assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags"; + assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed"; + assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols"; + assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts"; + assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks"; + assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities"; + + vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed")); + vSelfClosingTags = (String[]) conf.get("vSelfClosingTags"); + vNeedClosingTags = (String[]) conf.get("vNeedClosingTags"); + vDisallowed = (String[]) conf.get("vDisallowed"); + vAllowedProtocols = (String[]) conf.get("vAllowedProtocols"); + vProtocolAtts = (String[]) conf.get("vProtocolAtts"); + vRemoveBlanks = (String[]) conf.get("vRemoveBlanks"); + vAllowedEntities = (String[]) conf.get("vAllowedEntities"); + stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true; + encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true; + alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true; + } + + private void reset() + { + vTagCounts.clear(); + } + + // --------------------------------------------------------------- + // my versions of some PHP library functions + public static String chr(final int decimal) + { + return String.valueOf((char) decimal); + } + + public static String htmlSpecialChars(final String s) + { + String result = s; + result = regexReplace(P_AMP, "&", result); + result = regexReplace(P_QUOTE, """, result); + result = regexReplace(P_LEFT_ARROW, "<", result); + result = regexReplace(P_RIGHT_ARROW, ">", result); + return result; + } + + // --------------------------------------------------------------- + + /** + * given a user submitted input String, filter out any invalid or restricted html. + * + * @param input text (i.e. submitted by a user) than may contain html + * @return "clean" version of input, with only valid, whitelisted html elements allowed + */ + public String filter(final String input) + { + reset(); + String s = input; + + s = escapeComments(s); + + s = balanceHTML(s); + + s = checkTags(s); + + s = processRemoveBlanks(s); + + // s = validateEntities(s); + + return s; + } + + public boolean isAlwaysMakeTags() + { + return alwaysMakeTags; + } + + public boolean isStripComments() + { + return stripComment; + } + + private String escapeComments(final String s) + { + final Matcher m = P_COMMENTS.matcher(s); + final StringBuffer buf = new StringBuffer(); + if (m.find()) + { + final String match = m.group(1); // (.*?) + m.appendReplacement(buf, Matcher.quoteReplacement("")); + } + m.appendTail(buf); + + return buf.toString(); + } + + private String balanceHTML(String s) + { + if (alwaysMakeTags) + { + // + // try and form html + // + s = regexReplace(P_END_ARROW, "", s); + // 不追加结束标签 + s = regexReplace(P_BODY_TO_END, "<$1>", s); + s = regexReplace(P_XML_CONTENT, "$1<$2", s); + + } + else + { + // + // escape stray brackets + // + s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s); + s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s); + + // + // the last regexp causes '<>' entities to appear + // (we need to do a lookahead assertion so that the last bracket can + // be used in the next pass of the regexp) + // + s = regexReplace(P_BOTH_ARROWS, "", s); + } + + return s; + } + + private String checkTags(String s) + { + Matcher m = P_TAGS.matcher(s); + + final StringBuffer buf = new StringBuffer(); + while (m.find()) + { + String replaceStr = m.group(1); + replaceStr = processTag(replaceStr); + m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr)); + } + m.appendTail(buf); + + // these get tallied in processTag + // (remember to reset before subsequent calls to filter method) + final StringBuilder sBuilder = new StringBuilder(buf.toString()); + for (String key : vTagCounts.keySet()) + { + for (int ii = 0; ii < vTagCounts.get(key); ii++) + { + sBuilder.append(""); + } + } + s = sBuilder.toString(); + + return s; + } + + private String processRemoveBlanks(final String s) + { + String result = s; + for (String tag : vRemoveBlanks) + { + if (!P_REMOVE_PAIR_BLANKS.containsKey(tag)) + { + P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>")); + } + result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result); + if (!P_REMOVE_SELF_BLANKS.containsKey(tag)) + { + P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>")); + } + result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result); + } + + return result; + } + + private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s) + { + Matcher m = regex_pattern.matcher(s); + return m.replaceAll(replacement); + } + + private String processTag(final String s) + { + // ending tags + Matcher m = P_END_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + if (allowed(name)) + { + if (!inArray(name, vSelfClosingTags)) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) - 1); + return ""; + } + } + } + } + + // starting tags + m = P_START_TAG.matcher(s); + if (m.find()) + { + final String name = m.group(1).toLowerCase(); + final String body = m.group(2); + String ending = m.group(3); + + // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" ); + if (allowed(name)) + { + final StringBuilder params = new StringBuilder(); + + final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body); + final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body); + final List paramNames = new ArrayList<>(); + final List paramValues = new ArrayList<>(); + while (m2.find()) + { + paramNames.add(m2.group(1)); // ([a-z0-9]+) + paramValues.add(m2.group(3)); // (.*?) + } + while (m3.find()) + { + paramNames.add(m3.group(1)); // ([a-z0-9]+) + paramValues.add(m3.group(3)); // ([^\"\\s']+) + } + + String paramName, paramValue; + for (int ii = 0; ii < paramNames.size(); ii++) + { + paramName = paramNames.get(ii).toLowerCase(); + paramValue = paramValues.get(ii); + + // debug( "paramName='" + paramName + "'" ); + // debug( "paramValue='" + paramValue + "'" ); + // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) ); + + if (allowedAttribute(name, paramName)) + { + if (inArray(paramName, vProtocolAtts)) + { + paramValue = processParamProtocol(paramValue); + } + params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\\\""); + } + } + + if (inArray(name, vSelfClosingTags)) + { + ending = " /"; + } + + if (inArray(name, vNeedClosingTags)) + { + ending = ""; + } + + if (ending == null || ending.length() < 1) + { + if (vTagCounts.containsKey(name)) + { + vTagCounts.put(name, vTagCounts.get(name) + 1); + } + else + { + vTagCounts.put(name, 1); + } + } + else + { + ending = " /"; + } + return "<" + name + params + ending + ">"; + } + else + { + return ""; + } + } + + // comments + m = P_COMMENT.matcher(s); + if (!stripComment && m.find()) + { + return "<" + m.group() + ">"; + } + + return ""; + } + + private String processParamProtocol(String s) + { + s = decodeEntities(s); + final Matcher m = P_PROTOCOL.matcher(s); + if (m.find()) + { + final String protocol = m.group(1); + if (!inArray(protocol, vAllowedProtocols)) + { + // bad protocol, turn into local anchor link instead + s = "#" + s.substring(protocol.length() + 1); + if (s.startsWith("#//")) + { + s = "#" + s.substring(3); + } + } + } + + return s; + } + + private String decodeEntities(String s) + { + StringBuffer buf = new StringBuffer(); + + Matcher m = P_ENTITY.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.decode(match).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENTITY_UNICODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + buf = new StringBuffer(); + m = P_ENCODE.matcher(s); + while (m.find()) + { + final String match = m.group(1); + final int decimal = Integer.valueOf(match, 16).intValue(); + m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal))); + } + m.appendTail(buf); + s = buf.toString(); + + s = validateEntities(s); + return s; + } + + private String validateEntities(final String s) + { + StringBuffer buf = new StringBuffer(); + + // validate entities throughout the string + Matcher m = P_VALID_ENTITIES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // ([^&;]*) + final String two = m.group(2); // (?=(;|&|$)) + m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two))); + } + m.appendTail(buf); + + return encodeQuotes(buf.toString()); + } + + private String encodeQuotes(final String s) + { + if (encodeQuotes) + { + StringBuffer buf = new StringBuffer(); + Matcher m = P_VALID_QUOTES.matcher(s); + while (m.find()) + { + final String one = m.group(1); // (>|^) + final String two = m.group(2); // ([^<]+?) + final String three = m.group(3); // (<|$) + // 不替换双引号为"，防止json格式无效 regexReplace(P_QUOTE, """, two) + m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three)); + } + m.appendTail(buf); + return buf.toString(); + } + else + { + return s; + } + } + + private String checkEntity(final String preamble, final String term) + { + + return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble; + } + + private boolean isValidEntity(final String entity) + { + return inArray(entity, vAllowedEntities); + } + + private static boolean inArray(final String s, final String[] array) + { + for (String item : array) + { + if (item != null && item.equals(s)) + { + return true; + } + } + return false; + } + + private boolean allowed(final String name) + { + return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed); + } + + private boolean allowedAttribute(final String name, final String paramName) + { + return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName)); + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpHelper.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpHelper.java new file mode 100644 index 0000000..d871fc3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpHelper.java @@ -0,0 +1,55 @@ +package com.limap.common.utils.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import javax.servlet.ServletRequest; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * 通用http工具封装 + * + * @author limap + */ +public class HttpHelper +{ + private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class); + + public static String getBodyString(ServletRequest request) + { + StringBuilder sb = new StringBuilder(); + BufferedReader reader = null; + try (InputStream inputStream = request.getInputStream()) + { + reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); + String line = ""; + while ((line = reader.readLine()) != null) + { + sb.append(line); + } + } + catch (IOException e) + { + LOGGER.warn("getBodyString出现问题！"); + } + finally + { + if (reader != null) + { + try + { + reader.close(); + } + catch (IOException e) + { + LOGGER.error(ExceptionUtils.getMessage(e)); + } + } + } + return sb.toString(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpUtils.java new file mode 100644 index 0000000..04d2366 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/http/HttpUtils.java @@ -0,0 +1,298 @@ +package com.limap.common.utils.http; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.net.*; +import java.nio.charset.StandardCharsets; +import java.security.cert.X509Certificate; +import java.util.zip.GZIPInputStream; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.constant.Constants; +import com.limap.common.utils.StringUtils; + +/** + * 通用http发送方法 + * + * @author limap + */ +public class HttpUtils +{ + private static final Logger log = LoggerFactory.getLogger(HttpUtils.class); + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url) + { + return sendGet(url, StringUtils.EMPTY); + } + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param) + { + return sendGet(url, param, Constants.UTF8); + } + + /** + * 向指定 URL 发送GET方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param contentType 编码类型 + * @return 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param, String contentType) + { + StringBuilder result = new StringBuilder(); + BufferedReader in = null; + try + { + String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url; + log.info("sendGet - {}", urlNameString); + URL realUrl = new URL(urlNameString); + URLConnection connection = realUrl.openConnection(); + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.connect(); + in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType)); + String line; + while ((line = in.readLine()) != null) + { + result.append(line); + } + log.info("recv - {}", result); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e); + } + finally + { + try + { + if (in != null) + { + in.close(); + } + } + catch (Exception ex) + { + log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); + } + } + return result.toString(); + } + + private static final int BUFFER_SIZE = 1024; + + public static String sendGetRequest(String urlString) throws IOException { + URL url = new URL(urlString); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + connection.setRequestProperty("Accept-Encoding", "gzip"); + connection.connect(); + + InputStream inputStream = null; + if (connection.getContentEncoding().equalsIgnoreCase("gzip")) { + inputStream = new GZIPInputStream(connection.getInputStream()); + } else { + inputStream = connection.getInputStream(); + } + + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); + StringBuilder response = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + response.append(line); + } + reader.close(); + return response.toString(); + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param) + { + PrintWriter out = null; + BufferedReader in = null; + StringBuilder result = new StringBuilder(); + try + { + log.info("sendPost - {}", url); + URL realUrl = new URL(url); + URLConnection conn = realUrl.openConnection(); + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + conn.setRequestProperty("Accept-Charset", "utf-8"); + conn.setRequestProperty("contentType", "utf-8"); + conn.setDoOutput(true); + conn.setDoInput(true); + out = new PrintWriter(conn.getOutputStream()); + out.print(param); + out.flush(); + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); + String line; + while ((line = in.readLine()) != null) + { + result.append(line); + } + log.info("recv - {}", result); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); + } + finally + { + try + { + if (out != null) + { + out.close(); + } + if (in != null) + { + in.close(); + } + } + catch (IOException ex) + { + log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); + } + } + return result.toString(); + } + + public static String sendSSLPost(String url, String param) + { + StringBuilder result = new StringBuilder(); + String urlNameString = url + "?" + param; + try + { + log.info("sendSSLPost - {}", urlNameString); + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom()); + URL console = new URL(urlNameString); + HttpsURLConnection conn = (HttpsURLConnection) console.openConnection(); + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + conn.setRequestProperty("Accept-Charset", "utf-8"); + conn.setRequestProperty("contentType", "utf-8"); + conn.setDoOutput(true); + conn.setDoInput(true); + + conn.setSSLSocketFactory(sc.getSocketFactory()); + conn.setHostnameVerifier(new TrustAnyHostnameVerifier()); + conn.connect(); + InputStream is = conn.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is)); + String ret = ""; + while ((ret = br.readLine()) != null) + { + if (ret != null && !"".equals(ret.trim())) + { + result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8)); + } + } + log.info("recv - {}", result); + conn.disconnect(); + br.close(); + } + catch (ConnectException e) + { + log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e); + } + catch (SocketTimeoutException e) + { + log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e); + } + catch (IOException e) + { + log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e); + } + catch (Exception e) + { + log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e); + } + return result.toString(); + } + + private static class TrustAnyTrustManager implements X509TrustManager + { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) + { + } + + @Override + public X509Certificate[] getAcceptedIssuers() + { + return new X509Certificate[] {}; + } + } + + private static class TrustAnyHostnameVerifier implements HostnameVerifier + { + @Override + public boolean verify(String hostname, SSLSession session) + { + return true; + } + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/AddressUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/AddressUtils.java new file mode 100644 index 0000000..690a7a4 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/AddressUtils.java @@ -0,0 +1,52 @@ +package com.limap.common.utils.ip; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.config.LimapConfig; +import com.limap.common.utils.RegionUtil; +import com.limap.common.utils.StringUtils; + +/** + * 获取地址类 + * + * @author limap + */ +public class AddressUtils +{ + private static final Logger log = LoggerFactory.getLogger(AddressUtils.class); + + // 未知地址 + public static final String UNKNOWN = "XX XX"; + + public static String getRealAddressByIP(String ip) + { + String address = UNKNOWN; + // 内网不查询 + if (IpUtils.internalIp(ip)) + { + return "内网IP"; + } + if (LimapConfig.isAddressEnabled()) + { + try + { + String rspStr = RegionUtil.getRegion(ip); + if (StringUtils.isEmpty(rspStr)) + { + log.error("获取地理位置异常 {}", ip); + return UNKNOWN; + } + String[] obj = rspStr.split("\\|"); + String region = obj[2]; + String city = obj[3]; + + return String.format("%s %s", region, city); + } + catch (Exception e) + { + log.error("获取地理位置异常 {}", e); + } + } + return address; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/IpUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/IpUtils.java new file mode 100644 index 0000000..261084b --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/ip/IpUtils.java @@ -0,0 +1,382 @@ +package com.limap.common.utils.ip; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import javax.servlet.http.HttpServletRequest; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; + +/** + * 获取IP方法 + * + * @author limap + */ +public class IpUtils +{ + public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)"; + // 匹配 ip + public final static String REGX_IP = "((" + REGX_0_255 + "\\.){3}" + REGX_0_255 + ")"; + public final static String REGX_IP_WILDCARD = "(((\\*\\.){3}\\*)|(" + REGX_0_255 + "(\\.\\*){3})|(" + REGX_0_255 + "\\." + REGX_0_255 + ")(\\.\\*){2}" + "|((" + REGX_0_255 + "\\.){3}\\*))"; + // 匹配网段 + public final static String REGX_IP_SEG = "(" + REGX_IP + "\\-" + REGX_IP + ")"; + + /** + * 获取客户端IP + * + * @return IP地址 + */ + public static String getIpAddr() + { + return getIpAddr(ServletUtils.getRequest()); + } + + /** + * 获取客户端IP + * + * @param request 请求对象 + * @return IP地址 + */ + public static String getIpAddr(HttpServletRequest request) + { + if (request == null) + { + return "unknown"; + } + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("X-Forwarded-For"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getHeader("X-Real-IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) + { + ip = request.getRemoteAddr(); + } + + return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param ip IP地址 + * @return 结果 + */ + public static boolean internalIp(String ip) + { + byte[] addr = textToNumericFormatV4(ip); + return internalIp(addr) || "127.0.0.1".equals(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param addr byte地址 + * @return 结果 + */ + private static boolean internalIp(byte[] addr) + { + if (StringUtils.isNull(addr) || addr.length < 2) + { + return true; + } + final byte b0 = addr[0]; + final byte b1 = addr[1]; + // 10.x.x.x/8 + final byte SECTION_1 = 0x0A; + // 172.16.x.x/12 + final byte SECTION_2 = (byte) 0xAC; + final byte SECTION_3 = (byte) 0x10; + final byte SECTION_4 = (byte) 0x1F; + // 192.168.x.x/16 + final byte SECTION_5 = (byte) 0xC0; + final byte SECTION_6 = (byte) 0xA8; + switch (b0) + { + case SECTION_1: + return true; + case SECTION_2: + if (b1 >= SECTION_3 && b1 <= SECTION_4) + { + return true; + } + case SECTION_5: + switch (b1) + { + case SECTION_6: + return true; + } + default: + return false; + } + } + + /** + * 将IPv4地址转换成字节 + * + * @param text IPv4地址 + * @return byte 字节 + */ + public static byte[] textToNumericFormatV4(String text) + { + if (text.length() == 0) + { + return null; + } + + byte[] bytes = new byte[4]; + String[] elements = text.split("\\.", -1); + try + { + long l; + int i; + switch (elements.length) + { + case 1: + l = Long.parseLong(elements[0]); + if ((l < 0L) || (l > 4294967295L)) + { + return null; + } + bytes[0] = (byte) (int) (l >> 24 & 0xFF); + bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 2: + l = Integer.parseInt(elements[0]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[0] = (byte) (int) (l & 0xFF); + l = Integer.parseInt(elements[1]); + if ((l < 0L) || (l > 16777215L)) + { + return null; + } + bytes[1] = (byte) (int) (l >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 3: + for (i = 0; i < 2; ++i) + { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + l = Integer.parseInt(elements[2]); + if ((l < 0L) || (l > 65535L)) + { + return null; + } + bytes[2] = (byte) (int) (l >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 4: + for (i = 0; i < 4; ++i) + { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) + { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + break; + default: + return null; + } + } + catch (NumberFormatException e) + { + return null; + } + return bytes; + } + + /** + * 获取IP地址 + * + * @return 本地IP地址 + */ + public static String getHostIp() + { + try + { + return InetAddress.getLocalHost().getHostAddress(); + } + catch (UnknownHostException e) + { + } + return "127.0.0.1"; + } + + /** + * 获取主机名 + * + * @return 本地主机名 + */ + public static String getHostName() + { + try + { + return InetAddress.getLocalHost().getHostName(); + } + catch (UnknownHostException e) + { + } + return "未知"; + } + + /** + * 从多级反向代理中获得第一个非unknown IP地址 + * + * @param ip 获得的IP地址 + * @return 第一个非unknown IP地址 + */ + public static String getMultistageReverseProxyIp(String ip) + { + // 多级反向代理检测 + if (ip != null && ip.indexOf(",") > 0) + { + final String[] ips = ip.trim().split(","); + for (String subIp : ips) + { + if (false == isUnknown(subIp)) + { + ip = subIp; + break; + } + } + } + return StringUtils.substring(ip, 0, 255); + } + + /** + * 检测给定字符串是否为未知，多用于检测HTTP请求相关 + * + * @param checkString 被检测的字符串 + * @return 是否未知 + */ + public static boolean isUnknown(String checkString) + { + return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); + } + + /** + * 是否为IP + */ + public static boolean isIP(String ip) + { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP); + } + + /** + * 是否为IP，或 *为间隔的通配符地址 + */ + public static boolean isIpWildCard(String ip) + { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD); + } + + /** + * 检测参数是否在ip通配符里 + */ + public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip) + { + String[] s1 = ipWildCard.split("\\."); + String[] s2 = ip.split("\\."); + boolean isMatchedSeg = true; + for (int i = 0; i < s1.length && !s1[i].equals("*"); i++) + { + if (!s1[i].equals(s2[i])) + { + isMatchedSeg = false; + break; + } + } + return isMatchedSeg; + } + + /** + * 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串 + */ + public static boolean isIPSegment(String ipSeg) + { + return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG); + } + + /** + * 判断ip是否在指定网段中 + */ + public static boolean ipIsInNetNoCheck(String iparea, String ip) + { + int idx = iparea.indexOf('-'); + String[] sips = iparea.substring(0, idx).split("\\."); + String[] sipe = iparea.substring(idx + 1).split("\\."); + String[] sipt = ip.split("\\."); + long ips = 0L, ipe = 0L, ipt = 0L; + for (int i = 0; i < 4; ++i) + { + ips = ips << 8 | Integer.parseInt(sips[i]); + ipe = ipe << 8 | Integer.parseInt(sipe[i]); + ipt = ipt << 8 | Integer.parseInt(sipt[i]); + } + if (ips > ipe) + { + long t = ips; + ips = ipe; + ipe = t; + } + return ips <= ipt && ipt <= ipe; + } + + /** + * 校验ip是否符合过滤串规则 + * + * @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99` + * @param ip 校验IP地址 + * @return boolean 结果 + */ + public static boolean isMatchedIp(String filter, String ip) + { + if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip)) + { + return false; + } + String[] ips = filter.split(";"); + for (String iStr : ips) + { + if (isIP(iStr) && iStr.equals(ip)) + { + return true; + } + else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip)) + { + return true; + } + else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip)) + { + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelHandlerAdapter.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelHandlerAdapter.java new file mode 100644 index 0000000..a181f17 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelHandlerAdapter.java @@ -0,0 +1,19 @@ +package com.limap.common.utils.poi; + +/** + * Excel数据格式处理适配器 + * + * @author limap + */ +public interface ExcelHandlerAdapter +{ + /** + * 格式化 + * + * @param value 单元格数据值 + * @param args excel注解args参数组 + * + * @return 处理后的值 + */ + Object format(Object value, String[] args); +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelUtil.java new file mode 100644 index 0000000..4e0b80d --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/ExcelUtil.java @@ -0,0 +1,1734 @@ +package com.limap.common.utils.poi; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.RegExUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import org.apache.poi.hssf.usermodel.HSSFPicture; +import org.apache.poi.hssf.usermodel.HSSFPictureData; +import org.apache.poi.hssf.usermodel.HSSFShape; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ss.usermodel.BorderStyle; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.ClientAnchor; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.DateUtil; +import org.apache.poi.ss.usermodel.Drawing; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Name; +import org.apache.poi.ss.usermodel.PictureData; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.XSSFClientAnchor; +import org.apache.poi.xssf.usermodel.XSSFDataValidation; +import org.apache.poi.xssf.usermodel.XSSFDrawing; +import org.apache.poi.xssf.usermodel.XSSFPicture; +import org.apache.poi.xssf.usermodel.XSSFShape; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.annotation.Excel.Type; +import com.limap.common.annotation.Excels; +import com.limap.common.config.LimapConfig; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.text.Convert; +import com.limap.common.exception.UtilException; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.DictUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.file.FileTypeUtils; +import com.limap.common.utils.file.FileUtils; +import com.limap.common.utils.file.ImageUtils; +import com.limap.common.utils.reflect.ReflectUtils; + +/** + * Excel相关处理 + * + * @author limap + */ +public class ExcelUtil +{ + private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class); + + public static final String FORMULA_REGEX_STR = "=|-|\\+|@"; + + public static final String[] FORMULA_STR = { "=", "-", "+", "@" }; + + /** + * Excel sheet最大行数，默认65536 + */ + public static final int sheetSize = 65536; + + /** + * 工作表名称 + */ + private String sheetName; + + /** + * 导出类型（EXPORT:导出数据；IMPORT：导入模板） + */ + private Type type; + + /** + * 工作薄对象 + */ + private Workbook wb; + + /** + * 工作表对象 + */ + private Sheet sheet; + + /** + * 样式列表 + */ + private Map styles; + + /** + * 导入导出数据列表 + */ + private List list; + + /** + * 注解列表 + */ + private List fields; + + /** + * 当前行号 + */ + private int rownum; + + /** + * 标题 + */ + private String title; + + /** + * 最大高度 + */ + private short maxHeight; + + /** + * 合并后最后行数 + */ + private int subMergedLastRowNum = 0; + + /** + * 合并后开始行数 + */ + private int subMergedFirstRowNum = 1; + + /** + * 对象的子列表方法 + */ + private Method subMethod; + + /** + * 对象的子列表属性 + */ + private List subFields; + + /** + * 统计列表 + */ + private Map statistics = new HashMap(); + + /** + * 数字格式 + */ + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + + /** + * 实体对象 + */ + public Class clazz; + + /** + * 需要排除列属性 + */ + public String[] excludeFields; + + public ExcelUtil(Class clazz) + { + this.clazz = clazz; + } + + /** + * 隐藏Excel中列属性 + * + * @param fields 列属性名 示例[单个"name"/多个"id","name"] + * @throws Exception + */ + public void hideColumn(String... fields) + { + this.excludeFields = fields; + } + + public void init(List list, String sheetName, String title, Type type) + { + if (list == null) + { + list = new ArrayList(); + } + this.list = list; + this.sheetName = sheetName; + this.type = type; + this.title = title; + createExcelField(); + createWorkbook(); + createTitle(); + createSubHead(); + } + + /** + * 创建excel第一行标题 + */ + public void createTitle() + { + if (StringUtils.isNotEmpty(title)) + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + int titleLastCol = this.fields.size() - 1; + if (isSubList()) + { + titleLastCol = titleLastCol + subFields.size() - 1; + } + Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0); + titleRow.setHeightInPoints(30); + Cell titleCell = titleRow.createCell(0); + titleCell.setCellStyle(styles.get("title")); + titleCell.setCellValue(title); + sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol)); + } + } + + /** + * 创建对象的子列表名称 + */ + public void createSubHead() + { + if (isSubList()) + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + Row subRow = sheet.createRow(rownum); + int excelNum = 0; + for (Object[] objects : fields) + { + Excel attr = (Excel) objects[1]; + Cell headCell1 = subRow.createCell(excelNum); + headCell1.setCellValue(attr.name()); + headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); + excelNum++; + } + int headFirstRow = excelNum - 1; + int headLastRow = headFirstRow + subFields.size() - 1; + if (headLastRow > headFirstRow) + { + sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow)); + } + rownum++; + } + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(InputStream is) throws Exception + { + return importExcel(is, 0); + } + + /** + * 对excel表单默认第一个索引名转换成list + * + * @param is 输入流 + * @param titleNum 标题占用行数 + * @return 转换后集合 + */ + public List importExcel(InputStream is, int titleNum) throws Exception + { + return importExcel(StringUtils.EMPTY, is, titleNum); + } + + /** + * 对excel表单指定表格索引名转换成list + * + * @param sheetName 表格索引名 + * @param titleNum 标题占用行数 + * @param is 输入流 + * @return 转换后集合 + */ + public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception + { + this.type = Type.IMPORT; + this.wb = WorkbookFactory.create(is); + List list = new ArrayList(); + // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet + Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0); + if (sheet == null) + { + throw new IOException("文件sheet不存在"); + } + boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook); + Map pictures; + if (isXSSFWorkbook) + { + pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb); + } + else + { + pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb); + } + // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1 + int rows = sheet.getLastRowNum(); + + if (rows > 0) + { + // 定义一个map用于存放excel列的序号和field. + Map cellMap = new HashMap(); + // 获取表头 + Row heard = sheet.getRow(titleNum); + for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) + { + Cell cell = heard.getCell(i); + if (StringUtils.isNotNull(cell)) + { + String value = this.getCellValue(heard, i).toString(); + cellMap.put(value, i); + } + else + { + cellMap.put(null, i); + } + } + // 有数据时才处理 得到类的所有field. + List fields = this.getFields(); + Map fieldsMap = new HashMap(); + for (Object[] objects : fields) + { + Excel attr = (Excel) objects[1]; + Integer column = cellMap.get(attr.name()); + if (column != null) + { + fieldsMap.put(column, objects); + } + } + for (int i = titleNum + 1; i <= rows; i++) + { + // 从第2行开始取数据,默认第一行是表头. + Row row = sheet.getRow(i); + // 判断当前行是否是空行 + if (isRowEmpty(row)) + { + continue; + } + T entity = null; + for (Map.Entry entry : fieldsMap.entrySet()) + { + Object val = this.getCellValue(row, entry.getKey()); + + // 如果不存在实例则新建. + entity = (entity == null ? clazz.newInstance() : entity); + // 从map中得到对应列的field. + Field field = (Field) entry.getValue()[0]; + Excel attr = (Excel) entry.getValue()[1]; + // 取得类型,并根据对象类型设置值. + Class fieldType = field.getType(); + if (String.class == fieldType) + { + String s = Convert.toStr(val); + if (StringUtils.endsWith(s, ".0")) + { + val = StringUtils.substringBefore(s, ".0"); + } + else + { + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if (StringUtils.isNotEmpty(dateFormat)) + { + val = parseDateToStr(dateFormat, val); + } + else + { + val = Convert.toStr(val); + } + } + } + else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) + { + val = Convert.toInt(val); + } + else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) + { + val = Convert.toLong(val); + } + else if (Double.TYPE == fieldType || Double.class == fieldType) + { + val = Convert.toDouble(val); + } + else if (Float.TYPE == fieldType || Float.class == fieldType) + { + val = Convert.toFloat(val); + } + else if (BigDecimal.class == fieldType) + { + val = Convert.toBigDecimal(val); + } + else if (Date.class == fieldType) + { + if (val instanceof String) + { + val = DateUtils.parseDate(val); + } + else if (val instanceof Double) + { + val = DateUtil.getJavaDate((Double) val); + } + } + else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) + { + val = Convert.toBool(val, false); + } + if (StringUtils.isNotNull(fieldType)) + { + String propertyName = field.getName(); + if (StringUtils.isNotEmpty(attr.targetAttr())) + { + propertyName = field.getName() + "." + attr.targetAttr(); + } + else if (StringUtils.isNotEmpty(attr.readConverterExp())) + { + val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator()); + } + else if (StringUtils.isNotEmpty(attr.dictType())) + { + val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + val = dataFormatHandlerAdapter(val, attr); + } + else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures)) + { + PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey()); + if (image == null) + { + val = ""; + } + else + { + byte[] data = image.getData(); + val = FileUtils.writeImportBytes(data); + } + } + ReflectUtils.invokeSetter(entity, propertyName, val); + } + } + list.add(entity); + } + } + return list; + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @return 结果 + */ + public AjaxResult exportExcel(List list, String sheetName) + { + return exportExcel(list, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public AjaxResult exportExcel(List list, String sheetName, String title) + { + this.init(list, sheetName, title, Type.EXPORT); + return exportExcel(); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param response 返回数据 + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @return 结果 + */ + public void exportExcel(HttpServletResponse response, List list, String sheetName) + { + exportExcel(response, list, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param response 返回数据 + * @param list 导出数据集合 + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public void exportExcel(HttpServletResponse response, List list, String sheetName, String title) + { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + this.init(list, sheetName, title, Type.EXPORT); + exportExcel(response); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @return 结果 + */ + public AjaxResult importTemplateExcel(String sheetName) + { + return importTemplateExcel(sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public AjaxResult importTemplateExcel(String sheetName, String title) + { + this.init(null, sheetName, title, Type.IMPORT); + return exportExcel(); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @return 结果 + */ + public void importTemplateExcel(HttpServletResponse response, String sheetName) + { + importTemplateExcel(response, sheetName, StringUtils.EMPTY); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @param sheetName 工作表的名称 + * @param title 标题 + * @return 结果 + */ + public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) + { + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setCharacterEncoding("utf-8"); + this.init(null, sheetName, title, Type.IMPORT); + exportExcel(response); + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @return 结果 + */ + public void exportExcel(HttpServletResponse response) + { + try + { + writeSheet(); + wb.write(response.getOutputStream()); + } + catch (Exception e) + { + log.error("导出Excel异常{}", e.getMessage()); + } + finally + { + IOUtils.closeQuietly(wb); + } + } + + /** + * 对list数据源将其里面的数据导入到excel表单 + * + * @return 结果 + */ + public AjaxResult exportExcel() + { + OutputStream out = null; + try + { + writeSheet(); + String filename = encodingFilename(sheetName); + out = new FileOutputStream(getAbsoluteFile(filename)); + wb.write(out); + return AjaxResult.success(filename); + } + catch (Exception e) + { + log.error("导出Excel异常{}", e.getMessage()); + throw new UtilException("导出Excel失败，请联系网站管理员！"); + } + finally + { + IOUtils.closeQuietly(wb); + IOUtils.closeQuietly(out); + } + } + + /** + * 创建写入数据到Sheet + */ + public void writeSheet() + { + // 取出一共有多少个sheet. + int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize)); + for (int index = 0; index < sheetNo; index++) + { + createSheet(sheetNo, index); + + // 产生一行 + Row row = sheet.createRow(rownum); + int column = 0; + // 写入各个字段的列头名称 + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + if (Collection.class.isAssignableFrom(field.getType())) + { + for (Field subField : subFields) + { + Excel subExcel = subField.getAnnotation(Excel.class); + this.createHeadCell(subExcel, row, column++); + } + } + else + { + this.createHeadCell(excel, row, column++); + } + } + if (Type.EXPORT.equals(type)) + { + fillExcelData(index, row); + addStatisticsRow(); + } + } + } + + /** + * 填充excel数据 + * + * @param index 序号 + * @param row 单元格行 + */ + @SuppressWarnings("unchecked") + public void fillExcelData(int index, Row row) + { + int startNo = index * sheetSize; + int endNo = Math.min(startNo + sheetSize, list.size()); + int rowNo = (1 + rownum) - startNo; + for (int i = startNo; i < endNo; i++) + { + rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo; + row = sheet.createRow(rowNo); + // 得到导出对象. + T vo = (T) list.get(i); + Collection subList = null; + if (isSubList()) + { + if (isSubListValue(vo)) + { + subList = getListCellValue(vo); + subMergedLastRowNum = subMergedLastRowNum + subList.size(); + } + else + { + subMergedFirstRowNum++; + subMergedLastRowNum++; + } + } + int column = 0; + for (Object[] os : fields) + { + Field field = (Field) os[0]; + Excel excel = (Excel) os[1]; + if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) + { + boolean subFirst = false; + for (Object obj : subList) + { + if (subFirst) + { + rowNo++; + row = sheet.createRow(rowNo); + } + List subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class); + int subIndex = 0; + for (Field subField : subFields) + { + if (subField.isAnnotationPresent(Excel.class)) + { + subField.setAccessible(true); + Excel attr = subField.getAnnotation(Excel.class); + this.addCell(attr, row, (T) obj, subField, column + subIndex); + } + subIndex++; + } + subFirst = true; + } + this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size(); + } + else + { + this.addCell(excel, row, vo, field, column++); + } + } + } + } + + /** + * 创建表格样式 + * + * @param wb 工作薄对象 + * @return 样式列表 + */ + private Map createStyles(Workbook wb) + { + // 写入各条记录,每条记录对应excel表中的一行 + Map styles = new HashMap(); + CellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font titleFont = wb.createFont(); + titleFont.setFontName("Arial"); + titleFont.setFontHeightInPoints((short) 16); + titleFont.setBold(true); + style.setFont(titleFont); + styles.put("title", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + style.setFont(dataFont); + styles.put("data", style); + + style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font totalFont = wb.createFont(); + totalFont.setFontName("Arial"); + totalFont.setFontHeightInPoints((short) 10); + style.setFont(totalFont); + styles.put("total", style); + + styles.putAll(annotationHeaderStyles(wb, styles)); + + styles.putAll(annotationDataStyles(wb)); + + return styles; + } + + /** + * 根据Excel注解创建表格头样式 + * + * @param wb 工作薄对象 + * @return 自定义样式列表 + */ + private Map annotationHeaderStyles(Workbook wb, Map styles) + { + Map headerStyles = new HashMap(); + for (Object[] os : fields) + { + Excel excel = (Excel) os[1]; + String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor()); + if (!headerStyles.containsKey(key)) + { + CellStyle style = wb.createCellStyle(); + style.cloneStyleFrom(styles.get("data")); + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setFillForegroundColor(excel.headerBackgroundColor().index); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + Font headerFont = wb.createFont(); + headerFont.setFontName("Arial"); + headerFont.setFontHeightInPoints((short) 10); + headerFont.setBold(true); + headerFont.setColor(excel.headerColor().index); + style.setFont(headerFont); + headerStyles.put(key, style); + } + } + return headerStyles; + } + + /** + * 根据Excel注解创建表格列样式 + * + * @param wb 工作薄对象 + * @return 自定义样式列表 + */ + private Map annotationDataStyles(Workbook wb) + { + Map styles = new HashMap(); + for (Object[] os : fields) + { + Excel excel = (Excel) os[1]; + String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor()); + if (!styles.containsKey(key)) + { + CellStyle style = wb.createCellStyle(); + style.setAlignment(excel.align()); + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setBorderRight(BorderStyle.THIN); + style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderLeft(BorderStyle.THIN); + style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderTop(BorderStyle.THIN); + style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setBorderBottom(BorderStyle.THIN); + style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + style.setFillForegroundColor(excel.backgroundColor().getIndex()); + Font dataFont = wb.createFont(); + dataFont.setFontName("Arial"); + dataFont.setFontHeightInPoints((short) 10); + dataFont.setColor(excel.color().index); + style.setFont(dataFont); + styles.put(key, style); + } + } + return styles; + } + + /** + * 创建单元格 + */ + public Cell createHeadCell(Excel attr, Row row, int column) + { + // 创建列 + Cell cell = row.createCell(column); + // 写入列信息 + cell.setCellValue(attr.name()); + setDataValidation(attr, row, column); + cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); + if (isSubList()) + { + // 填充默认样式，防止合并单元格样式失效 + sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor()))); + if (attr.needMerge()) + { + sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column)); + } + } + return cell; + } + + /** + * 设置单元格信息 + * + * @param value 单元格值 + * @param attr 注解相关 + * @param cell 单元格信息 + */ + public void setCellVo(Object value, Excel attr, Cell cell) + { + if (ColumnType.STRING == attr.cellType()) + { + String cellValue = Convert.toStr(value); + // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。 + if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) + { + cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0"); + } + if (value instanceof Collection && StringUtils.equals("[]", cellValue)) + { + cellValue = StringUtils.EMPTY; + } + cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix()); + } + else if (ColumnType.NUMERIC == attr.cellType()) + { + if (StringUtils.isNotNull(value)) + { + cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)); + } + } + else if (ColumnType.IMAGE == attr.cellType()) + { + ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1); + String imagePath = Convert.toStr(value); + if (StringUtils.isNotEmpty(imagePath)) + { + byte[] data = ImageUtils.getImage(imagePath); + getDrawingPatriarch(cell.getSheet()).createPicture(anchor, + cell.getSheet().getWorkbook().addPicture(data, getImageType(data))); + } + } + } + + /** + * 获取画布 + */ + public static Drawing getDrawingPatriarch(Sheet sheet) + { + if (sheet.getDrawingPatriarch() == null) + { + sheet.createDrawingPatriarch(); + } + return sheet.getDrawingPatriarch(); + } + + /** + * 获取图片类型,设置图片插入类型 + */ + public int getImageType(byte[] value) + { + String type = FileTypeUtils.getFileExtendName(value); + if ("JPG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_JPEG; + } + else if ("PNG".equalsIgnoreCase(type)) + { + return Workbook.PICTURE_TYPE_PNG; + } + return Workbook.PICTURE_TYPE_JPEG; + } + + /** + * 创建表格样式 + */ + public void setDataValidation(Excel attr, Row row, int column) + { + if (attr.name().indexOf("注：") >= 0) + { + sheet.setColumnWidth(column, 6000); + } + else + { + // 设置列宽 + sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); + } + if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) + { + if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) + { + // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到 + setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); + } + else + { + // 提示信息或只能选择不能输入的列内容. + setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); + } + } + } + + /** + * 添加单元格 + */ + public Cell addCell(Excel attr, Row row, T vo, Field field, int column) + { + Cell cell = null; + try + { + // 设置行高 + row.setHeight(maxHeight); + // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列. + if (attr.isExport()) + { + // 创建cell + cell = row.createCell(column); + if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) + { + CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column); + sheet.addMergedRegion(cellAddress); + } + cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor()))); + + // 用于读取对象中的属性 + Object value = getTargetValue(vo, field, attr); + String dateFormat = attr.dateFormat(); + String readConverterExp = attr.readConverterExp(); + String separator = attr.separator(); + String dictType = attr.dictType(); + if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) + { + cell.setCellValue(parseDateToStr(dateFormat, value)); + } + else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator)); + } + else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value)) + { + cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator)); + } + else if (value instanceof BigDecimal && -1 != attr.scale()) + { + cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue()); + } + else if (!attr.handler().equals(ExcelHandlerAdapter.class)) + { + cell.setCellValue(dataFormatHandlerAdapter(value, attr)); + } + else + { + // 设置列类型 + setCellVo(value, attr, cell); + } + addStatisticsData(column, Convert.toStr(value), attr); + } + } + catch (Exception e) + { + log.error("导出Excel失败{}", e); + } + return cell; + } + + /** + * 设置 POI XSSFSheet 单元格提示或选择框 + * + * @param sheet 表单 + * @param textlist 下拉框显示的内容 + * @param promptContent 提示内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + */ + public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, + int firstCol, int endCol) + { + DataValidationHelper helper = sheet.getDataValidationHelper(); + DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1"); + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + DataValidation dataValidation = helper.createValidation(constraint, regions); + if (StringUtils.isNotEmpty(promptContent)) + { + // 如果设置了提示信息则鼠标放上去提示 + dataValidation.createPromptBox("", promptContent); + dataValidation.setShowPromptBox(true); + } + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) + { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } + else + { + dataValidation.setSuppressDropDownArrow(false); + } + sheet.addValidationData(dataValidation); + } + + /** + * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）. + * + * @param sheet 要设置的sheet. + * @param textlist 下拉框显示的内容 + * @param promptContent 提示内容 + * @param firstRow 开始行 + * @param endRow 结束行 + * @param firstCol 开始列 + * @param endCol 结束列 + */ + public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) + { + String hideSheetName = "combo_" + firstCol + "_" + endCol; + Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据 + for (int i = 0; i < textlist.length; i++) + { + hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]); + } + // 创建名称，可被其他单元格引用 + Name name = wb.createName(); + name.setNameName(hideSheetName + "_data"); + name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length); + DataValidationHelper helper = sheet.getDataValidationHelper(); + // 加载下拉列表内容 + DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data"); + // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 + CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); + // 数据有效性对象 + DataValidation dataValidation = helper.createValidation(constraint, regions); + if (StringUtils.isNotEmpty(promptContent)) + { + // 如果设置了提示信息则鼠标放上去提示 + dataValidation.createPromptBox("", promptContent); + dataValidation.setShowPromptBox(true); + } + // 处理Excel兼容性问题 + if (dataValidation instanceof XSSFDataValidation) + { + dataValidation.setSuppressDropDownArrow(true); + dataValidation.setShowErrorBox(true); + } + else + { + dataValidation.setSuppressDropDownArrow(false); + } + + sheet.addValidationData(dataValidation); + // 设置hiddenSheet隐藏 + wb.setSheetHidden(wb.getSheetIndex(hideSheet), true); + } + + /** + * 解析导出值 0=男,1=女,2=未知 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String convertByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[0].equals(value)) + { + propertyString.append(itemArray[1] + separator); + break; + } + } + } + else + { + if (itemArray[0].equals(propertyValue)) + { + return itemArray[1]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 反向解析值 男=0,女=1,未知=2 + * + * @param propertyValue 参数值 + * @param converterExp 翻译注解 + * @param separator 分隔符 + * @return 解析后值 + */ + public static String reverseByExp(String propertyValue, String converterExp, String separator) + { + StringBuilder propertyString = new StringBuilder(); + String[] convertSource = converterExp.split(","); + for (String item : convertSource) + { + String[] itemArray = item.split("="); + if (StringUtils.containsAny(propertyValue, separator)) + { + for (String value : propertyValue.split(separator)) + { + if (itemArray[1].equals(value)) + { + propertyString.append(itemArray[0] + separator); + break; + } + } + } + else + { + if (itemArray[1].equals(propertyValue)) + { + return itemArray[0]; + } + } + } + return StringUtils.stripEnd(propertyString.toString(), separator); + } + + /** + * 解析字典值 + * + * @param dictValue 字典值 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典标签 + */ + public static String convertDictByExp(String dictValue, String dictType, String separator) + { + return DictUtils.getDictLabel(dictType, dictValue, separator); + } + + /** + * 反向解析值字典值 + * + * @param dictLabel 字典标签 + * @param dictType 字典类型 + * @param separator 分隔符 + * @return 字典值 + */ + public static String reverseDictByExp(String dictLabel, String dictType, String separator) + { + return DictUtils.getDictValue(dictType, dictLabel, separator); + } + + /** + * 数据处理器 + * + * @param value 数据值 + * @param excel 数据注解 + * @return + */ + public String dataFormatHandlerAdapter(Object value, Excel excel) + { + try + { + Object instance = excel.handler().newInstance(); + Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class }); + value = formatMethod.invoke(instance, value, excel.args()); + } + catch (Exception e) + { + log.error("不能格式化数据 " + excel.handler(), e.getMessage()); + } + return Convert.toStr(value); + } + + /** + * 合计统计信息 + */ + private void addStatisticsData(Integer index, String text, Excel entity) + { + if (entity != null && entity.isStatistics()) + { + Double temp = 0D; + if (!statistics.containsKey(index)) + { + statistics.put(index, temp); + } + try + { + temp = Double.valueOf(text); + } + catch (NumberFormatException e) + { + } + statistics.put(index, statistics.get(index) + temp); + } + } + + /** + * 创建统计行 + */ + public void addStatisticsRow() + { + if (statistics.size() > 0) + { + Row row = sheet.createRow(sheet.getLastRowNum() + 1); + Set keys = statistics.keySet(); + Cell cell = row.createCell(0); + cell.setCellStyle(styles.get("total")); + cell.setCellValue("合计"); + + for (Integer key : keys) + { + cell = row.createCell(key); + cell.setCellStyle(styles.get("total")); + cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key))); + } + statistics.clear(); + } + } + + /** + * 编码文件名 + */ + public String encodingFilename(String filename) + { + filename = UUID.randomUUID() + "_" + filename + ".xlsx"; + return filename; + } + + /** + * 获取下载路径 + * + * @param filename 文件名称 + */ + public String getAbsoluteFile(String filename) + { + String downloadPath = LimapConfig.getDownloadPath() + filename; + File desc = new File(downloadPath); + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + return downloadPath; + } + + /** + * 获取bean中的属性值 + * + * @param vo 实体对象 + * @param field 字段 + * @param excel 注解 + * @return 最终的属性值 + * @throws Exception + */ + private Object getTargetValue(T vo, Field field, Excel excel) throws Exception + { + Object o = field.get(vo); + if (StringUtils.isNotEmpty(excel.targetAttr())) + { + String target = excel.targetAttr(); + if (target.contains(".")) + { + String[] targets = target.split("[.]"); + for (String name : targets) + { + o = getValue(o, name); + } + } + else + { + o = getValue(o, target); + } + } + return o; + } + + /** + * 以类的属性的get方法方法形式获取值 + * + * @param o + * @param name + * @return value + * @throws Exception + */ + private Object getValue(Object o, String name) throws Exception + { + if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) + { + Class clazz = o.getClass(); + Field field = clazz.getDeclaredField(name); + field.setAccessible(true); + o = field.get(o); + } + return o; + } + + /** + * 得到所有定义字段 + */ + private void createExcelField() + { + this.fields = getFields(); + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); + this.maxHeight = getRowHeight(); + } + + /** + * 获取字段注解信息 + */ + public List getFields() + { + List fields = new ArrayList(); + List tempFields = new ArrayList<>(); + tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); + tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); + for (Field field : tempFields) + { + if (!ArrayUtils.contains(this.excludeFields, field.getName())) + { + // 单注解 + if (field.isAnnotationPresent(Excel.class)) + { + Excel attr = field.getAnnotation(Excel.class); + if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + { + field.setAccessible(true); + fields.add(new Object[] { field, attr }); + } + if (Collection.class.isAssignableFrom(field.getType())) + { + subMethod = getSubMethod(field.getName(), clazz); + ParameterizedType pt = (ParameterizedType) field.getGenericType(); + Class subClass = (Class) pt.getActualTypeArguments()[0]; + this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class); + } + } + + // 多注解 + if (field.isAnnotationPresent(Excels.class)) + { + Excels attrs = field.getAnnotation(Excels.class); + Excel[] excels = attrs.value(); + for (Excel attr : excels) + { + if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) + { + field.setAccessible(true); + fields.add(new Object[] { field, attr }); + } + } + } + } + } + return fields; + } + + /** + * 根据注解获取最大行高 + */ + public short getRowHeight() + { + double maxHeight = 0; + for (Object[] os : this.fields) + { + Excel excel = (Excel) os[1]; + maxHeight = Math.max(maxHeight, excel.height()); + } + return (short) (maxHeight * 20); + } + + /** + * 创建一个工作簿 + */ + public void createWorkbook() + { + this.wb = new SXSSFWorkbook(500); + this.sheet = wb.createSheet(); + wb.setSheetName(0, sheetName); + this.styles = createStyles(wb); + } + + /** + * 创建工作表 + * + * @param sheetNo sheet数量 + * @param index 序号 + */ + public void createSheet(int sheetNo, int index) + { + // 设置工作表的名称. + if (sheetNo > 1 && index > 0) + { + this.sheet = wb.createSheet(); + this.createTitle(); + wb.setSheetName(index, sheetName + index); + } + } + + /** + * 获取单元格值 + * + * @param row 获取的行 + * @param column 获取单元格列号 + * @return 单元格值 + */ + public Object getCellValue(Row row, int column) + { + if (row == null) + { + return row; + } + Object val = ""; + try + { + Cell cell = row.getCell(column); + if (StringUtils.isNotNull(cell)) + { + if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) + { + val = cell.getNumericCellValue(); + if (DateUtil.isCellDateFormatted(cell)) + { + val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换 + } + else + { + if ((Double) val % 1 != 0) + { + val = new BigDecimal(val.toString()); + } + else + { + val = new DecimalFormat("0").format(val); + } + } + } + else if (cell.getCellType() == CellType.STRING) + { + val = cell.getStringCellValue(); + } + else if (cell.getCellType() == CellType.BOOLEAN) + { + val = cell.getBooleanCellValue(); + } + else if (cell.getCellType() == CellType.ERROR) + { + val = cell.getErrorCellValue(); + } + + } + } + catch (Exception e) + { + return val; + } + return val; + } + + /** + * 判断是否是空行 + * + * @param row 判断的行 + * @return + */ + private boolean isRowEmpty(Row row) + { + if (row == null) + { + return true; + } + for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) + { + Cell cell = row.getCell(i); + if (cell != null && cell.getCellType() != CellType.BLANK) + { + return false; + } + } + return true; + } + + /** + * 获取Excel2003图片 + * + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData + */ + public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook) + { + Map sheetIndexPicMap = new HashMap(); + List pictures = workbook.getAllPictures(); + if (!pictures.isEmpty()) + { + for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) + { + HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor(); + if (shape instanceof HSSFPicture) + { + HSSFPicture pic = (HSSFPicture) shape; + int pictureIndex = pic.getPictureIndex() - 1; + HSSFPictureData picData = pictures.get(pictureIndex); + String picIndex = anchor.getRow1() + "_" + anchor.getCol1(); + sheetIndexPicMap.put(picIndex, picData); + } + } + return sheetIndexPicMap; + } + else + { + return sheetIndexPicMap; + } + } + + /** + * 获取Excel2007图片 + * + * @param sheet 当前sheet对象 + * @param workbook 工作簿对象 + * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData + */ + public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) + { + Map sheetIndexPicMap = new HashMap(); + for (POIXMLDocumentPart dr : sheet.getRelations()) + { + if (dr instanceof XSSFDrawing) + { + XSSFDrawing drawing = (XSSFDrawing) dr; + List shapes = drawing.getShapes(); + for (XSSFShape shape : shapes) + { + if (shape instanceof XSSFPicture) + { + XSSFPicture pic = (XSSFPicture) shape; + XSSFClientAnchor anchor = pic.getPreferredSize(); + CTMarker ctMarker = anchor.getFrom(); + String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol(); + sheetIndexPicMap.put(picIndex, pic.getPictureData()); + } + } + } + } + return sheetIndexPicMap; + } + + /** + * 格式化不同类型的日期对象 + * + * @param dateFormat 日期格式 + * @param val 被格式化的日期对象 + * @return 格式化后的日期字符 + */ + public String parseDateToStr(String dateFormat, Object val) + { + if (val == null) + { + return ""; + } + String str; + if (val instanceof Date) + { + str = DateUtils.parseDateToStr(dateFormat, (Date) val); + } + else if (val instanceof LocalDateTime) + { + str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val)); + } + else if (val instanceof LocalDate) + { + str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val)); + } + else + { + str = val.toString(); + } + return str; + } + + /** + * 是否有对象的子列表 + */ + public boolean isSubList() + { + return StringUtils.isNotNull(subFields) && subFields.size() > 0; + } + + /** + * 是否有对象的子列表，集合不为空 + */ + public boolean isSubListValue(T vo) + { + return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0; + } + + /** + * 获取集合的值 + */ + public Collection getListCellValue(Object obj) + { + Object value; + try + { + value = subMethod.invoke(obj, new Object[] {}); + } + catch (Exception e) + { + return new ArrayList(); + } + return (Collection) value; + } + + /** + * 获取对象的子列表方法 + * + * @param name 名称 + * @param pojoClass 类对象 + * @return 子列表方法 + */ + public Method getSubMethod(String name, Class pojoClass) + { + StringBuffer getMethodName = new StringBuffer("get"); + getMethodName.append(name.substring(0, 1).toUpperCase()); + getMethodName.append(name.substring(1)); + Method method = null; + try + { + method = pojoClass.getMethod(getMethodName.toString(), new Class[] {}); + } + catch (Exception e) + { + log.error("获取对象异常{}", e.getMessage()); + } + return method; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/PoiUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/PoiUtil.java new file mode 100644 index 0000000..b8ed9f2 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/PoiUtil.java @@ -0,0 +1,45 @@ +package com.limap.common.utils.poi; + +import com.limap.common.utils.poi.parser.*; +import org.apache.poi.xwpf.usermodel.XWPFDocument; + +/** + * @author Lenovo + */ +public class PoiUtil { + + /** + *

word模板文字、表格、图表内容替换

+ * + * @author Allen Yang + * @datetime 2021/11/19 11:11 + */ + public static WordContentParser replaceWordContent(WordContentParserVO param) { + XWPFDocument doc = WordContentParser.loadXWPFDocument(param.getPath()); + //文字替换 + WordParagraphParser paragraphParser = new WordParagraphParser(doc, param.getTextReplaceMap()); + paragraphParser.replace(); + + //表格替换 + if(param.getTableReplaces() != null){ + WordTableParser tableParser = new WordTableParser(doc, param.getTableReplaces(), param.getTextReplaceMap()); + tableParser.replace(); + } + + //图表替换 + if(param.getChartReplaces() != null){ + WordChartParser chartParser = new WordChartParser(doc, param.getChartReplaces()); + chartParser.replace(); +// chartParser.generateChart(); + } + + //图片替换 + if(param.getPictureReplaces() != null){ + WordPictureParser pictureParser = new WordPictureParser(doc, param.getPictureReplaces()); + pictureParser.replace(); + } + + return paragraphParser; + } + +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordChartParser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordChartParser.java new file mode 100644 index 0000000..c1517a3 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordChartParser.java @@ -0,0 +1,206 @@ +package com.limap.common.utils.poi.parser; + +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellReference; +import org.apache.poi.xddf.usermodel.chart.*; +import org.apache.poi.xwpf.usermodel.XWPFChart; +import org.apache.poi.xwpf.usermodel.XWPFDocument; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + *

Word图表解析器

+ * + * @author Allen Yang + * @datetime 2021/11/18 14:53 + */ +@Setter +@Getter +public class WordChartParser extends WordContentParser { + + private List chartReplaces; + + public WordChartParser(InputStream in, List chartReplaces) { + super(in); + this.chartReplaces = chartReplaces; + } + + public WordChartParser(XWPFDocument doc, List chartReplaces) { + super(doc); + this.chartReplaces = chartReplaces; + } + + public WordChartParser(InputStream in) { + super(in); + } + + public WordChartParser(XWPFDocument doc) { + super(doc); + } + + public WordChartParser(String path) { + super(path); + } + + @Setter + @Getter + public static class ChartReplace { + //图表标题 + private String chartTitle; + //x分类轴标题 + private String categoryAxisTitle; + //y值轴标题 + private String valueAxesTitle; + //图表在word文档中的xml名称，格式 /word/charts/chart1.xml | /word/charts/chart2.xml +// private String chartXmlName; + //图表在模板中的下标，从1开始 + private int index; + //图表分类名称 + private String[] categoryNames; + + private String[] categoryNames1; + //图表数据行值 + private List lineValues; + } + + @Setter + @Getter + public static class LineValue { + //图表数据名称 + private String lineName; + //图表数据行值 + private Number[] lineValue; + //设置标记样式 + private MarkerStyle markerStyle; + + public LineValue() { + // 设置标记样式 + markerStyle = MarkerStyle.NONE; + } + + } + + @Override + public XWPFDocument replace() { + if (Objects.isNull(getDoc())) { + throw new RuntimeException(ERR_MSG_DOC_NOT_LOADED); + } + if (CollectionUtils.isEmpty(chartReplaces)) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + + List charts = getDoc().getCharts(); + if (CollectionUtils.isEmpty(charts)) { + throw new RuntimeException(ERR_MSG_TEMPLATE_CHART_NOT_EXIST.replace("${name}", "")); + } + + Map templateChartMap = new HashMap<>(); + for (int i = 1, size = charts.size(); i <= size; i++) { + String key = charts.get(i - 1).toString().replaceAll("Name: ", "") + .replaceAll(" - Content Type: application/vnd\\.openxmlformats-officedocument\\.drawingml\\.chart\\+xml", "").trim(); + key = key.replace("/word/charts/chart", "").replace(".xml", ""); + templateChartMap.put(Integer.valueOf(key), charts.get(i - 1)); + } + + chartReplaces.forEach(lineChartReplace -> { + List lineValues = lineChartReplace.getLineValues(); + if (CollectionUtils.isEmpty(lineValues)) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + //校验元素个数是否一致 + int dataLength = lineChartReplace.getCategoryNames().length; + for (int i = 0, size = lineValues.size(); i < size; i++) { + if (lineValues.get(i).getLineValue().length != dataLength) { + throw new RuntimeException(ERR_MSG_ROW_ELEMENT_MISMATCH.replace("${index}", String.valueOf(i))); + } + } + //校验图表是否存在 + XWPFChart templateChart = templateChartMap.get(lineChartReplace.getIndex()); + if (Objects.isNull(templateChart)) { + throw new RuntimeException(ERR_MSG_TEMPLATE_CHART_NOT_EXIST.replace("${index}", String.valueOf(lineChartReplace.getIndex()))); + } + }); + + //逐个图表进行内容替换 + chartReplaces.forEach(lineChartReplace -> { + XWPFChart templateChart = templateChartMap.get(lineChartReplace.getIndex()); + templateChart.setTitleText(lineChartReplace.getChartTitle());//图表标题 + XDDFCategoryDataSource categoryDataSource = XDDFDataSourcesFactory.fromArray(lineChartReplace.getCategoryNames1());//分类名称 + templateChart.getChartSeries().forEach(chartData -> { + if (Objects.nonNull(chartData.getCategoryAxis())) { + chartData.getCategoryAxis().setTitle(lineChartReplace.getCategoryAxisTitle());//x轴标题 + } + if (Objects.nonNull(chartData.getValueAxes())) { + chartData.getValueAxes().forEach(axis -> { + axis.setTitle(lineChartReplace.getValueAxesTitle());//y轴标题 + }); + } + //删除模板自带的图表数据 + for (int i = 0, count = chartData.getSeriesCount(); i < count; i++) { + chartData.removeSeries(0); + } + + //渲染数据 + lineChartReplace.getLineValues().forEach(lineValue -> { + XDDFNumericalDataSource values = XDDFDataSourcesFactory.fromArray(lineValue.getLineValue()); + // 图表加载数据 + XDDFChartData.Series series = chartData.addSeries(categoryDataSource, values); + // 图表例标题 + series.setTitle(lineValue.getLineName(), null); + // 设置标记样式 + setMarkerStyle(series, lineValue); + }); + + // 绘制 + templateChart.plot(chartData); + + }); + }); + + return getDoc(); + } + + private void setMarkerStyle(XDDFChartData.Series series, LineValue lineValue) { + if (series instanceof XDDFLineChartData.Series) { + ((XDDFLineChartData.Series)series).setMarkerStyle(lineValue.getMarkerStyle()); + } + //其它图表 + } + + + public void generateChart() { + List charts = getDoc().getCharts(); + + for (int i = 0; i < charts.size() && i < chartReplaces.size(); i++) { + XWPFChart chart = charts.get(i); + ChartReplace chartReplace = chartReplaces.get(i); + + final List datas = chart.getChartSeries();//不知道这个ChartSeries代表什么意思 + final XDDFLineChartData line = (XDDFLineChartData) datas.get(0);//这里一般获取第一个,我们这里是折线图就是XDDFLineChartData + final int numOfPoints = chartReplace.getCategoryNames1().length; + + final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0)); + final XDDFDataSource categoriesData = XDDFDataSourcesFactory.fromArray(chartReplace.getCategoryNames1(), categoryDataRange, 0); + for (int j = 0; j < chartReplace.getLineValues().size(); j++) { + final String valuesDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, j + 1, j + 1)); + Number[] value = chartReplace.getLineValues().get(j).getLineValue(); + final XDDFNumericalDataSource valuesData = XDDFDataSourcesFactory.fromArray(value, valuesDataRange, j + 1); + XDDFChartData.Series ser;//图表中的系列 + ser = line.getSeries().get(j); + ser.replaceData(categoriesData, valuesData); + CellReference cellReference = chart.setSheetTitle(chartReplace.getLineValues().get(j).lineName, 1);//修改系列标题 + ser.setTitle(chartReplace.getLineValues().get(j).lineName, cellReference); + } + chart.plot(line); + chart.setTitleText(chartReplace.getChartTitle());//折线图标题 + chart.setTitleOverlay(false); + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParser.java new file mode 100644 index 0000000..a0702c8 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParser.java @@ -0,0 +1,105 @@ +package com.limap.common.utils.poi.parser; + +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import org.apache.poi.xwpf.usermodel.XWPFDocument; + +import java.io.*; +import java.util.Objects; + +/** + *

Word内容解析器

+ * + * @author Allen Yang + * @datetime 2021/11/18 14:46 + */ +@Setter +@Getter +@Slf4j +public abstract class WordContentParser { + + public static final String ERR_MSG_DOC_LOAD_FAIL = "文档加载失败"; + public static final String ERR_MSG_DOC_OUTPUT_FAIL = "文档导出失败"; + public static final String ERR_MSG_DOC_NOT_LOADED = "文档未加载"; + public static final String ERR_MSG_PARAM_NOT_INITIALIZED = "替换参数未初始化"; + public static final String ERR_MSG_ROW_ELEMENT_MISMATCH = "下标${index}的行值元素不匹配"; + public static final String ERR_MSG_TABLE_NOT_EXIST = "不存在下标${index}的表格"; + public static final String ERR_MSG_CELLS_NOT_UNANIMOUS = "下标${index}的表格值和单元格个数不一致"; + public static final String ERR_MSG_TEMPLATE_CHART_NOT_EXIST = "不存在下标${index}的图表"; + public static final String ERR_MSG_PIC_NOT_ADD = "下标${index}的图片替换失败"; + public static final String ERR_MSG_PIC_NOT_EXIST = "模板中${type}下标${index}的图片不存在替换值"; + + //文档对象 + private XWPFDocument doc; + + public WordContentParser(InputStream in) { + try { + this.doc = new XWPFDocument(in); + } catch (IOException e) { + log.error("{}：{}", ERR_MSG_DOC_LOAD_FAIL, e.getMessage()); + throw new RuntimeException(ERR_MSG_DOC_LOAD_FAIL); + } + } + + public WordContentParser(XWPFDocument doc) { + this.doc = doc; + } + + public WordContentParser(String path) { + this.doc = loadXWPFDocument(path); + } + + public static XWPFDocument loadXWPFDocument(String path) { + InputStream in = null; + XWPFDocument doc = null; + try { + in = new FileInputStream(path); + //in = new ClassPathResource(path).getInputStream(); spring-boot项目打成jar部署到Linux需要改成这个加载方式，path用相对路径 + doc = new XWPFDocument(in); + } catch (Exception e) { + log.error("{}：{}", ERR_MSG_DOC_LOAD_FAIL, e.getMessage()); + throw new RuntimeException(ERR_MSG_DOC_LOAD_FAIL); + } finally { + if (Objects.nonNull(in)) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return doc; + } + } + + public File outputFile(String path) { + if (Objects.isNull(doc)) { + throw new RuntimeException(ERR_MSG_DOC_LOAD_FAIL); + } + + File file = null; + FileOutputStream fos = null; + try { + file = new File(path); + if (file.exists()) { + file.delete(); + } + fos = new FileOutputStream(path); + doc.write(fos); + } catch (Exception e) { + log.error("{}：{}", ERR_MSG_DOC_OUTPUT_FAIL, e.getMessage()); + throw new RuntimeException(ERR_MSG_DOC_OUTPUT_FAIL); + } finally { + if (Objects.nonNull(fos)) { + try { + fos.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + return file; + } + } + + public abstract XWPFDocument replace(); +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParserVO.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParserVO.java new file mode 100644 index 0000000..513d6c5 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordContentParserVO.java @@ -0,0 +1,25 @@ +package com.limap.common.utils.poi.parser; + + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class WordContentParserVO { + + private String path; + + private String name; + + private Map textReplaceMap; + + private List tableReplaces; + + private List chartReplaces; + + private List pictureReplaces; + + private String message; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordParagraphParser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordParagraphParser.java new file mode 100644 index 0000000..9246eb6 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordParagraphParser.java @@ -0,0 +1,75 @@ +package com.limap.common.utils.poi.parser; + +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; +import org.apache.poi.xwpf.usermodel.XWPFRun; + +import java.io.InputStream; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + *

Word文字解析器

+ * + * @author Allen Yang + * @datetime 2021/11/18 14:53 + */ +@Setter +@Getter +public class WordParagraphParser extends WordContentParser { + + private Map textReplaceMap; + + public WordParagraphParser(InputStream in, Map textReplaceMap) { + super(in); + this.textReplaceMap = textReplaceMap; + } + + public WordParagraphParser(XWPFDocument doc, Map textReplaceMap) { + super(doc); + this.textReplaceMap = textReplaceMap; + } + + public WordParagraphParser(InputStream in) { + super(in); + } + + public WordParagraphParser(XWPFDocument doc) { + super(doc); + } + + public WordParagraphParser(String path) { + super(path); + } + + + @Override + public XWPFDocument replace() { + if (Objects.isNull(getDoc())) { + throw new RuntimeException(ERR_MSG_DOC_NOT_LOADED); + } + if (MapUtils.isEmpty(textReplaceMap)) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + List xwpfParagraphs = getDoc().getParagraphs(); + xwpfParagraphs.forEach(xwpfParagraph -> { + List runs = xwpfParagraph.getRuns(); + runs.forEach(run -> { + String str = run.getText(run.getTextPosition()); //获取run中的字符串 + if (StringUtils.isNotEmpty(str)) { + for (Map.Entry entry: textReplaceMap.entrySet()) { + str = str.replace(entry.getKey(), entry.getValue()); + } + } + run.setText(str, 0); + }); + }); + + return getDoc(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordPictureParser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordPictureParser.java new file mode 100644 index 0000000..3f027ba --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordPictureParser.java @@ -0,0 +1,176 @@ +package com.limap.common.utils.poi.parser; + +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; +import org.apache.poi.xwpf.usermodel.XWPFPicture; +import org.apache.poi.xwpf.usermodel.XWPFRun; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Objects; + +/** + *

Word图片解析器

+ * + * @author Allen Yang + * @datetime 2021/11/18 14:53 + */ +@Setter +@Getter +@Slf4j +public class WordPictureParser extends WordContentParser { + + //模板中${type}下标${index}的图片不存在替换值---是否抛异常 + private boolean throwException; + + private List pictureReplaces; + + private int picIndexOfParagraph; + + private void setPicIndexOfParagraph(int picIndexOfParagraph) { + this.picIndexOfParagraph = picIndexOfParagraph; + } + + public WordPictureParser(InputStream in, List pictureReplaces) { + super(in); + this.pictureReplaces = pictureReplaces; + this.throwException = true; + this.picIndexOfParagraph = 0; + } + + public WordPictureParser(XWPFDocument doc, List pictureReplaces) { + super(doc); + this.pictureReplaces = pictureReplaces; + this.throwException = true; + this.picIndexOfParagraph = 0; + } + + public WordPictureParser(InputStream in) { + super(in); + this.throwException = true; + this.picIndexOfParagraph = 0; + } + + public WordPictureParser(XWPFDocument doc) { + super(doc); + this.throwException = true; + this.picIndexOfParagraph = 0; + } + + public WordPictureParser(String path) { + super(path); + this.throwException = true; + this.picIndexOfParagraph = 0; + } + + @Setter + @Getter + public static class PictureReplace { + //内容类型，1 段落图片 、 2 表格图片 + private int type; + public static final int TYPE_PARAGRAPH = 1; + public static final int TYPE_TABLE = 2; + //图片在模板的下标，Word文档段落和表格从左到右算起，段落和表格单独分开计数，0开始 + private int index; + //图片流数据 + private InputStream pictureData; + //图片类型 + private int pictureType; + + public PictureReplace() { + this.type = TYPE_PARAGRAPH; + this.pictureType = XWPFDocument.PICTURE_TYPE_PNG; + } + } + + public static InputStream loadPictureData(String path) { + try { + return new FileInputStream(path); + } catch (FileNotFoundException e) { + log.error("FileNotFoundException->{}", path); + return null; + } + } + + @Override + public XWPFDocument replace() { + if (Objects.isNull(getDoc())) { + throw new RuntimeException(ERR_MSG_DOC_NOT_LOADED); + } + if (CollectionUtils.isEmpty(pictureReplaces)) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + + picIndexOfParagraph = 0; + pictureReplace(PictureReplace.TYPE_PARAGRAPH, getDoc().getParagraphs()); + + picIndexOfParagraph = 0; + getDoc().getTables().forEach(xwpfTable -> { + xwpfTable.getRows().forEach(row -> { + row.getTableCells().forEach(xwpfTableCell -> { + pictureReplace(PictureReplace.TYPE_TABLE, xwpfTableCell.getParagraphs()); + }); + }); + }); + + pictureReplaces.forEach(pictureReplace -> { + if (Objects.nonNull(pictureReplace.getPictureData())) { + try { + pictureReplace.getPictureData().close(); + } catch (IOException e) { + log.error("{} {}", pictureReplace, e.getMessage()); + } + } + }); + + return getDoc(); + } + + private void pictureReplace(int type, List xwpfParagraphs) { + int runIndex = 0; + for (int i = 0, size = xwpfParagraphs.size(); i < size; i++) { + XWPFParagraph xwpfParagraph = xwpfParagraphs.get(i); + List runs = xwpfParagraph.getRuns(); + for (int j = 0, size2 = runs.size(); j < size2; j++) { + List xwpfPictures = runs.get(j).getEmbeddedPictures(); + if (CollectionUtils.isNotEmpty(xwpfPictures)) { + PictureReplace pictureReplace = null; + runIndex = j; + XWPFRun newXWPFRun = xwpfParagraph.createRun(); + for (int k = 0, size3 = xwpfPictures.size(); k < size3; k++) { + int width = (int) xwpfPictures.get(k).getCTPicture().getSpPr().getXfrm().getExt().getCx(); + int height = (int) xwpfPictures.get(k).getCTPicture().getSpPr().getXfrm().getExt().getCy(); + String filename = xwpfPictures.get(k).getPictureData().getFileName(); + int finalPicIndexOfParagraph = picIndexOfParagraph; + pictureReplace = pictureReplaces.stream().filter(o -> type == o.getType()).filter(o -> o.getIndex() == finalPicIndexOfParagraph).findFirst().orElse(null); + if (Objects.nonNull(pictureReplace)) { + try { + newXWPFRun.addPicture(pictureReplace.getPictureData(), pictureReplace.getPictureType(), filename, width, height); + } catch (Exception e) { + log.error("{}；{}", ERR_MSG_PIC_NOT_ADD.replace("${index}", String.valueOf(finalPicIndexOfParagraph)), e.getMessage()); + throw new RuntimeException(ERR_MSG_PIC_NOT_ADD.replace("${index}", String.valueOf(finalPicIndexOfParagraph))); + } + } else { + if (throwException) { + throw new RuntimeException(ERR_MSG_PIC_NOT_EXIST.replace("${type}", type == PictureReplace.TYPE_PARAGRAPH ? "段落图片" : "表格图片").replace("${index}", String.valueOf(finalPicIndexOfParagraph))); + } + } + picIndexOfParagraph++; + //log.info("{}下标{}{}", type == PictureReplace.TYPE_PARAGRAPH ? "段落图片" : "表格图片", picIndexOfParagraph, Objects.nonNull(pictureReplace) ? "已替换" : "不存在"); + } + if (Objects.nonNull(pictureReplace)) { + xwpfParagraph.removeRun(runIndex); + xwpfParagraph.addRun(newXWPFRun); + } + } + } + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordTableParser.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordTableParser.java new file mode 100644 index 0000000..c642b82 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/poi/parser/WordTableParser.java @@ -0,0 +1,302 @@ +package com.limap.common.utils.poi.parser; + +import com.limap.common.utils.StringUtils; +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellReference; +import org.apache.poi.xddf.usermodel.chart.*; +import org.apache.poi.xwpf.usermodel.*; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + *

Word表格解析器

+ * + * @author Allen Yang + * @datetime 2021/11/18 14:53 + */ +@Setter +@Getter +public class WordTableParser extends WordContentParser { + + private Map textReplaceMap; + + private List tableReplaces; + + public WordTableParser(InputStream in, List tableReplaces) { + super(in); + this.tableReplaces = tableReplaces; + } + + public WordTableParser(XWPFDocument doc, List tableReplaces) { + super(doc); + this.tableReplaces = tableReplaces; + } + + public WordTableParser(XWPFDocument doc, List tableReplaces, Map textReplaceMap) { + super(doc); + this.textReplaceMap = textReplaceMap; + this.tableReplaces = tableReplaces; + } + + public WordTableParser(InputStream in) { + super(in); + } + + public WordTableParser(XWPFDocument doc) { + super(doc); + } + + public WordTableParser(String path) { + super(path); + } + + @Setter + @Getter + public static class TableReplace { + //表格在word文档中的下标 + private int index; + //数据开始渲染下标 + private int startIndex; + //数据行值 + private List rowValues; + //数据行值是否粗体字 + private List rowBolds; + //是否覆盖单元格已有文字 + private boolean coverExisting; + //是否删除单元格已有的图片 + private boolean removePicture; + public TableReplace() { + this.coverExisting = true; + this.removePicture = false; + } + + public void setRowValues(List rowValues) { + this.rowValues = rowValues; + if (!CollectionUtils.isEmpty(rowValues)) { + this.rowBolds = new ArrayList<>(); + rowValues.forEach(values -> { + Boolean[] booleans = new Boolean[values.length]; + for (int i = 0, len = booleans.length; i < len; i++) { + booleans[i] = false; + this.rowBolds.add(booleans); + } + }); + + } + } + } + + @Override + public XWPFDocument replace() { + if (Objects.isNull(getDoc())) { + throw new RuntimeException(ERR_MSG_DOC_NOT_LOADED); + } + if (CollectionUtils.isEmpty(tableReplaces)) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + + tableReplaces.forEach(tableReplace -> { + if (CollectionUtils.isEmpty(tableReplace.getRowValues())) { + throw new RuntimeException(ERR_MSG_PARAM_NOT_INITIALIZED); + } + //校验元素个数是否一致 + int dataLength = tableReplace.getRowValues().get(0).length; + for (int i = 0, size = tableReplace.getRowValues().size(); i < size; i++) { + if (tableReplace.getRowValues().get(i).length != dataLength) { + throw new RuntimeException(ERR_MSG_ROW_ELEMENT_MISMATCH.replace("${index}", String.valueOf(i))); + } + } + //校验表格是否存在 + XWPFTable templateTable = getDoc().getTableArray(tableReplace.getIndex()); + if (Objects.isNull(templateTable)) { + throw new RuntimeException(ERR_MSG_TABLE_NOT_EXIST.replace("${index}", String.valueOf(tableReplace.getIndex()))); + } + //校验元素个数是否和模板表格单元格个数一致 + if (templateTable.getRows().get(templateTable.getNumberOfRows() - 1).getTableCells().size() != dataLength) { + throw new RuntimeException(ERR_MSG_CELLS_NOT_UNANIMOUS.replace("${index}", String.valueOf(tableReplace.getIndex()))); + } + int templateRowCount = templateTable.getNumberOfRows();//模板表格行数 + int valueRowCount = tableReplace.getRowValues().size();//值行数 + int newRowCount = valueRowCount - templateRowCount + tableReplace.getStartIndex(); + if (newRowCount > 0) {//新增行 + for (int i = 0; i < newRowCount; i++) { + insertNewTableRow(templateTable, templateTable.getNumberOfRows() - 1, templateTable.getNumberOfRows()); + } + } else if (newRowCount < 0) {//删除行 + for (int i = 0; i < (-newRowCount); i++) { + templateTable.removeRow(templateTable.getNumberOfRows() - 1); + } + } + }); + + //逐个表格进行单元格内容替换 + tableReplaces.forEach(tableReplace -> { + XWPFTable templateTable = getDoc().getTableArray(tableReplace.getIndex()); + for (int i = 0, size = tableReplace.getRowValues().size(); i < size; i++) { + Object[] values = tableReplace.getRowValues().get(i); + Boolean[] bolds = tableReplace.getRowBolds().get(i); + for (int j = 0, len = values.length; j < len; j++) { + + //单元格赋值 + XWPFTableCell cell = templateTable.getRow(tableReplace.getStartIndex() + i).getCell(j); + if (Objects.nonNull(cell)) { + long picCount = cell.getParagraphs().stream().filter(o -> o.getRuns().stream().mapToInt(r -> r.getEmbeddedPictures().size()).sum() > 0).count(); + if (StringUtils.isEmpty(cell.getText()) && picCount == 0) { + //cell.setText(String.valueOf(values[j])); + if (CollectionUtils.isEmpty(cell.getParagraphs())) { + XWPFParagraph xwpfParagraph = cell.addParagraph(); + XWPFRun xwpfRun = xwpfParagraph.createRun(); + xwpfRun.setText(String.valueOf(values[j])); + xwpfRun.setBold(bolds[j]); + xwpfParagraph.addRun(xwpfRun); + cell.setParagraph(xwpfParagraph); + } else { + int finalJ = j; + cell.getParagraphs().forEach(xwpfParagraph -> { + List runs = xwpfParagraph.getRuns(); + if (CollectionUtils.isEmpty(runs)) { + XWPFRun xwpfRun = xwpfParagraph.createRun(); + xwpfRun.setText(String.valueOf(values[finalJ])); + xwpfRun.setBold(bolds[finalJ]); + xwpfParagraph.addRun(xwpfRun); + } else { + runs.forEach(run -> { + run.setText((String.valueOf(values[finalJ])), 0); + run.setBold(bolds[finalJ]); + }); + } + + }); + } + } else { + if (tableReplace.isRemovePicture()) {//删除图片 + int finalJ = j; + cell.getParagraphs().forEach(xwpfParagraph -> { + List runs = xwpfParagraph.getRuns(); + for (int k = 0, size2 = runs.size(); k < size2; k++) { + if (CollectionUtils.isNotEmpty(runs.get(k).getEmbeddedPictures())) { + xwpfParagraph.removeRun(k); + XWPFRun xwpfRun = xwpfParagraph.createRun(); + xwpfRun.setText(String.valueOf(values[finalJ]), 0); + xwpfRun.setBold(bolds[finalJ]); + xwpfParagraph.addRun(xwpfRun); + } else { + runs.get(k).setText(String.valueOf(values[finalJ]), 0); + runs.get(k).setBold(bolds[finalJ]); + } + } + }); + + } + + if (tableReplace.isCoverExisting()) {//覆盖文字 + int finalJ = j; + cell.getParagraphs().forEach(xwpfParagraph -> { + List runs = xwpfParagraph.getRuns(); + runs.forEach(run -> { + run.setText(String.valueOf(values[finalJ]), 0); + }); + }); + } + } + + } + + } + } + }); + + if (!MapUtils.isEmpty(textReplaceMap)) {//文本替换 + getDoc().getTables().forEach(templateTable -> { + templateTable.getRows().forEach(row -> { + row.getTableCells().forEach(cell2 -> { + if (!Objects.isNull(cell2) && !StringUtils.isEmpty(cell2.getText())) { + cell2.getParagraphs().forEach(xwpfParagraph -> { + List runs = xwpfParagraph.getRuns(); + runs.forEach(run -> { + String str = run.getText(run.getTextPosition()); //获取run中的字符串 + if (StringUtils.isNotEmpty(str)) { + for (Map.Entry entry: textReplaceMap.entrySet()) { + str = str.replace(entry.getKey(), entry.getValue()); + } + } + run.setText(str, 0); + }); + }); + } + }); + }); + }); + } + + return getDoc(); + } + + /** + * 在word表格中指定位置插入一行，并将某一行的样式复制到新增行 + * @param table + * @param copyRowIndex 需要复制的行位置 + * @param newRowIndex 需要新增一行的位置 + */ + private void insertNewTableRow(XWPFTable table, int copyRowIndex, int newRowIndex) { + // 在表格中指定的位置新增一行 + XWPFTableRow targetRow = table.insertNewTableRow(newRowIndex); + // 获取需要复制行对象 + XWPFTableRow copyRow = table.getRow(copyRowIndex); + //复制行对象 + targetRow.getCtRow().setTrPr(copyRow.getCtRow().getTrPr()); + //或许需要复制的行的列 + List copyCells = copyRow.getTableCells(); + + copyCells.forEach(copyCell -> { + //复制列对象 + XWPFTableCell targetCell = targetRow.addNewTableCell(); + targetCell.getCTTc().setTcPr(copyCell.getCTTc().getTcPr()); + if (CollectionUtils.isNotEmpty(copyCell.getParagraphs())) { + targetCell.getParagraphs().get(0).getCTP().setPPr(copyCell.getParagraphs().get(0).getCTP().getPPr()); + if (CollectionUtils.isNotEmpty(copyCell.getParagraphs().get(0).getRuns())) { + XWPFRun cellR = targetCell.getParagraphs().get(0).createRun(); + cellR.setBold(copyCell.getParagraphs().get(0).getRuns().get(0).isBold()); + } + } + }); + + } + + + + + public static void generateChart(XWPFChart chart, String[] series, String[] categories, List values) { + String chartTitle = "收运量统计图"; + final List data = chart.getChartSeries();//不知道这个ChartSeries代表什么意思 + final XDDFLineChartData line = (XDDFLineChartData) data.get(0);//这里一般获取第一个,我们这里是折线图就是XDDFLineChartData + + final int numOfPoints = categories.length; + + final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0)); + + final XDDFDataSource categoriesData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange, 0); + for (int i = 0; i < values.size(); i++) { + final String valuesDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, i + 1, i + 1)); + Number[] value = values.get(i); + final XDDFNumericalDataSource valuesData = XDDFDataSourcesFactory.fromArray(value, valuesDataRange, i + 1); + XDDFChartData.Series ser;//图表中的系列 + ser = line.getSeries().get(i); + ser.replaceData(categoriesData, valuesData); + CellReference cellReference = chart.setSheetTitle(series[i], 1);//修改系列标题 + ser.setTitle(series[i], cellReference); + } + + chart.plot(line); + chart.setTitleText(chartTitle);//折线图标题 + chart.setTitleOverlay(false); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/reflect/ReflectUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/reflect/ReflectUtils.java new file mode 100644 index 0000000..b72247c --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/reflect/ReflectUtils.java @@ -0,0 +1,410 @@ +package com.limap.common.utils.reflect; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.Date; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Validate; +import org.apache.poi.ss.usermodel.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.core.text.Convert; +import com.limap.common.utils.DateUtils; + +/** + * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. + * + * @author limap + */ +@SuppressWarnings("rawtypes") +public class ReflectUtils +{ + private static final String SETTER_PREFIX = "set"; + + private static final String GETTER_PREFIX = "get"; + + private static final String CGLIB_CLASS_SEPARATOR = "$$"; + + private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); + + /** + * 调用Getter方法. + * 支持多级，如：对象名.对象名.方法 + */ + @SuppressWarnings("unchecked") + public static E invokeGetter(Object obj, String propertyName) + { + Object object = obj; + for (String name : StringUtils.split(propertyName, ".")) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + return (E) object; + } + + /** + * 调用Setter方法, 仅匹配方法名。 + * 支持多级，如：对象名.对象名.方法 + */ + public static void invokeSetter(Object obj, String propertyName, E value) + { + Object object = obj; + String[] names = StringUtils.split(propertyName, "."); + for (int i = 0; i < names.length; i++) + { + if (i < names.length - 1) + { + String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]); + object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {}); + } + else + { + String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]); + invokeMethodByName(object, setterMethodName, new Object[] { value }); + } + } + } + + /** + * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数. + */ + @SuppressWarnings("unchecked") + public static E getFieldValue(final Object obj, final String fieldName) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + return null; + } + E result = null; + try + { + result = (E) field.get(obj); + } + catch (IllegalAccessException e) + { + logger.error("不可能抛出的异常{}", e.getMessage()); + } + return result; + } + + /** + * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数. + */ + public static void setFieldValue(final Object obj, final String fieldName, final E value) + { + Field field = getAccessibleField(obj, fieldName); + if (field == null) + { + // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + return; + } + try + { + field.set(obj, value); + } + catch (IllegalAccessException e) + { + logger.error("不可能抛出的异常: {}", e.getMessage()); + } + } + + /** + * 直接调用对象方法, 无视private/protected修饰符. + * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用. + * 同时匹配方法名+参数类型， + */ + @SuppressWarnings("unchecked") + public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes, + final Object[] args) + { + if (obj == null || methodName == null) + { + return null; + } + Method method = getAccessibleMethod(obj, methodName, parameterTypes); + if (method == null) + { + logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); + return null; + } + try + { + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 直接调用对象方法, 无视private/protected修饰符， + * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用. + * 只匹配函数名，如果有多个同名函数调用第一个。 + */ + @SuppressWarnings("unchecked") + public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args) + { + Method method = getAccessibleMethodByName(obj, methodName, args.length); + if (method == null) + { + // 如果为空不报错，直接返回空。 + logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); + return null; + } + try + { + // 类型转换（将参数数据类型转换为目标方法参数类型） + Class[] cs = method.getParameterTypes(); + for (int i = 0; i < cs.length; i++) + { + if (args[i] != null && !args[i].getClass().equals(cs[i])) + { + if (cs[i] == String.class) + { + args[i] = Convert.toStr(args[i]); + if (StringUtils.endsWith((String) args[i], ".0")) + { + args[i] = StringUtils.substringBefore((String) args[i], ".0"); + } + } + else if (cs[i] == Integer.class) + { + args[i] = Convert.toInt(args[i]); + } + else if (cs[i] == Long.class) + { + args[i] = Convert.toLong(args[i]); + } + else if (cs[i] == Double.class) + { + args[i] = Convert.toDouble(args[i]); + } + else if (cs[i] == Float.class) + { + args[i] = Convert.toFloat(args[i]); + } + else if (cs[i] == Date.class) + { + if (args[i] instanceof String) + { + args[i] = DateUtils.parseDate(args[i]); + } + else + { + args[i] = DateUtil.getJavaDate((Double) args[i]); + } + } + else if (cs[i] == boolean.class || cs[i] == Boolean.class) + { + args[i] = Convert.toBool(args[i]); + } + } + } + return (E) method.invoke(obj, args); + } + catch (Exception e) + { + String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + throw convertReflectionExceptionToUnchecked(msg, e); + } + } + + /** + * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + */ + public static Field getAccessibleField(final Object obj, final String fieldName) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(fieldName, "fieldName can't be blank"); + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) + { + try + { + Field field = superClass.getDeclaredField(fieldName); + makeAccessible(field); + return field; + } + catch (NoSuchFieldException e) + { + continue; + } + } + return null; + } + + /** + * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + * 匹配函数名+参数类型。 + * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethod(final Object obj, final String methodName, + final Class... parameterTypes) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + try + { + Method method = searchType.getDeclaredMethod(methodName, parameterTypes); + makeAccessible(method); + return method; + } + catch (NoSuchMethodException e) + { + continue; + } + } + return null; + } + + /** + * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问. + * 如向上转型到Object仍无法找到, 返回null. + * 只匹配函数名。 + * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args) + */ + public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) + { + // 为空不报错。直接返回 null + if (obj == null) + { + return null; + } + Validate.notBlank(methodName, "methodName can't be blank"); + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) + { + Method[] methods = searchType.getDeclaredMethods(); + for (Method method : methods) + { + if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) + { + makeAccessible(method); + return method; + } + } + } + return null; + } + + /** + * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 + */ + public static void makeAccessible(Method method) + { + if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers())) + && !method.isAccessible()) + { + method.setAccessible(true); + } + } + + /** + * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。 + */ + public static void makeAccessible(Field field) + { + if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers()) + || Modifier.isFinal(field.getModifiers())) && !field.isAccessible()) + { + field.setAccessible(true); + } + } + + /** + * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处 + * 如无法找到, 返回Object.class. + */ + @SuppressWarnings("unchecked") + public static Class getClassGenricType(final Class clazz) + { + return getClassGenricType(clazz, 0); + } + + /** + * 通过反射, 获得Class定义中声明的父类的泛型参数的类型. + * 如无法找到, 返回Object.class. + */ + public static Class getClassGenricType(final Class clazz, final int index) + { + Type genType = clazz.getGenericSuperclass(); + + if (!(genType instanceof ParameterizedType)) + { + logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); + return Object.class; + } + + Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); + + if (index >= params.length || index < 0) + { + logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " + + params.length); + return Object.class; + } + if (!(params[index] instanceof Class)) + { + logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); + return Object.class; + } + + return (Class) params[index]; + } + + public static Class getUserClass(Object instance) + { + if (instance == null) + { + throw new RuntimeException("Instance must not be null"); + } + Class clazz = instance.getClass(); + if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) + { + Class superClass = clazz.getSuperclass(); + if (superClass != null && !Object.class.equals(superClass)) + { + return superClass; + } + } + return clazz; + + } + + /** + * 将反射时的checked exception转换为unchecked exception. + */ + public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) + { + if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException + || e instanceof NoSuchMethodException) + { + return new IllegalArgumentException(msg, e); + } + else if (e instanceof InvocationTargetException) + { + return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException()); + } + return new RuntimeException(msg, e); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Base64.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Base64.java new file mode 100644 index 0000000..640db17 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Base64.java @@ -0,0 +1,291 @@ +package com.limap.common.utils.sign; + +/** + * Base64工具类 + * + * @author limap + */ +public final class Base64 +{ + static private final int BASELENGTH = 128; + static private final int LOOKUPLENGTH = 64; + static private final int TWENTYFOURBITGROUP = 24; + static private final int EIGHTBIT = 8; + static private final int SIXTEENBIT = 16; + static private final int FOURBYTE = 4; + static private final int SIGN = -128; + static private final char PAD = '='; + static final private byte[] base64Alphabet = new byte[BASELENGTH]; + static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH]; + + static + { + for (int i = 0; i < BASELENGTH; ++i) + { + base64Alphabet[i] = -1; + } + for (int i = 'Z'; i >= 'A'; i--) + { + base64Alphabet[i] = (byte) (i - 'A'); + } + for (int i = 'z'; i >= 'a'; i--) + { + base64Alphabet[i] = (byte) (i - 'a' + 26); + } + + for (int i = '9'; i >= '0'; i--) + { + base64Alphabet[i] = (byte) (i - '0' + 52); + } + + base64Alphabet['+'] = 62; + base64Alphabet['/'] = 63; + + for (int i = 0; i <= 25; i++) + { + lookUpBase64Alphabet[i] = (char) ('A' + i); + } + + for (int i = 26, j = 0; i <= 51; i++, j++) + { + lookUpBase64Alphabet[i] = (char) ('a' + j); + } + + for (int i = 52, j = 0; i <= 61; i++, j++) + { + lookUpBase64Alphabet[i] = (char) ('0' + j); + } + lookUpBase64Alphabet[62] = (char) '+'; + lookUpBase64Alphabet[63] = (char) '/'; + } + + private static boolean isWhiteSpace(char octect) + { + return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9); + } + + private static boolean isPad(char octect) + { + return (octect == PAD); + } + + private static boolean isData(char octect) + { + return (octect < BASELENGTH && base64Alphabet[octect] != -1); + } + + /** + * Encodes hex octects into Base64 + * + * @param binaryData Array containing binaryData + * @return Encoded Base64 array + */ + public static String encode(byte[] binaryData) + { + if (binaryData == null) + { + return null; + } + + int lengthDataBits = binaryData.length * EIGHTBIT; + if (lengthDataBits == 0) + { + return ""; + } + + int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP; + int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP; + int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets; + char encodedData[] = null; + + encodedData = new char[numberQuartet * 4]; + + byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0; + + int encodedIndex = 0; + int dataIndex = 0; + + for (int i = 0; i < numberTriplets; i++) + { + b1 = binaryData[dataIndex++]; + b2 = binaryData[dataIndex++]; + b3 = binaryData[dataIndex++]; + + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc); + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f]; + } + + // form integral number of 6-bit groups + if (fewerThan24bits == EIGHTBIT) + { + b1 = binaryData[dataIndex]; + k = (byte) (b1 & 0x03); + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4]; + encodedData[encodedIndex++] = PAD; + encodedData[encodedIndex++] = PAD; + } + else if (fewerThan24bits == SIXTEENBIT) + { + b1 = binaryData[dataIndex]; + b2 = binaryData[dataIndex + 1]; + l = (byte) (b2 & 0x0f); + k = (byte) (b1 & 0x03); + + byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0); + byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0); + + encodedData[encodedIndex++] = lookUpBase64Alphabet[val1]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)]; + encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2]; + encodedData[encodedIndex++] = PAD; + } + return new String(encodedData); + } + + /** + * Decodes Base64 data into octects + * + * @param encoded string containing Base64 data + * @return Array containind decoded data. + */ + public static byte[] decode(String encoded) + { + if (encoded == null) + { + return null; + } + + char[] base64Data = encoded.toCharArray(); + // remove white spaces + int len = removeWhiteSpace(base64Data); + + if (len % FOURBYTE != 0) + { + return null;// should be divisible by four + } + + int numberQuadruple = (len / FOURBYTE); + + if (numberQuadruple == 0) + { + return new byte[0]; + } + + byte decodedData[] = null; + byte b1 = 0, b2 = 0, b3 = 0, b4 = 0; + char d1 = 0, d2 = 0, d3 = 0, d4 = 0; + + int i = 0; + int encodedIndex = 0; + int dataIndex = 0; + decodedData = new byte[(numberQuadruple) * 3]; + + for (; i < numberQuadruple - 1; i++) + { + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])) + || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++]))) + { + return null; + } // if found "no data" just return null + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + } + + if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) + { + return null;// if found "no data" just return null + } + + b1 = base64Alphabet[d1]; + b2 = base64Alphabet[d2]; + + d3 = base64Data[dataIndex++]; + d4 = base64Data[dataIndex++]; + if (!isData((d3)) || !isData((d4))) + {// Check if they are PAD characters + if (isPad(d3) && isPad(d4)) + { + if ((b2 & 0xf) != 0)// last 4 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 1]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4); + return tmp; + } + else if (!isPad(d3) && isPad(d4)) + { + b3 = base64Alphabet[d3]; + if ((b3 & 0x3) != 0)// last 2 bits should be zero + { + return null; + } + byte[] tmp = new byte[i * 3 + 2]; + System.arraycopy(decodedData, 0, tmp, 0, i * 3); + tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + return tmp; + } + else + { + return null; + } + } + else + { // No PAD e.g 3cQl + b3 = base64Alphabet[d3]; + b4 = base64Alphabet[d4]; + decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4); + decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf)); + decodedData[encodedIndex++] = (byte) (b3 << 6 | b4); + + } + return decodedData; + } + + /** + * remove WhiteSpace from MIME containing encoded Base64 data. + * + * @param data the byte array of base64 data (with WS) + * @return the new length + */ + private static int removeWhiteSpace(char[] data) + { + if (data == null) + { + return 0; + } + + // count characters that's not whitespace + int newSize = 0; + int len = data.length; + for (int i = 0; i < len; i++) + { + if (!isWhiteSpace(data[i])) + { + data[newSize++] = data[i]; + } + } + return newSize; + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Md5Utils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Md5Utils.java new file mode 100644 index 0000000..39caf50 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/Md5Utils.java @@ -0,0 +1,67 @@ +package com.limap.common.utils.sign; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Md5加密方法 + * + * @author limap + */ +public class Md5Utils +{ + private static final Logger log = LoggerFactory.getLogger(Md5Utils.class); + + private static byte[] md5(String s) + { + MessageDigest algorithm; + try + { + algorithm = MessageDigest.getInstance("MD5"); + algorithm.reset(); + algorithm.update(s.getBytes("UTF-8")); + byte[] messageDigest = algorithm.digest(); + return messageDigest; + } + catch (Exception e) + { + log.error("MD5 Error...", e); + } + return null; + } + + private static final String toHex(byte hash[]) + { + if (hash == null) + { + return null; + } + StringBuffer buf = new StringBuffer(hash.length * 2); + int i; + + for (i = 0; i < hash.length; i++) + { + if ((hash[i] & 0xff) < 0x10) + { + buf.append("0"); + } + buf.append(Long.toString(hash[i] & 0xff, 16)); + } + return buf.toString(); + } + + public static String hash(String s) + { + try + { + return new String(toHex(md5(s)).getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8); + } + catch (Exception e) + { + log.error("not supported charset...{}", e); + return s; + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/RsaUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/RsaUtils.java new file mode 100644 index 0000000..0de3214 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sign/RsaUtils.java @@ -0,0 +1,152 @@ +package com.limap.common.utils.sign; + +import org.apache.commons.codec.binary.Base64; +import javax.crypto.Cipher; +import java.security.*; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +/** + * RSA加密解密 + * + * @author limap + **/ +public class RsaUtils +{ + // Rsa 私钥 + public static String privateKey = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY" + + "7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN" + + "PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA" + + "kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow" + + "cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv" + + "DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh" + + "YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3" + + "UP8iWi1Qw0Y="; + + /** + * 私钥解密 + * + * @param text 待解密的文本 + * @return 解密后的文本 + */ + public static String decryptByPrivateKey(String text) throws Exception + { + return decryptByPrivateKey(privateKey, text); + } + + /** + * 公钥解密 + * + * @param publicKeyString 公钥 + * @param text 待解密的信息 + * @return 解密后的文本 + */ + public static String decryptByPublicKey(String publicKeyString, String text) throws Exception + { + X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(Base64.decodeBase64(publicKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PublicKey publicKey = keyFactory.generatePublic(x509EncodedKeySpec); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, publicKey); + byte[] result = cipher.doFinal(Base64.decodeBase64(text)); + return new String(result); + } + + /** + * 私钥加密 + * + * @param privateKeyString 私钥 + * @param text 待加密的信息 + * @return 加密后的文本 + */ + public static String encryptByPrivateKey(String privateKeyString, String text) throws Exception + { + PKCS8EncodedKeySpec pkcs8EncodedKeySpec = new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PrivateKey privateKey = keyFactory.generatePrivate(pkcs8EncodedKeySpec); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, privateKey); + byte[] result = cipher.doFinal(text.getBytes()); + return Base64.encodeBase64String(result); + } + + /** + * 私钥解密 + * + * @param privateKeyString 私钥 + * @param text 待解密的文本 + * @return 解密后的文本 + */ + public static String decryptByPrivateKey(String privateKeyString, String text) throws Exception + { + PKCS8EncodedKeySpec pkcs8EncodedKeySpec5 = new PKCS8EncodedKeySpec(Base64.decodeBase64(privateKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PrivateKey privateKey = keyFactory.generatePrivate(pkcs8EncodedKeySpec5); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + byte[] result = cipher.doFinal(Base64.decodeBase64(text)); + return new String(result); + } + + /** + * 公钥加密 + * + * @param publicKeyString 公钥 + * @param text 待加密的文本 + * @return 加密后的文本 + */ + public static String encryptByPublicKey(String publicKeyString, String text) throws Exception + { + X509EncodedKeySpec x509EncodedKeySpec2 = new X509EncodedKeySpec(Base64.decodeBase64(publicKeyString)); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + PublicKey publicKey = keyFactory.generatePublic(x509EncodedKeySpec2); + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] result = cipher.doFinal(text.getBytes()); + return Base64.encodeBase64String(result); + } + + /** + * 构建RSA密钥对 + * + * @return 生成后的公私钥信息 + */ + public static RsaKeyPair generateKeyPair() throws NoSuchAlgorithmException + { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(1024); + KeyPair keyPair = keyPairGenerator.generateKeyPair(); + RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic(); + RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate(); + String publicKeyString = Base64.encodeBase64String(rsaPublicKey.getEncoded()); + String privateKeyString = Base64.encodeBase64String(rsaPrivateKey.getEncoded()); + return new RsaKeyPair(publicKeyString, privateKeyString); + } + + /** + * RSA密钥对对象 + */ + public static class RsaKeyPair + { + private final String publicKey; + private final String privateKey; + + public RsaKeyPair(String publicKey, String privateKey) + { + this.publicKey = publicKey; + this.privateKey = privateKey; + } + + public String getPublicKey() + { + return publicKey; + } + + public String getPrivateKey() + { + return privateKey; + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/spring/SpringUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/spring/SpringUtils.java new file mode 100644 index 0000000..82089da --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/spring/SpringUtils.java @@ -0,0 +1,158 @@ +package com.limap.common.utils.spring; + +import org.springframework.aop.framework.AopContext; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.config.BeanFactoryPostProcessor; +import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; +import com.limap.common.utils.StringUtils; + +/** + * spring工具类 方便在非spring管理环境中获取bean + * + * @author limap + */ +@Component +public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware +{ + /** Spring应用上下文环境 */ + private static ConfigurableListableBeanFactory beanFactory; + + private static ApplicationContext applicationContext; + + @Override + public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException + { + SpringUtils.beanFactory = beanFactory; + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException + { + SpringUtils.applicationContext = applicationContext; + } + + /** + * 获取对象 + * + * @param name + * @return Object 一个以所给名字注册的bean的实例 + * @throws org.springframework.beans.BeansException + * + */ + @SuppressWarnings("unchecked") + public static T getBean(String name) throws BeansException + { + return (T) beanFactory.getBean(name); + } + + /** + * 获取类型为requiredType的对象 + * + * @param clz + * @return + * @throws org.springframework.beans.BeansException + * + */ + public static T getBean(Class clz) throws BeansException + { + T result = (T) beanFactory.getBean(clz); + return result; + } + + /** + * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true + * + * @param name + * @return boolean + */ + public static boolean containsBean(String name) + { + return beanFactory.containsBean(name); + } + + /** + * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException） + * + * @param name + * @return boolean + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.isSingleton(name); + } + + /** + * @param name + * @return Class 注册对象的类型 + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static Class getType(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.getType(name); + } + + /** + * 如果给定的bean名字在bean定义中有别名，则返回这些别名 + * + * @param name + * @return + * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException + * + */ + public static String[] getAliases(String name) throws NoSuchBeanDefinitionException + { + return beanFactory.getAliases(name); + } + + /** + * 获取aop代理对象 + * + * @param invoker + * @return + */ + @SuppressWarnings("unchecked") + public static T getAopProxy(T invoker) + { + return (T) AopContext.currentProxy(); + } + + /** + * 获取当前的环境配置，无配置返回null + * + * @return 当前的环境配置 + */ + public static String[] getActiveProfiles() + { + return applicationContext.getEnvironment().getActiveProfiles(); + } + + /** + * 获取当前的环境配置，当有多个环境配置时，只获取第一个 + * + * @return 当前的环境配置 + */ + public static String getActiveProfile() + { + final String[] activeProfiles = getActiveProfiles(); + return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null; + } + + /** + * 获取配置文件中的值 + * + * @param key 配置文件的key + * @return 当前的配置文件的值 + * + */ + public static String getRequiredProperty(String key) + { + return applicationContext.getEnvironment().getRequiredProperty(key); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sql/SqlUtil.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sql/SqlUtil.java new file mode 100644 index 0000000..9acc837 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/sql/SqlUtil.java @@ -0,0 +1,61 @@ +package com.limap.common.utils.sql; + +import com.limap.common.exception.UtilException; +import com.limap.common.utils.StringUtils; + +/** + * sql操作工具类 + * + * @author limap + */ +public class SqlUtil +{ + /** + * 定义常用的 sql关键字 + */ + public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()"; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） + */ + public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 检查字符，防止注入绕过 + */ + public static String escapeOrderBySql(String value) + { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) + { + throw new UtilException("参数不符合规范，不能进行查询"); + } + return value; + } + + /** + * 验证 order by 语法是否符合规范 + */ + public static boolean isValidOrderBySql(String value) + { + return value.matches(SQL_PATTERN); + } + + /** + * SQL关键字检查 + */ + public static void filterKeyword(String value) + { + if (StringUtils.isEmpty(value)) + { + return; + } + String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); + for (String sqlKeyword : sqlKeywords) + { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) + { + throw new UtilException("参数存在SQL注入风险"); + } + } + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/IdUtils.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/IdUtils.java new file mode 100644 index 0000000..dd3744e --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/IdUtils.java @@ -0,0 +1,49 @@ +package com.limap.common.utils.uuid; + +/** + * ID生成器工具类 + * + * @author limap + */ +public class IdUtils +{ + /** + * 获取随机UUID + * + * @return 随机UUID + */ + public static String randomUUID() + { + return UUID.randomUUID().toString(); + } + + /** + * 简化的UUID，去掉了横线 + * + * @return 简化的UUID，去掉了横线 + */ + public static String simpleUUID() + { + return UUID.randomUUID().toString(true); + } + + /** + * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID + * + * @return 随机UUID + */ + public static String fastUUID() + { + return UUID.fastUUID().toString(); + } + + /** + * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID + * + * @return 简化的UUID，去掉了横线 + */ + public static String fastSimpleUUID() + { + return UUID.fastUUID().toString(true); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/Seq.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/Seq.java new file mode 100644 index 0000000..cb32aac --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/Seq.java @@ -0,0 +1,86 @@ +package com.limap.common.utils.uuid; + +import java.util.concurrent.atomic.AtomicInteger; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.StringUtils; + +/** + * @author limap 序列生成类 + */ +public class Seq +{ + // 通用序列类型 + public static final String commSeqType = "COMMON"; + + // 上传序列类型 + public static final String uploadSeqType = "UPLOAD"; + + // 通用接口序列数 + private static AtomicInteger commSeq = new AtomicInteger(1); + + // 上传接口序列数 + private static AtomicInteger uploadSeq = new AtomicInteger(1); + + // 机器标识 + private static final String machineCode = "A"; + + /** + * 获取通用序列号 + * + * @return 序列值 + */ + public static String getId() + { + return getId(commSeqType); + } + + /** + * 默认16位序列号 yyMMddHHmmss + 一位机器标识 + 3长度循环递增字符串 + * + * @return 序列值 + */ + public static String getId(String type) + { + AtomicInteger atomicInt = commSeq; + if (uploadSeqType.equals(type)) + { + atomicInt = uploadSeq; + } + return getId(atomicInt, 3); + } + + /** + * 通用接口序列号 yyMMddHHmmss + 一位机器标识 + length长度循环递增字符串 + * + * @param atomicInt 序列数 + * @param length 数值长度 + * @return 序列值 + */ + public static String getId(AtomicInteger atomicInt, int length) + { + String result = DateUtils.dateTimeNow(); + result += machineCode; + result += getSeq(atomicInt, length); + return result; + } + + /** + * 序列循环递增字符串[1, 10 的 (length)幂次方), 用0左补齐length位数 + * + * @return 序列值 + */ + private synchronized static String getSeq(AtomicInteger atomicInt, int length) + { + // 先取值再+1 + int value = atomicInt.getAndIncrement(); + + // 如果更新后值>=10 的 (length)幂次方则重置为1 + int maxSeq = (int) Math.pow(10, length); + if (atomicInt.get() >= maxSeq) + { + atomicInt.set(1); + } + // 转字符串，用0左补齐 + return StringUtils.padl(value, length); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/UUID.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/UUID.java new file mode 100644 index 0000000..ebf8854 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/utils/uuid/UUID.java @@ -0,0 +1,484 @@ +package com.limap.common.utils.uuid; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; +import com.limap.common.exception.UtilException; + +/** + * 提供通用唯一识别码（universally unique identifier）（UUID）实现 + * + * @author limap + */ +public final class UUID implements java.io.Serializable, Comparable +{ + private static final long serialVersionUID = -1185015143654744140L; + + /** + * SecureRandom 的单例 + * + */ + private static class Holder + { + static final SecureRandom numberGenerator = getSecureRandom(); + } + + /** 此UUID的最高64有效位 */ + private final long mostSigBits; + + /** 此UUID的最低64有效位 */ + private final long leastSigBits; + + /** + * 私有构造 + * + * @param data 数据 + */ + private UUID(byte[] data) + { + long msb = 0; + long lsb = 0; + assert data.length == 16 : "data must be 16 bytes in length"; + for (int i = 0; i < 8; i++) + { + msb = (msb << 8) | (data[i] & 0xff); + } + for (int i = 8; i < 16; i++) + { + lsb = (lsb << 8) | (data[i] & 0xff); + } + this.mostSigBits = msb; + this.leastSigBits = lsb; + } + + /** + * 使用指定的数据构造新的 UUID。 + * + * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位 + * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位 + */ + public UUID(long mostSigBits, long leastSigBits) + { + this.mostSigBits = mostSigBits; + this.leastSigBits = leastSigBits; + } + + /** + * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。 + * + * @return 随机生成的 {@code UUID} + */ + public static UUID fastUUID() + { + return randomUUID(false); + } + + /** + * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 + * + * @return 随机生成的 {@code UUID} + */ + public static UUID randomUUID() + { + return randomUUID(true); + } + + /** + * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。 + * + * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能 + * @return 随机生成的 {@code UUID} + */ + public static UUID randomUUID(boolean isSecure) + { + final Random ng = isSecure ? Holder.numberGenerator : getRandom(); + + byte[] randomBytes = new byte[16]; + ng.nextBytes(randomBytes); + randomBytes[6] &= 0x0f; /* clear version */ + randomBytes[6] |= 0x40; /* set to version 4 */ + randomBytes[8] &= 0x3f; /* clear variant */ + randomBytes[8] |= 0x80; /* set to IETF variant */ + return new UUID(randomBytes); + } + + /** + * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。 + * + * @param name 用于构造 UUID 的字节数组。 + * + * @return 根据指定数组生成的 {@code UUID} + */ + public static UUID nameUUIDFromBytes(byte[] name) + { + MessageDigest md; + try + { + md = MessageDigest.getInstance("MD5"); + } + catch (NoSuchAlgorithmException nsae) + { + throw new InternalError("MD5 not supported"); + } + byte[] md5Bytes = md.digest(name); + md5Bytes[6] &= 0x0f; /* clear version */ + md5Bytes[6] |= 0x30; /* set to version 3 */ + md5Bytes[8] &= 0x3f; /* clear variant */ + md5Bytes[8] |= 0x80; /* set to IETF variant */ + return new UUID(md5Bytes); + } + + /** + * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。 + * + * @param name 指定 {@code UUID} 字符串 + * @return 具有指定值的 {@code UUID} + * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常 + * + */ + public static UUID fromString(String name) + { + String[] components = name.split("-"); + if (components.length != 5) + { + throw new IllegalArgumentException("Invalid UUID string: " + name); + } + for (int i = 0; i < 5; i++) + { + components[i] = "0x" + components[i]; + } + + long mostSigBits = Long.decode(components[0]).longValue(); + mostSigBits <<= 16; + mostSigBits |= Long.decode(components[1]).longValue(); + mostSigBits <<= 16; + mostSigBits |= Long.decode(components[2]).longValue(); + + long leastSigBits = Long.decode(components[3]).longValue(); + leastSigBits <<= 48; + leastSigBits |= Long.decode(components[4]).longValue(); + + return new UUID(mostSigBits, leastSigBits); + } + + /** + * 返回此 UUID 的 128 位值中的最低有效 64 位。 + * + * @return 此 UUID 的 128 位值中的最低有效 64 位。 + */ + public long getLeastSignificantBits() + { + return leastSigBits; + } + + /** + * 返回此 UUID 的 128 位值中的最高有效 64 位。 + * + * @return 此 UUID 的 128 位值中最高有效 64 位。 + */ + public long getMostSignificantBits() + { + return mostSigBits; + } + + /** + * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。 + *

+ * 版本号具有以下含意: + *

    + *
  • 1 基于时间的 UUID + *
  • 2 DCE 安全 UUID + *
  • 3 基于名称的 UUID + *
  • 4 随机生成的 UUID + *
+ * + * @return 此 {@code UUID} 的版本号 + */ + public int version() + { + // Version is bits masked by 0x000000000000F000 in MS long + return (int) ((mostSigBits >> 12) & 0x0f); + } + + /** + * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。 + *

+ * 变体号具有以下含意： + *

    + *
  • 0 为 NCS 向后兼容保留 + *
  • 2 IETF RFC 4122(Leach-Salz), 用于此类 + *
  • 6 保留，微软向后兼容 + *
  • 7 保留供以后定义使用 + *
+ * + * @return 此 {@code UUID} 相关联的变体号 + */ + public int variant() + { + // This field is composed of a varying number of bits. + // 0 - - Reserved for NCS backward compatibility + // 1 0 - The IETF aka Leach-Salz variant (used by this class) + // 1 1 0 Reserved, Microsoft backward compatibility + // 1 1 1 Reserved for future definition. + return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63)); + } + + /** + * 与此 UUID 相关联的时间戳值。 + * + *

+ * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。
+ * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。 + * + *

+ * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。
+ * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。 + * + * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。 + */ + public long timestamp() throws UnsupportedOperationException + { + checkTimeBase(); + return (mostSigBits & 0x0FFFL) << 48// + | ((mostSigBits >> 16) & 0x0FFFFL) << 32// + | mostSigBits >>> 32; + } + + /** + * 与此 UUID 相关联的时钟序列值。 + * + *

+ * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。 + *

+ * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出 + * UnsupportedOperationException。 + * + * @return 此 {@code UUID} 的时钟序列 + * + * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 + */ + public int clockSequence() throws UnsupportedOperationException + { + checkTimeBase(); + return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48); + } + + /** + * 与此 UUID 相关的节点值。 + * + *

+ * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。 + *

+ * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。
+ * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。 + * + * @return 此 {@code UUID} 的节点值 + * + * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1 + */ + public long node() throws UnsupportedOperationException + { + checkTimeBase(); + return leastSigBits & 0x0000FFFFFFFFFFFFL; + } + + /** + * 返回此{@code UUID} 的字符串表现形式。 + * + *

+ * UUID 的字符串表示形式由此 BNF 描述： + * + * 

+     * {@code
+     * UUID                   = ----
+     * time_low               = 4*
+     * time_mid               = 2*
+     * time_high_and_version  = 2*
+     * variant_and_sequence   = 2*
+     * node                   = 6*
+     * hexOctet               = 
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     *
+ * + * + * + * @return 此{@code UUID} 的字符串表现形式 + * @see #toString(boolean) + */ + @Override + public String toString() + { + return toString(false); + } + + /** + * 返回此{@code UUID} 的字符串表现形式。 + * + *

+ * UUID 的字符串表示形式由此 BNF 描述： + * + * 

+     * {@code
+     * UUID                   = ----
+     * time_low               = 4*
+     * time_mid               = 2*
+     * time_high_and_version  = 2*
+     * variant_and_sequence   = 2*
+     * node                   = 6*
+     * hexOctet               = 
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     *
+ * + * + * + * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串 + * @return 此{@code UUID} 的字符串表现形式 + */ + public String toString(boolean isSimple) + { + final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36); + // time_low + builder.append(digits(mostSigBits >> 32, 8)); + if (!isSimple) + { + builder.append('-'); + } + // time_mid + builder.append(digits(mostSigBits >> 16, 4)); + if (!isSimple) + { + builder.append('-'); + } + // time_high_and_version + builder.append(digits(mostSigBits, 4)); + if (!isSimple) + { + builder.append('-'); + } + // variant_and_sequence + builder.append(digits(leastSigBits >> 48, 4)); + if (!isSimple) + { + builder.append('-'); + } + // node + builder.append(digits(leastSigBits, 12)); + + return builder.toString(); + } + + /** + * 返回此 UUID 的哈希码。 + * + * @return UUID 的哈希码值。 + */ + @Override + public int hashCode() + { + long hilo = mostSigBits ^ leastSigBits; + return ((int) (hilo >> 32)) ^ (int) hilo; + } + + /** + * 将此对象与指定对象比较。 + *

+ * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。 + * + * @param obj 要与之比较的对象 + * + * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false} + */ + @Override + public boolean equals(Object obj) + { + if ((null == obj) || (obj.getClass() != UUID.class)) + { + return false; + } + UUID id = (UUID) obj; + return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits); + } + + // Comparison Operations + + /** + * 将此 UUID 与指定的 UUID 比较。 + * + *

+ * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。 + * + * @param val 与此 UUID 比较的 UUID + * + * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。 + * + */ + @Override + public int compareTo(UUID val) + { + // The ordering is intentionally set up so that the UUIDs + // can simply be numerically compared as two numbers + return (this.mostSigBits < val.mostSigBits ? -1 : // + (this.mostSigBits > val.mostSigBits ? 1 : // + (this.leastSigBits < val.leastSigBits ? -1 : // + (this.leastSigBits > val.leastSigBits ? 1 : // + 0)))); + } + + // ------------------------------------------------------------------------------------------------------------------- + // Private method start + /** + * 返回指定数字对应的hex值 + * + * @param val 值 + * @param digits 位 + * @return 值 + */ + private static String digits(long val, int digits) + { + long hi = 1L << (digits * 4); + return Long.toHexString(hi | (val & (hi - 1))).substring(1); + } + + /** + * 检查是否为time-based版本UUID + */ + private void checkTimeBase() + { + if (version() != 1) + { + throw new UnsupportedOperationException("Not a time-based UUID"); + } + } + + /** + * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG) + * + * @return {@link SecureRandom} + */ + public static SecureRandom getSecureRandom() + { + try + { + return SecureRandom.getInstance("SHA1PRNG"); + } + catch (NoSuchAlgorithmException e) + { + throw new UtilException(e); + } + } + + /** + * 获取随机数生成器对象
+ * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。 + * + * @return {@link ThreadLocalRandom} + */ + public static ThreadLocalRandom getRandom() + { + return ThreadLocalRandom.current(); + } +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/Xss.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/Xss.java new file mode 100644 index 0000000..092bf23 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/Xss.java @@ -0,0 +1,27 @@ +package com.limap.common.xss; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 自定义xss校验注解 + * + * @author limap + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) +@Constraint(validatedBy = { XssValidator.class }) +public @interface Xss +{ + String message() + + default "不允许任何脚本运行"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/XssValidator.java b/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/XssValidator.java new file mode 100644 index 0000000..dc8a8a5 --- /dev/null +++ b/fishery-common/fishery-common-core/src/main/java/com/limap/common/xss/XssValidator.java @@ -0,0 +1,34 @@ +package com.limap.common.xss; + +import com.limap.common.utils.StringUtils; +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 自定义xss校验注解实现 + * + * @author limap + */ +public class XssValidator implements ConstraintValidator +{ + private static final String HTML_PATTERN = "<(\\S*?)[^>]*>.*?|<.*? />"; + + @Override + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) + { + if (StringUtils.isBlank(value)) + { + return true; + } + return !containsHtml(value); + } + + public static boolean containsHtml(String value) + { + Pattern pattern = Pattern.compile(HTML_PATTERN); + Matcher matcher = pattern.matcher(value); + return matcher.matches(); + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-log/pom.xml b/fishery-common/fishery-common-log/pom.xml new file mode 100644 index 0000000..cb47c75 --- /dev/null +++ b/fishery-common/fishery-common-log/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-log + 日志记录 + + + + + eu.bitwalker + UserAgentUtils + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-api + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/annotation/Log.java b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/annotation/Log.java new file mode 100644 index 0000000..9dde5f5 --- /dev/null +++ b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/annotation/Log.java @@ -0,0 +1,51 @@ +package com.limap.common.log.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import com.limap.common.enums.BusinessType; +import com.limap.common.enums.OperatorType; + +/** + * 自定义操作日志记录注解 + * + * @author limap + * + */ +@Target({ ElementType.PARAMETER, ElementType.METHOD }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Log +{ + /** + * 模块 + */ + public String title() default ""; + + /** + * 功能 + */ + public BusinessType businessType() default BusinessType.OTHER; + + /** + * 操作人类别 + */ + public OperatorType operatorType() default OperatorType.MANAGE; + + /** + * 是否保存请求的参数 + */ + public boolean isSaveRequestData() default true; + + /** + * 是否保存响应的参数 + */ + public boolean isSaveResponseData() default true; + + /** + * 排除指定的请求参数 + */ + public String[] excludeParamNames() default {}; +} diff --git a/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/aspectj/LogAspect.java b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/aspectj/LogAspect.java new file mode 100644 index 0000000..3c40056 --- /dev/null +++ b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/aspectj/LogAspect.java @@ -0,0 +1,254 @@ +package com.limap.common.log.aspectj; + +import java.util.Collection; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.ArrayUtils; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.NamedThreadLocal; +import org.springframework.stereotype.Component; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; +import com.alibaba.fastjson2.JSON; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.enums.BusinessStatus; +import com.limap.common.enums.HttpMethod; +import com.limap.common.filter.PropertyPreExcludeFilter; +import com.limap.common.log.annotation.Log; +import com.limap.common.log.manager.AsyncManager; +import com.limap.common.log.manager.factory.AsyncFactory; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ip.IpUtils; +import com.limap.common.core.domain.entity.SysOperLog; + +/** + * 操作日志记录处理 + * + * @author limap + */ +@Aspect +@Component +public class LogAspect +{ + private static final Logger log = LoggerFactory.getLogger(LogAspect.class); + + /** 排除敏感属性字段 */ + public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" }; + + /** 计算操作消耗时间 */ + private static final ThreadLocal TIME_THREADLOCAL = new NamedThreadLocal("Cost Time"); + + /** + * 处理请求前执行 + */ + @Before(value = "@annotation(controllerLog)") + public void boBefore(JoinPoint joinPoint, Log controllerLog) + { + TIME_THREADLOCAL.set(System.currentTimeMillis()); + } + + /** + * 处理完请求后执行 + * + * @param joinPoint 切点 + */ + @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult") + public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) + { + handleLog(joinPoint, controllerLog, null, jsonResult); + } + + /** + * 拦截异常操作 + * + * @param joinPoint 切点 + * @param e 异常 + */ + @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e") + public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) + { + handleLog(joinPoint, controllerLog, e, null); + } + + protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) + { + try + { + // 获取当前的用户 + LoginUser loginUser = null; + try{ + loginUser = SecurityUtils.getLoginUser(); + }catch (Exception exception){ + log.error("日志获取用户异常"); + } + + + // *========数据库日志=========*// + SysOperLog operLog = new SysOperLog(); + operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); + // 请求的地址 + String ip = IpUtils.getIpAddr(); + operLog.setOperIp(ip); + operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); + if (loginUser != null) + { + operLog.setOperName(loginUser.getUsername()); + } + + if (e != null) + { + operLog.setStatus(BusinessStatus.FAIL.ordinal()); + operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000)); + } + // 设置方法名称 + String className = joinPoint.getTarget().getClass().getName(); + String methodName = joinPoint.getSignature().getName(); + operLog.setMethod(className + "." + methodName + "()"); + // 设置请求方式 + operLog.setRequestMethod(ServletUtils.getRequest().getMethod()); + // 处理设置注解上的参数 + getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult); + // 设置消耗时间 + operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get()); + // 保存数据库 + AsyncManager.me().execute(AsyncFactory.recordOper(operLog)); + } + catch (Exception exp) + { + // 记录本地异常日志 + log.error("异常信息:{}", exp.getMessage()); + exp.printStackTrace(); + } + finally + { + TIME_THREADLOCAL.remove(); + } + } + + /** + * 获取注解中对方法的描述信息 用于Controller层注解 + * + * @param log 日志 + * @param operLog 操作日志 + * @throws Exception + */ + public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception + { + // 设置action动作 + operLog.setBusinessType(log.businessType().ordinal()); + // 设置标题 + operLog.setTitle(log.title()); + // 设置操作人类别 + operLog.setOperatorType(log.operatorType().ordinal()); + // 是否需要保存request，参数和值 + if (log.isSaveRequestData()) + { + // 获取参数的信息，传入到数据库中。 + setRequestValue(joinPoint, operLog, log.excludeParamNames()); + } + // 是否需要保存response，参数和值 + if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult)) + { + operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000)); + } + } + + /** + * 获取请求的参数，放到log中 + * + * @param operLog 操作日志 + * @throws Exception 异常 + */ + private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception + { + String requestMethod = operLog.getRequestMethod(); + if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)) + { + String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames); + operLog.setOperParam(StringUtils.substring(params, 0, 2000)); + } + else + { + Map paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest()); + operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000)); + } + } + + /** + * 参数拼装 + */ + private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) + { + String params = ""; + if (paramsArray != null && paramsArray.length > 0) + { + for (Object o : paramsArray) + { + if (StringUtils.isNotNull(o) && !isFilterObject(o)) + { + try + { + String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames)); + params += jsonObj.toString() + " "; + } + catch (Exception e) + { + } + } + } + } + return params.trim(); + } + + /** + * 忽略敏感属性 + */ + public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames) + { + return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames)); + } + + /** + * 判断是否需要过滤的对象。 + * + * @param o 对象信息。 + * @return 如果是需要过滤的对象，则返回true；否则返回false。 + */ + @SuppressWarnings("rawtypes") + public boolean isFilterObject(final Object o) + { + Class clazz = o.getClass(); + if (clazz.isArray()) + { + return clazz.getComponentType().isAssignableFrom(MultipartFile.class); + } + else if (Collection.class.isAssignableFrom(clazz)) + { + Collection collection = (Collection) o; + for (Object value : collection) + { + return value instanceof MultipartFile; + } + } + else if (Map.class.isAssignableFrom(clazz)) + { + Map map = (Map) o; + for (Object value : map.entrySet()) + { + Map.Entry entry = (Map.Entry) value; + return entry.getValue() instanceof MultipartFile; + } + } + return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse + || o instanceof BindingResult; + } +} diff --git a/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/AsyncManager.java b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/AsyncManager.java new file mode 100644 index 0000000..9e90418 --- /dev/null +++ b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/AsyncManager.java @@ -0,0 +1,55 @@ +package com.limap.common.log.manager; + +import java.util.TimerTask; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import com.limap.common.utils.Threads; +import com.limap.common.utils.spring.SpringUtils; + +/** + * 异步任务管理器 + * + * @author limap + */ +public class AsyncManager +{ + /** + * 操作延迟10毫秒 + */ + private final int OPERATE_DELAY_TIME = 10; + + /** + * 异步操作任务调度线程池 + */ + private ScheduledExecutorService executor = SpringUtils.getBean("scheduledExecutorService"); + + /** + * 单例模式 + */ + private AsyncManager(){} + + private static AsyncManager me = new AsyncManager(); + + public static AsyncManager me() + { + return me; + } + + /** + * 执行任务 + * + * @param task 任务 + */ + public void execute(TimerTask task) + { + executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS); + } + + /** + * 停止任务线程池 + */ + public void shutdown() + { + Threads.shutdownAndAwaitTermination(executor); + } +} diff --git a/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/ShutdownManager.java b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/ShutdownManager.java new file mode 100644 index 0000000..7db03e5 --- /dev/null +++ b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/ShutdownManager.java @@ -0,0 +1,39 @@ +package com.limap.common.log.manager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.PreDestroy; + +/** + * 确保应用退出时能关闭后台线程 + * + * @author limap + */ +@Component +public class ShutdownManager +{ + private static final Logger logger = LoggerFactory.getLogger("sys-user"); + + @PreDestroy + public void destroy() + { + shutdownAsyncManager(); + } + + /** + * 停止异步执行任务 + */ + private void shutdownAsyncManager() + { + try + { + logger.info("====关闭后台任务任务线程池===="); + AsyncManager.me().shutdown(); + } + catch (Exception e) + { + logger.error(e.getMessage(), e); + } + } +} diff --git a/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/factory/AsyncFactory.java b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/factory/AsyncFactory.java new file mode 100644 index 0000000..1b8b59f --- /dev/null +++ b/fishery-common/fishery-common-log/src/main/java/com/limap/common/log/manager/factory/AsyncFactory.java @@ -0,0 +1,112 @@ +package com.limap.common.log.manager.factory; + +import java.util.TimerTask; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.constant.Constants; +import com.limap.common.utils.LogUtils; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ip.AddressUtils; +import com.limap.common.utils.ip.IpUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.common.core.domain.entity.SysOperLog; +import com.limap.common.core.domain.entity.SysLogininfor; +import com.limap.common.api.SystemApi; +import eu.bitwalker.useragentutils.UserAgent; + +/** + * 异步工厂（产生任务用） + * + * @author limap + */ +public class AsyncFactory +{ + private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user"); + + /** + * 记录登录信息 + * + * @param username 用户名 + * @param status 状态 + * @param message 消息 + * @param args 列表 + * @return 任务task + */ + public static TimerTask recordLogininfor(final String username, final String status, final String message, + final Object... args) + { + String os = ""; + String browser = ""; + String ip = ""; + try{ + UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); + // 获取客户端操作系统 + os = userAgent.getOperatingSystem().getName(); + // 获取客户端浏览器 + browser = userAgent.getBrowser().getName(); + ip = IpUtils.getIpAddr(); + } catch (Exception ex){ + + } + + String finalBrowser = browser; + String finalOs = os; + String finalIp = ip; + return new TimerTask() + { + @Override + public void run() + { + String address = AddressUtils.getRealAddressByIP(finalIp); + StringBuilder s = new StringBuilder(); + s.append(LogUtils.getBlock(finalIp)); + s.append(address); + s.append(LogUtils.getBlock(username)); + s.append(LogUtils.getBlock(status)); + s.append(LogUtils.getBlock(message)); + // 打印信息到日志 + sys_user_logger.info(s.toString(), args); + + SysLogininfor logininfor = new SysLogininfor(); + logininfor.setUserName(username); + logininfor.setIpaddr(finalIp); + logininfor.setLoginLocation(address); + logininfor.setBrowser(finalBrowser); + logininfor.setOs(finalOs); + logininfor.setMsg(message); + // 日志状态 + if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) + { + logininfor.setStatus(Constants.SUCCESS); + } + else if (Constants.LOGIN_FAIL.equals(status)) + { + logininfor.setStatus(Constants.FAIL); + } + // 插入数据 + SpringUtils.getBean(SystemApi.class).insertLogininfor(logininfor); + } + }; + } + + /** + * 操作日志记录 + * + * @param operLog 操作日志信息 + * @return 任务task + */ + public static TimerTask recordOper(final SysOperLog operLog) + { + return new TimerTask() + { + @Override + public void run() + { + // 远程查询操作地点 + operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); + SpringUtils.getBean(SystemApi.class).insertOperlog(operLog); + } + }; + } +} diff --git a/fishery-common/fishery-common-mybatis/pom.xml b/fishery-common/fishery-common-mybatis/pom.xml new file mode 100644 index 0000000..b81a2e7 --- /dev/null +++ b/fishery-common/fishery-common-mybatis/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-mybatis + 数据库访问 + + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-security + + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/aspectj/DataScopeAspect.java b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/aspectj/DataScopeAspect.java new file mode 100644 index 0000000..d97462c --- /dev/null +++ b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/aspectj/DataScopeAspect.java @@ -0,0 +1,168 @@ +package com.limap.common.mybatis.aspectj; + +import java.util.ArrayList; +import java.util.List; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; +import com.limap.common.annotation.DataScope; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.text.Convert; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.security.context.PermissionContextHolder; + +/** + * 数据过滤处理 + * + * @author limap + */ +@Aspect +@Component +public class DataScopeAspect +{ + /** + * 全部数据权限 + */ + public static final String DATA_SCOPE_ALL = "1"; + + /** + * 自定数据权限 + */ + public static final String DATA_SCOPE_CUSTOM = "2"; + + /** + * 部门数据权限 + */ + public static final String DATA_SCOPE_DEPT = "3"; + + /** + * 部门及以下数据权限 + */ + public static final String DATA_SCOPE_DEPT_AND_CHILD = "4"; + + /** + * 仅本人数据权限 + */ + public static final String DATA_SCOPE_SELF = "5"; + + /** + * 数据权限过滤关键字 + */ + public static final String DATA_SCOPE = "dataScope"; + + @Before("@annotation(controllerDataScope)") + public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable + { + clearDataScope(point); + handleDataScope(point, controllerDataScope); + } + + protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) + { + // 获取当前的用户 + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNotNull(loginUser)) + { + SysUser currentUser = loginUser.getUser(); + // 如果是超级管理员，则不过滤数据 + if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) + { + String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext()); + dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), + controllerDataScope.userAlias(), permission); + } + } + } + + /** + * 数据范围过滤 + * + * @param joinPoint 切点 + * @param user 用户 + * @param deptAlias 部门别名 + * @param userAlias 用户别名 + * @param permission 权限字符 + */ + public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission) + { + StringBuilder sqlString = new StringBuilder(); + List conditions = new ArrayList(); + + for (SysRole role : user.getRoles()) + { + String dataScope = role.getDataScope(); + if (!DATA_SCOPE_CUSTOM.equals(dataScope) && conditions.contains(dataScope)) + { + continue; + } + if (StringUtils.isNotEmpty(permission) && StringUtils.isNotEmpty(role.getPermissions()) + && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))) + { + continue; + } + if (DATA_SCOPE_ALL.equals(dataScope)) + { + sqlString = new StringBuilder(); + break; + } + else if (DATA_SCOPE_CUSTOM.equals(dataScope)) + { + sqlString.append(StringUtils.format( + " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, + role.getRoleId())); + } + else if (DATA_SCOPE_DEPT.equals(dataScope)) + { + sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId())); + } + else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) + { + sqlString.append(StringUtils.format( + " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", + deptAlias, user.getDeptId(), user.getDeptId())); + } + else if (DATA_SCOPE_SELF.equals(dataScope)) + { + if (StringUtils.isNotBlank(userAlias)) + { + sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId())); + } + else + { + // 数据权限为仅本人且没有userAlias别名不查询任何数据 + sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias)); + } + } + conditions.add(dataScope); + } + + if (StringUtils.isNotBlank(sqlString.toString())) + { + Object params = joinPoint.getArgs()[0]; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) + { + BaseEntity baseEntity = (BaseEntity) params; + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); + } + } + } + + /** + * 拼接权限sql前先清空params.dataScope参数防止注入 + */ + private void clearDataScope(final JoinPoint joinPoint) + { + Object params = joinPoint.getArgs()[0]; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) + { + BaseEntity baseEntity = (BaseEntity) params; + baseEntity.getParams().put(DATA_SCOPE, ""); + } + } +} + diff --git a/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/config/MybatisPlusConfig.java b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/config/MybatisPlusConfig.java new file mode 100644 index 0000000..47aab80 --- /dev/null +++ b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/config/MybatisPlusConfig.java @@ -0,0 +1,67 @@ +package com.limap.common.mybatis.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.limap.common.mybatis.handler.FieldMetaObjectHandler; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * Mybatis Plus 配置 + * + * @author limap + */ +@EnableTransactionManagement(proxyTargetClass = true) +@Configuration +public class MybatisPlusConfig { + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + // 分页插件 + interceptor.addInnerInterceptor(paginationInnerInterceptor()); + // 乐观锁插件 + interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor()); + // 阻断插件 + interceptor.addInnerInterceptor(blockAttackInnerInterceptor()); + return interceptor; + } + + /** + * 分页插件，自动识别数据库类型 https://baomidou.com/guide/interceptor-pagination.html + */ + public PaginationInnerInterceptor paginationInnerInterceptor() { + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(); + // 设置数据库类型为mysql + paginationInnerInterceptor.setDbType(DbType.MYSQL); + // 设置最大单页限制数量，默认 500 条，-1 不受限制 + paginationInnerInterceptor.setMaxLimit(-1L); + return paginationInnerInterceptor; + } + + /** + * 乐观锁插件 https://baomidou.com/guide/interceptor-optimistic-locker.html + */ + public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() { + return new OptimisticLockerInnerInterceptor(); + } + + /** + * 如果是对全表的删除或更新操作，就会终止该操作 https://baomidou.com/guide/interceptor-block-attack.html + */ + public BlockAttackInnerInterceptor blockAttackInnerInterceptor() { + return new BlockAttackInnerInterceptor(); + } + + /** + * mybatis-plus 自动填充字段 + */ + @Bean + public FieldMetaObjectHandler fieldMetaObjectHandler(){ + return new FieldMetaObjectHandler(); + } +} diff --git a/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/handler/FieldMetaObjectHandler.java b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/handler/FieldMetaObjectHandler.java new file mode 100644 index 0000000..1ff1ec1 --- /dev/null +++ b/fishery-common/fishery-common-mybatis/src/main/java/com/limap/common/mybatis/handler/FieldMetaObjectHandler.java @@ -0,0 +1,61 @@ +package com.limap.common.mybatis.handler; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.utils.SecurityUtils; + +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; + +import java.util.Date; + +/** + * mybatis-plus 自动填充字段 + * + * @author theodo + */ +@Slf4j +public class FieldMetaObjectHandler implements MetaObjectHandler { + private final static String CREATE_TIME = "createTime"; + private final static String CREATE_BY = "createBy"; + private final static String UPDATE_TIME = "updateTime"; + private final static String UPDATE_BY = "updateBy"; + private final static String DEL_FLAG = "delFlag"; + + @Override + public void insertFill(MetaObject metaObject) { + LoginUser loginUser = null; + try{ + loginUser = SecurityUtils.getLoginUser(); + }catch (Exception e){ + log.error("获取用户信息失败"); + } + Date date = new Date(); + // 创建者 + strictInsertFill(metaObject, CREATE_BY, String.class,loginUser == null?"系统创建": loginUser.getUsername()); + // 创建时间 + strictInsertFill(metaObject, CREATE_TIME, Date.class, date); + // 更新者 + strictInsertFill(metaObject, UPDATE_BY, String.class,loginUser == null?"系统修改": loginUser.getUsername()); + // 更新时间 + strictInsertFill(metaObject, UPDATE_TIME, Date.class, date); + // 删除标识 + strictInsertFill(metaObject, DEL_FLAG, Integer.class, 0); + } + + @Override + public void updateFill(MetaObject metaObject) { +// LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = null; + try{ + loginUser = SecurityUtils.getLoginUser(); + // 更新者 + strictUpdateFill(metaObject, UPDATE_BY, String.class, loginUser.getUsername()); + + }catch (Exception e){ + log.error("获取用户信息失败"); + } + // 更新时间 + strictUpdateFill(metaObject, UPDATE_TIME, Date.class, new Date()); + } +} diff --git a/fishery-common/fishery-common-security/pom.xml b/fishery-common/fishery-common-security/pom.xml new file mode 100644 index 0000000..0c6d491 --- /dev/null +++ b/fishery-common/fishery-common-security/pom.xml @@ -0,0 +1,52 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-security + 登录安全认证 + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.projectlombok + lombok + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-log + + + + + com.limap + fishery-common-api + + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/annotation/Anonymous.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/annotation/Anonymous.java new file mode 100644 index 0000000..329ff36 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/annotation/Anonymous.java @@ -0,0 +1,19 @@ +package com.limap.common.security.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 匿名访问不鉴权注解 + * + * @author limap + */ +@Target({ ElementType.METHOD, ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Anonymous +{ +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/SecurityConfig.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/SecurityConfig.java new file mode 100644 index 0000000..e0f833b --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/SecurityConfig.java @@ -0,0 +1,166 @@ +package com.limap.common.security.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.authentication.logout.LogoutFilter; +import org.springframework.web.filter.CorsFilter; + +import com.limap.common.security.handle.AuthenticationEntryPointImpl; +import com.limap.common.security.properties.PermitAllUrlProperties; +import com.limap.common.security.filter.JwtAuthenticationTokenFilter; +import com.limap.common.security.handle.LogoutSuccessHandlerImpl; + +/** + * spring security配置 + * + * @author limap + */ +@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +public class SecurityConfig extends WebSecurityConfigurerAdapter +{ + /** + * 自定义用户认证逻辑 + */ + @Autowired + @Qualifier("userDetailsByPass") + private UserDetailsService userDetailsService; + + @Autowired + @Qualifier("userDetailsByPhone") + private UserDetailsService userDetailsByPhone; + /** + * 认证失败处理类 + */ + @Autowired + private AuthenticationEntryPointImpl unauthorizedHandler; + + /** + * 退出处理类 + */ + @Autowired + private LogoutSuccessHandlerImpl logoutSuccessHandler; + + /** + * token认证过滤器 + */ + @Autowired + private JwtAuthenticationTokenFilter authenticationTokenFilter; + + /** + * 跨域过滤器 + */ + @Autowired + private CorsFilter corsFilter; + + /** + * 允许匿名访问的地址 + */ + @Autowired + private PermitAllUrlProperties permitAllUrl; + + /** + * 解决 无法直接注入 AuthenticationManager + * + * @return + * @throws Exception + */ + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception + { + return super.authenticationManagerBean(); + } + + /** + * anyRequest | 匹配所有请求路径 + * access | SpringEl表达式结果为true时可以访问 + * anonymous | 匿名可以访问 + * denyAll | 用户不能访问 + * fullyAuthenticated | 用户完全认证可以访问（非remember-me下自动登录） + * hasAnyAuthority | 如果有参数，参数表示权限，则其中任何一个权限可以访问 + * hasAnyRole | 如果有参数，参数表示角色，则其中任何一个角色可以访问 + * hasAuthority | 如果有参数，参数表示权限，则其权限可以访问 + * hasIpAddress | 如果有参数，参数表示IP地址，如果用户IP和参数匹配，则可以访问 + * hasRole | 如果有参数，参数表示角色，则其角色可以访问 + * permitAll | 用户可以任意访问 + * rememberMe | 允许通过remember-me登录的用户访问 + * authenticated | 用户登录后可访问 + */ + @Override + protected void configure(HttpSecurity httpSecurity) throws Exception + { + // 注解标记允许匿名访问的url + ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry = httpSecurity.authorizeRequests(); + permitAllUrl.getUrls().forEach(url -> registry.antMatchers(url).permitAll()); + + httpSecurity + // CSRF禁用，因为不使用session + .csrf().disable() + // 禁用HTTP响应标头 + .headers().cacheControl().disable().and() + // 认证失败处理类 + .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and() + // 基于token，所以不需要session + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and() + // 过滤请求 + .authorizeRequests() + // 对于登录login 注册register 验证码captchaImage 允许匿名访问 + .antMatchers("/login", "/register", "/captchaImage","/app/login/**").permitAll() + // 静态资源，可匿名访问 + .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + .antMatchers("/app/agreement/**").permitAll() + .antMatchers("/equipment/**").permitAll() + .antMatchers("/websocket/**").anonymous() + .antMatchers("/socketServer/**").anonymous() + .antMatchers("/sockjs/socketServer/**").anonymous() + .antMatchers("/sms/**").anonymous() + .antMatchers("/basic/**").permitAll() + .antMatchers("/a/**").permitAll() + // 除上面外的所有请求全部需要鉴权认证 + .anyRequest().authenticated() + .and() + .headers().frameOptions().disable(); + // 添加Logout filter + httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler); + // 添加JWT filter + httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class); + // 添加CORS filter + httpSecurity.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class); + httpSecurity.addFilterBefore(corsFilter, LogoutFilter.class); + } + + /** + * 强散列哈希加密实现 + */ + @Bean + public BCryptPasswordEncoder bCryptPasswordEncoder() + { + return new BCryptPasswordEncoder(); + } + + /** + * 身份认证接口 + */ + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception + { + auth.authenticationProvider(new UsernamePhoneAuthenticationProvider(userDetailsByPhone)); + //账号密码的验证 + auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder()); + } + + +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationProvider.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationProvider.java new file mode 100644 index 0000000..fafadac --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationProvider.java @@ -0,0 +1,50 @@ +package com.limap.common.security.config; + +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; + +/** + * 自定义短信登录身份认证 + */ +public class UsernamePhoneAuthenticationProvider implements AuthenticationProvider { + + private UserDetailsService userDetailsService; + + public UsernamePhoneAuthenticationProvider(UserDetailsService userDetailsService) { + setUserDetailsService(userDetailsService); + } + + /** + * 重写authentication方法，实现身份验证逻辑 + */ + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + UsernamePhoneAuthenticationToken authenticationToken = (UsernamePhoneAuthenticationToken) authentication; + String phone = (String) authenticationToken.getPrincipal(); + //委托 UserDetailsService 查找系统用户 + UserDetails userDetails = userDetailsService.loadUserByUsername(phone); + //鉴权成功,返回一个拥有鉴权的AbstractAuthenticationToken + UsernamePhoneAuthenticationToken authenticationTokenRes = new UsernamePhoneAuthenticationToken(userDetails, userDetails.getAuthorities()); + authenticationTokenRes.setDetails(authenticationToken.getDetails()); + return authenticationTokenRes; + } + + /** + * 重写supports方法，指定此AuthenticationProvider 仅支持短信验证码身份验证 + */ + @Override + public boolean supports(Class authentication) { + return UsernamePhoneAuthenticationToken.class.isAssignableFrom(authentication); + } + + public UserDetailsService getUserDetailsService() { + return userDetailsService; + } + + public void setUserDetailsService(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationToken.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationToken.java new file mode 100644 index 0000000..2b52079 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/config/UsernamePhoneAuthenticationToken.java @@ -0,0 +1,54 @@ +package com.limap.common.security.config; + +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; + +import java.util.Collection; + +/** + * 自定义短信登录token验证 + */ +public class UsernamePhoneAuthenticationToken extends AbstractAuthenticationToken { + + /** + * 手机号 + */ + private final Object principal; + + public UsernamePhoneAuthenticationToken(Object principals) { + super(null); + this.principal = principals; + setAuthenticated(false); + } + + public UsernamePhoneAuthenticationToken(Object principal, Collection authorities) { + super(authorities); + this.principal = principal; + super.setAuthenticated(true); + } + + @Override + public Object getCredentials() { + return null; + } + + @Override + public Object getPrincipal() { + return this.principal; + } + + @Override + public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException { + if (isAuthenticated) { + throw new IllegalArgumentException( + "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead"); + } + super.setAuthenticated(false); + } + + @Override + public void eraseCredentials() { + super.eraseCredentials(); + } + +} \ No newline at end of file diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/AuthenticationContextHolder.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/AuthenticationContextHolder.java new file mode 100644 index 0000000..d9b4069 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/AuthenticationContextHolder.java @@ -0,0 +1,28 @@ +package com.limap.common.security.context; + +import org.springframework.security.core.Authentication; + +/** + * 身份验证信息 + * + * @author limap + */ +public class AuthenticationContextHolder +{ + private static final ThreadLocal contextHolder = new ThreadLocal<>(); + + public static Authentication getContext() + { + return contextHolder.get(); + } + + public static void setContext(Authentication context) + { + contextHolder.set(context); + } + + public static void clearContext() + { + contextHolder.remove(); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/PermissionContextHolder.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/PermissionContextHolder.java new file mode 100644 index 0000000..e04965f --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/context/PermissionContextHolder.java @@ -0,0 +1,27 @@ +package com.limap.common.security.context; + +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import com.limap.common.core.text.Convert; + +/** + * 权限信息 + * + * @author limap + */ +public class PermissionContextHolder +{ + private static final String PERMISSION_CONTEXT_ATTRIBUTES = "PERMISSION_CONTEXT"; + + public static void setContext(String permission) + { + RequestContextHolder.currentRequestAttributes().setAttribute(PERMISSION_CONTEXT_ATTRIBUTES, permission, + RequestAttributes.SCOPE_REQUEST); + } + + public static String getContext() + { + return Convert.toStr(RequestContextHolder.currentRequestAttributes().getAttribute(PERMISSION_CONTEXT_ATTRIBUTES, + RequestAttributes.SCOPE_REQUEST)); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/filter/JwtAuthenticationTokenFilter.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/filter/JwtAuthenticationTokenFilter.java new file mode 100644 index 0000000..2da4f14 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/filter/JwtAuthenticationTokenFilter.java @@ -0,0 +1,44 @@ +package com.limap.common.security.filter; + +import java.io.IOException; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.security.service.TokenService; + +/** + * token过滤器 验证token有效性 + * + * @author limap + */ +@Component +public class JwtAuthenticationTokenFilter extends OncePerRequestFilter +{ + @Autowired + private TokenService tokenService; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) + throws ServletException, IOException + { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) + { + tokenService.verifyToken(loginUser); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities()); + authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authenticationToken); + } + chain.doFilter(request, response); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/AuthenticationEntryPointImpl.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/AuthenticationEntryPointImpl.java new file mode 100644 index 0000000..fa5e408 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/AuthenticationEntryPointImpl.java @@ -0,0 +1,34 @@ +package com.limap.common.security.handle; + +import java.io.IOException; +import java.io.Serializable; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson2.JSON; +import com.limap.common.constant.HttpStatus; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; + +/** + * 认证失败处理类 返回未授权 + * + * @author limap + */ +@Component +public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable +{ + private static final long serialVersionUID = -8970718410437077606L; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) + throws IOException + { + int code = HttpStatus.UNAUTHORIZED; + String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI()); + ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg))); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/LogoutSuccessHandlerImpl.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/LogoutSuccessHandlerImpl.java new file mode 100644 index 0000000..f49bd9d --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/handle/LogoutSuccessHandlerImpl.java @@ -0,0 +1,59 @@ +package com.limap.common.security.handle; + +import java.io.IOException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import com.alibaba.fastjson2.JSON; +import com.limap.common.constant.Constants; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.log.manager.AsyncManager; +import com.limap.common.log.manager.factory.AsyncFactory; +import com.limap.common.security.service.TokenService; + +/** + * 自定义退出处理类 返回成功 + * + * @author limap + */ +@Configuration +@Slf4j +public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler +{ + @Autowired + private TokenService tokenService; + + /** + * 退出处理 + * + * @return + */ + @Override + public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) + throws IOException, ServletException + { + LoginUser loginUser = tokenService.getLoginUser(request); + if (StringUtils.isNotNull(loginUser)) + { + String userName = loginUser.getUsername(); + // 删除用户缓存记录 + tokenService.delLoginUser(loginUser.getToken()); + // 记录用户退出日志 + try{ + AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, "退出成功")); + }catch (Exception e) { + log.error("退出登录异常，用户名：{}，异常原因：{}",userName,e.getMessage()); + } + } + ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success("退出成功"))); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/properties/PermitAllUrlProperties.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/properties/PermitAllUrlProperties.java new file mode 100644 index 0000000..46af6da --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/properties/PermitAllUrlProperties.java @@ -0,0 +1,73 @@ +package com.limap.common.security.properties; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.regex.Pattern; +import org.apache.commons.lang3.RegExUtils; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.mvc.method.RequestMappingInfo; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import com.limap.common.security.annotation.Anonymous; + +/** + * 设置Anonymous注解允许匿名访问的url + * + * @author limap + */ +@Configuration +public class PermitAllUrlProperties implements InitializingBean, ApplicationContextAware +{ + private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}"); + + private ApplicationContext applicationContext; + + private List urls = new ArrayList<>(); + + public String ASTERISK = "*"; + + @Override + public void afterPropertiesSet() + { + RequestMappingHandlerMapping mapping = applicationContext.getBean(RequestMappingHandlerMapping.class); + Map map = mapping.getHandlerMethods(); + + map.keySet().forEach(info -> { + HandlerMethod handlerMethod = map.get(info); + + // 获取方法上边的注解 替代path variable 为 * + Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class); + Optional.ofNullable(method).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns()) + .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK)))); + + // 获取类上边的注解, 替代path variable 为 * + Anonymous controller = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), Anonymous.class); + Optional.ofNullable(controller).ifPresent(anonymous -> Objects.requireNonNull(info.getPatternsCondition().getPatterns()) + .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK)))); + }); + } + + @Override + public void setApplicationContext(ApplicationContext context) throws BeansException + { + this.applicationContext = context; + } + + public List getUrls() + { + return urls; + } + + public void setUrls(List urls) + { + this.urls = urls; + } +} \ No newline at end of file diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/PermissionService.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/PermissionService.java new file mode 100644 index 0000000..e67dd37 --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/PermissionService.java @@ -0,0 +1,168 @@ +package com.limap.common.security.service; + +import java.util.Set; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.security.context.PermissionContextHolder; + +/** + * limap首创 自定义权限实现，ss取自SpringSecurity首字母 + * + * @author limap + */ +@Service("ss") +public class PermissionService +{ + /** 所有权限标识 */ + private static final String ALL_PERMISSION = "*:*:*"; + + /** 管理员角色权限标识 */ + private static final String SUPER_ADMIN = "admin"; + + private static final String ROLE_DELIMETER = ","; + + private static final String PERMISSION_DELIMETER = ","; + + /** + * 验证用户是否具备某权限 + * + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + public boolean hasPermi(String permission) + { + if (StringUtils.isEmpty(permission)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) + { + return false; + } + PermissionContextHolder.setContext(permission); + return hasPermissions(loginUser.getPermissions(), permission); + } + + /** + * 验证用户是否不具备某权限，与 hasPermi逻辑相反 + * + * @param permission 权限字符串 + * @return 用户是否不具备某权限 + */ + public boolean lacksPermi(String permission) + { + return hasPermi(permission) != true; + } + + /** + * 验证用户是否具有以下任意一个权限 + * + * @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表 + * @return 用户是否具有以下任意一个权限 + */ + public boolean hasAnyPermi(String permissions) + { + if (StringUtils.isEmpty(permissions)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) + { + return false; + } + PermissionContextHolder.setContext(permissions); + Set authorities = loginUser.getPermissions(); + for (String permission : permissions.split(PERMISSION_DELIMETER)) + { + if (permission != null && hasPermissions(authorities, permission)) + { + return true; + } + } + return false; + } + + /** + * 判断用户是否拥有某个角色 + * + * @param role 角色字符串 + * @return 用户是否具备某角色 + */ + public boolean hasRole(String role) + { + if (StringUtils.isEmpty(role)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) + { + return false; + } + for (SysRole sysRole : loginUser.getUser().getRoles()) + { + String roleKey = sysRole.getRoleKey(); + if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) + { + return true; + } + } + return false; + } + + /** + * 验证用户是否不具备某角色，与 isRole逻辑相反。 + * + * @param role 角色名称 + * @return 用户是否不具备某角色 + */ + public boolean lacksRole(String role) + { + return hasRole(role) != true; + } + + /** + * 验证用户是否具有以下任意一个角色 + * + * @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表 + * @return 用户是否具有以下任意一个角色 + */ + public boolean hasAnyRoles(String roles) + { + if (StringUtils.isEmpty(roles)) + { + return false; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) + { + return false; + } + for (String role : roles.split(ROLE_DELIMETER)) + { + if (hasRole(role)) + { + return true; + } + } + return false; + } + + /** + * 判断是否包含权限 + * + * @param permissions 权限列表 + * @param permission 权限字符串 + * @return 用户是否具备某权限 + */ + private boolean hasPermissions(Set permissions, String permission) + { + return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission)); + } +} diff --git a/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/TokenService.java b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/TokenService.java new file mode 100644 index 0000000..d924efc --- /dev/null +++ b/fishery-common/fishery-common-security/src/main/java/com/limap/common/security/service/TokenService.java @@ -0,0 +1,241 @@ +package com.limap.common.security.service; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import com.limap.common.constant.CacheConstants; +import com.limap.common.constant.Constants; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.utils.ServletUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ip.AddressUtils; +import com.limap.common.utils.ip.IpUtils; +import com.limap.common.utils.uuid.IdUtils; +import eu.bitwalker.useragentutils.UserAgent; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +/** + * token验证处理 + * + * @author limap + */ +@Component +public class TokenService +{ + // 令牌自定义标识 + @Value("${token.header}") + private String header; + + // 令牌秘钥 + @Value("${token.secret}") + private String secret; + + // 令牌有效期（默认30分钟） + @Value("${token.expireTime}") + private int expireTime; + + protected static final long MILLIS_SECOND = 1000; + + protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; + + protected static final long MILLIS_Day = 60 * MILLIS_SECOND * 60 * 24; + + private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L; + + @Autowired + private RedisCache redisCache; + + /** + * 获取用户身份信息 + * + * @return 用户信息 + */ + public LoginUser getLoginUser(HttpServletRequest request) + { + // 获取请求携带的令牌 + String token = getToken(request); + if (StringUtils.isNotEmpty(token)) + { + try + { + Claims claims = parseToken(token); + // 解析对应的权限以及用户信息 + String uuid = (String) claims.get(Constants.APP_LOGIN_USER_KEY); + String userKey = getTokenKey(uuid); + LoginUser user = redisCache.getCacheObject(userKey); + return user; + } + catch (Exception e) + { + } + } + return null; + } + + /** + * 设置用户身份信息 + */ + public void setLoginUser(LoginUser loginUser) + { + if (StringUtils.isNotNull(loginUser) && StringUtils.isNotEmpty(loginUser.getToken())) + { + refreshToken(loginUser); + } + } + + /** + * 删除用户身份信息 + */ + public void delLoginUser(String token) + { + if (StringUtils.isNotEmpty(token)) + { + String userKey = getTokenKey(token); + redisCache.deleteObject(userKey); + } + } + + /** + * 创建令牌 + * + * @param loginUser 用户信息 + * @return 令牌 + */ + public String createToken(LoginUser loginUser) + { + String token = IdUtils.fastUUID(); + loginUser.setToken(token); + setUserAgent(loginUser); + refreshToken(loginUser); + + Map claims = new HashMap<>(); + claims.put(Constants.APP_LOGIN_USER_KEY, token); + return createToken(claims); + } + + public String createAppToken(LoginUser loginUser) + { + String token = IdUtils.fastUUID(); + loginUser.setToken(token); + setUserAgent(loginUser); + refreshToken(loginUser); + + Map claims = new HashMap<>(); + claims.put(Constants.APP_LOGIN_USER_KEY, token); + return createToken(claims); + } + + /** + * 验证令牌有效期，相差不足20分钟，自动刷新缓存 + * + * @param loginUser + * @return 令牌 + */ + public void verifyToken(LoginUser loginUser) + { + long expireTime = loginUser.getExpireTime(); + long currentTime = System.currentTimeMillis(); + if (expireTime - currentTime <= MILLIS_MINUTE_TEN) + { + refreshToken(loginUser); + } + } + + /** + * 刷新令牌有效期 + * + * @param loginUser 登录信息 + */ + public void refreshToken(LoginUser loginUser) + { + loginUser.setLoginTime(System.currentTimeMillis()); + loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_Day); + // 根据uuid将loginUser缓存 + String userKey = getTokenKey(loginUser.getToken()); + redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.DAYS); + } + + + /** + * 设置用户代理信息 + * + * @param loginUser 登录信息 + */ + public void setUserAgent(LoginUser loginUser) + { + UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent")); + String ip = IpUtils.getIpAddr(); + loginUser.setIpaddr(ip); + loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip)); + loginUser.setBrowser(userAgent.getBrowser().getName()); + loginUser.setOs(userAgent.getOperatingSystem().getName()); + } + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + private String createToken(Map claims) + { + String token = Jwts.builder() + .setClaims(claims) + .signWith(SignatureAlgorithm.HS512, secret).compact(); + return token; + } + + /** + * 从令牌中获取数据声明 + * + * @param token 令牌 + * @return 数据声明 + */ + private Claims parseToken(String token) + { + return Jwts.parser() + .setSigningKey(secret) + .parseClaimsJws(token) + .getBody(); + } + + /** + * 从令牌中获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public String getUsernameFromToken(String token) + { + Claims claims = parseToken(token); + return claims.getSubject(); + } + + /** + * 获取请求token + * + * @param request + * @return token + */ + private String getToken(HttpServletRequest request) + { + String token = request.getHeader(header); + if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) + { + token = token.replace(Constants.TOKEN_PREFIX, ""); + } + return token; + } + + private String getTokenKey(String uuid) + { + return CacheConstants.LOGIN_TOKEN_KEY + uuid; + } +} diff --git a/fishery-common/fishery-common-web/pom.xml b/fishery-common/fishery-common-web/pom.xml new file mode 100644 index 0000000..34931b5 --- /dev/null +++ b/fishery-common/fishery-common-web/pom.xml @@ -0,0 +1,76 @@ + + 4.0.0 + + com.limap + fishery-common + 3.8.5 + + fishery-common-web + web服务 + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + com.alibaba + druid-spring-boot-starter + + + + + com.github.whvcse + easy-captcha + + + + + org.projectlombok + lombok + + + + + com.github.xiaoymin + knife4j-spring-boot-starter + + + + + com.github.oshi + oshi-core + + + + + com.limap + fishery-common-security + + + + + com.limap + fishery-common-log + + + + + com.limap + fishery-common-api + + + + + \ No newline at end of file diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/aspectj/RateLimiterAspect.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/aspectj/RateLimiterAspect.java new file mode 100644 index 0000000..468e3f4 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/aspectj/RateLimiterAspect.java @@ -0,0 +1,89 @@ +package com.limap.common.web.aspectj; + +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.List; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.reflect.MethodSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.RedisScript; +import org.springframework.stereotype.Component; +import com.limap.common.annotation.RateLimiter; +import com.limap.common.enums.LimitType; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ip.IpUtils; + +/** + * 限流处理 + * + * @author limap + */ +@Aspect +@Component +public class RateLimiterAspect +{ + private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class); + + private RedisTemplate redisTemplate; + + private RedisScript limitScript; + + @Autowired + public void setRedisTemplate1(RedisTemplate redisTemplate) + { + this.redisTemplate = redisTemplate; + } + + @Autowired + public void setLimitScript(RedisScript limitScript) + { + this.limitScript = limitScript; + } + + @Before("@annotation(rateLimiter)") + public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable + { + int time = rateLimiter.time(); + int count = rateLimiter.count(); + + String combineKey = getCombineKey(rateLimiter, point); + List keys = Collections.singletonList(combineKey); + try + { + Long number = redisTemplate.execute(limitScript, keys, count, time); + if (StringUtils.isNull(number) || number.intValue() > count) + { + throw new ServiceException("访问过于频繁，请稍候再试"); + } + log.info("限制请求'{}',当前请求'{}',缓存key'{}'", count, number.intValue(), combineKey); + } + catch (ServiceException e) + { + throw e; + } + catch (Exception e) + { + throw new RuntimeException("服务器限流异常，请稍候再试"); + } + } + + public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) + { + StringBuffer stringBuffer = new StringBuffer(rateLimiter.key()); + if (rateLimiter.limitType() == LimitType.IP) + { + stringBuffer.append(IpUtils.getIpAddr()).append("-"); + } + MethodSignature signature = (MethodSignature) point.getSignature(); + Method method = signature.getMethod(); + Class targetClass = method.getDeclaringClass(); + stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); + return stringBuffer.toString(); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ApplicationConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ApplicationConfig.java new file mode 100644 index 0000000..271ed57 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ApplicationConfig.java @@ -0,0 +1,30 @@ +package com.limap.common.web.config; + +import java.util.TimeZone; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +/** + * 程序注解配置 + * + * @author limap + */ +@Configuration +// 表示通过aop框架暴露该代理对象,AopContext能够访问 +@EnableAspectJAutoProxy(exposeProxy = true) +// 指定要扫描的Mapper类的包的路径 +@MapperScan("com.limap.**.mapper") +public class ApplicationConfig +{ + /** + * 时区配置 + */ + @Bean + public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() + { + return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FastJson2JsonRedisSerializer.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FastJson2JsonRedisSerializer.java new file mode 100644 index 0000000..4825f04 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FastJson2JsonRedisSerializer.java @@ -0,0 +1,48 @@ +package com.limap.common.web.config; + +import java.nio.charset.Charset; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONReader; +import com.alibaba.fastjson2.JSONWriter; + +/** + * Redis使用FastJson序列化 + * + * @author limap + */ +public class FastJson2JsonRedisSerializer implements RedisSerializer +{ + public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); + + private Class clazz; + + public FastJson2JsonRedisSerializer(Class clazz) + { + super(); + this.clazz = clazz; + } + + @Override + public byte[] serialize(T t) throws SerializationException + { + if (t == null) + { + return new byte[0]; + } + return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET); + } + + @Override + public T deserialize(byte[] bytes) throws SerializationException + { + if (bytes == null || bytes.length <= 0) + { + return null; + } + String str = new String(bytes, DEFAULT_CHARSET); + + return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FilterConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FilterConfig.java new file mode 100644 index 0000000..c76f671 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/FilterConfig.java @@ -0,0 +1,58 @@ +package com.limap.common.web.config; + +import java.util.HashMap; +import java.util.Map; +import javax.servlet.DispatcherType; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import com.limap.common.filter.RepeatableFilter; +import com.limap.common.filter.XssFilter; +import com.limap.common.utils.StringUtils; + +/** + * Filter配置 + * + * @author limap + */ +@Configuration +public class FilterConfig +{ + @Value("${xss.excludes}") + private String excludes; + + @Value("${xss.urlPatterns}") + private String urlPatterns; + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Bean + @ConditionalOnProperty(value = "xss.enabled", havingValue = "true") + public FilterRegistrationBean xssFilterRegistration() + { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setDispatcherTypes(DispatcherType.REQUEST); + registration.setFilter(new XssFilter()); + registration.addUrlPatterns(StringUtils.split(urlPatterns, ",")); + registration.setName("xssFilter"); + registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE); + Map initParameters = new HashMap(); + initParameters.put("excludes", excludes); + registration.setInitParameters(initParameters); + return registration; + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @Bean + public FilterRegistrationBean someFilterRegistration() + { + FilterRegistrationBean registration = new FilterRegistrationBean(); + registration.setFilter(new RepeatableFilter()); + registration.addUrlPatterns("/*"); + registration.setName("repeatableFilter"); + registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE); + return registration; + } + +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/RedisConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/RedisConfig.java new file mode 100644 index 0000000..2384ee7 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/RedisConfig.java @@ -0,0 +1,90 @@ +package com.limap.common.web.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + +/** + * redis配置 + * + * @author limap + */ +@Configuration +@EnableCaching +public class RedisConfig extends CachingConfigurerSupport +{ + @Bean + @SuppressWarnings(value = { "unchecked", "rawtypes" }) + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) + { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(connectionFactory); + + FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(serializer); + + // Hash的key也采用StringRedisSerializer的序列化方式 + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(serializer); + + template.afterPropertiesSet(); + return template; + } + + @Bean + public DefaultRedisScript limitScript() + { + DefaultRedisScript redisScript = new DefaultRedisScript<>(); + redisScript.setScriptText(limitScriptText()); + redisScript.setResultType(Long.class); + return redisScript; + } + + /** + * 限流脚本 + */ + private String limitScriptText() + { + return "local key = KEYS[1]\n" + + "local count = tonumber(ARGV[1])\n" + + "local time = tonumber(ARGV[2])\n" + + "local current = redis.call('get', key);\n" + + "if current and tonumber(current) > count then\n" + + " return tonumber(current);\n" + + "end\n" + + "current = redis.call('incr', key)\n" + + "if tonumber(current) == 1 then\n" + + " redis.call('expire', key, time)\n" + + "end\n" + + "return tonumber(current);"; + } + + + @Bean + RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) { + RedisMessageListenerContainer container = new RedisMessageListenerContainer(); + container.setConnectionFactory(connectionFactory); + return container; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ResourcesConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ResourcesConfig.java new file mode 100644 index 0000000..70d5677 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ResourcesConfig.java @@ -0,0 +1,82 @@ +package com.limap.common.web.config; + +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.CacheControl; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import com.limap.common.config.LimapConfig; +import com.limap.common.constant.Constants; +import com.limap.common.web.interceptor.RepeatSubmitInterceptor; + +/** + * 通用配置 + * + * @author limap + */ +@Configuration +public class ResourcesConfig implements WebMvcConfigurer +{ + @Autowired + private RepeatSubmitInterceptor repeatSubmitInterceptor; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + /** 本地文件上传路径 */ + registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") + .addResourceLocations("file:" + LimapConfig.getProfile() + "/"); + + /** swagger配置 */ + registry.addResourceHandler("/swagger-ui/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/") + .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic()); + + registry.addResourceHandler("/doc.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + } + + /** + * 自定义拦截规则 + */ + @Override + public void addInterceptors(InterceptorRegistry registry) + { + registry.addInterceptor(repeatSubmitInterceptor) + .addPathPatterns("/**") +// // 排除不需要拦截的路径 +// .excludePathPatterns("/**"); +; + } + + /** + * 跨域配置 + */ + @Bean + public CorsFilter corsFilter() + { + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + // 设置访问源地址 + config.addAllowedOriginPattern("*"); + // 设置访问源请求头 + config.addAllowedHeader("*"); + // 设置访问源请求方法 + config.addAllowedMethod("*"); + // 有效期 1800秒 + config.setMaxAge(1800L); + // 添加映射路径，拦截一切请求 + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + // 返回新的CorsFilter + return new CorsFilter(source); + } + +} \ No newline at end of file diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ServerConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ServerConfig.java new file mode 100644 index 0000000..8e5b890 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ServerConfig.java @@ -0,0 +1,32 @@ +package com.limap.common.web.config; + +import javax.servlet.http.HttpServletRequest; +import org.springframework.stereotype.Component; +import com.limap.common.utils.ServletUtils; + +/** + * 服务相关配置 + * + * @author limap + */ +@Component +public class ServerConfig +{ + /** + * 获取完整的请求路径，包括：域名，端口，上下文访问路径 + * + * @return 服务地址 + */ + public String getUrl() + { + HttpServletRequest request = ServletUtils.getRequest(); + return getDomain(request); + } + + public static String getDomain(HttpServletRequest request) + { + StringBuffer url = request.getRequestURL(); + String contextPath = request.getServletContext().getContextPath(); + return url.delete(url.length() - request.getRequestURI().length(), url.length()).append(contextPath).toString(); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/SwaggerConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/SwaggerConfig.java new file mode 100644 index 0000000..ebb36bd --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/SwaggerConfig.java @@ -0,0 +1,125 @@ +package com.limap.common.web.config; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import com.limap.common.config.LimapConfig; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.Contact; +import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.SecurityScheme; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.contexts.SecurityContext; +import springfox.documentation.spring.web.plugins.Docket; + +/** + * Swagger2的接口配置 + * + * @author limap + */ +@Configuration +public class SwaggerConfig +{ + /** 系统基础配置 */ + @Autowired + private LimapConfig limapConfig; + + /** 是否开启swagger */ + @Value("${swagger.enabled}") + private boolean enabled; + + /** 设置请求的统一前缀 */ + @Value("${swagger.pathMapping}") + private String pathMapping; + + /** + * 创建API + */ + @Bean + public Docket createRestApi() + { + return new Docket(DocumentationType.OAS_30) + // 是否启用Swagger + .enable(enabled) + // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） + .apiInfo(apiInfo()) + // 设置哪些接口暴露给Swagger展示 + .select() + // 扫描所有有注解的api，用这种方式更灵活 + .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + // 扫描指定包中的swagger注解 + // .apis(RequestHandlerSelectors.basePackage("com.limap.project.tool.swagger")) + // 扫描所有 .apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build() + /* 设置安全模式，swagger可以设置访问token */ + .securitySchemes(securitySchemes()) + .securityContexts(securityContexts()) + .pathMapping(pathMapping); + } + + /** + * 安全模式，这里指定token通过Authorization头请求头传递 + */ + private List securitySchemes() + { + List apiKeyList = new ArrayList(); + apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); + return apiKeyList; + } + + /** + * 安全上下文 + */ + private List securityContexts() + { + List securityContexts = new ArrayList<>(); + securityContexts.add( + SecurityContext.builder() + .securityReferences(defaultAuth()) + .operationSelector(o -> o.requestMappingPattern().matches("/.*")) + .build()); + return securityContexts; + } + + /** + * 默认的安全上引用 + */ + private List defaultAuth() + { + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; + authorizationScopes[0] = authorizationScope; + List securityReferences = new ArrayList<>(); + securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); + return securityReferences; + } + + /** + * 添加摘要信息 + */ + private ApiInfo apiInfo() + { + // 用ApiInfoBuilder进行定制 + return new ApiInfoBuilder() + // 设置标题 + .title("标题：经销商管理系统") + // 描述 + .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") + // 作者信息 + .contact(new Contact(limapConfig.getName(), null, null)) + // 版本 + .version("版本号:" + limapConfig.getVersion()) + .build(); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ThreadPoolConfig.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ThreadPoolConfig.java new file mode 100644 index 0000000..b3f07db --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/ThreadPoolConfig.java @@ -0,0 +1,63 @@ +package com.limap.common.web.config; + +import com.limap.common.utils.Threads; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadPoolExecutor; + +/** + * 线程池配置 + * + * @author limap + **/ +@Configuration +public class ThreadPoolConfig +{ + // 核心线程池大小 + private int corePoolSize = 50; + + // 最大可创建的线程数 + private int maxPoolSize = 200; + + // 队列最大长度 + private int queueCapacity = 1000; + + // 线程池维护线程所允许的空闲时间 + private int keepAliveSeconds = 300; + + @Bean(name = "threadPoolTaskExecutor") + public ThreadPoolTaskExecutor threadPoolTaskExecutor() + { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setMaxPoolSize(maxPoolSize); + executor.setCorePoolSize(corePoolSize); + executor.setQueueCapacity(queueCapacity); + executor.setKeepAliveSeconds(keepAliveSeconds); + // 线程池对拒绝任务(无线程可用)的处理策略 + executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); + return executor; + } + + /** + * 执行周期性或定时任务 + */ + @Bean(name = "scheduledExecutorService") + protected ScheduledExecutorService scheduledExecutorService() + { + return new ScheduledThreadPoolExecutor(corePoolSize, + new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(), + new ThreadPoolExecutor.CallerRunsPolicy()) + { + @Override + protected void afterExecute(Runnable r, Throwable t) + { + super.afterExecute(r, t); + Threads.printException(r, t); + } + }; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/properties/CaptchaProperties.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/properties/CaptchaProperties.java new file mode 100644 index 0000000..42343dd --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/config/properties/CaptchaProperties.java @@ -0,0 +1,51 @@ +package com.limap.common.web.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import com.limap.common.enums.CaptchaEnum; + +import lombok.Data; + +/** + * 验证码配置 + * + * @author theodo + */ +@Data +@Component +@ConfigurationProperties(prefix = "captcha") +public class CaptchaProperties { + /** + * 验证码配置 + */ + private CaptchaEnum codeType; + /** + * 验证码有效期 分钟 + */ + private Long expiration = 2L; + /** + * 验证码内容长度 + */ + private int length = 2; + /** + * 验证码宽度 + */ + private int width = 111; + /** + * 验证码高度 + */ + private int height = 36; + /** + * 验证码字体 + */ + private String fontName; + /** + * 字体大小 + */ + private int fontSize = 25; + + public CaptchaEnum getCodeType() { + return codeType; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/Server.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/Server.java new file mode 100644 index 0000000..de0564b --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/Server.java @@ -0,0 +1,240 @@ +package com.limap.common.web.domain; + +import java.net.UnknownHostException; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; +import com.limap.common.utils.Arith; +import com.limap.common.utils.ip.IpUtils; +import com.limap.common.web.domain.server.Cpu; +import com.limap.common.web.domain.server.Jvm; +import com.limap.common.web.domain.server.Mem; +import com.limap.common.web.domain.server.Sys; +import com.limap.common.web.domain.server.SysFile; +import oshi.SystemInfo; +import oshi.hardware.CentralProcessor; +import oshi.hardware.CentralProcessor.TickType; +import oshi.hardware.GlobalMemory; +import oshi.hardware.HardwareAbstractionLayer; +import oshi.software.os.FileSystem; +import oshi.software.os.OSFileStore; +import oshi.software.os.OperatingSystem; +import oshi.util.Util; + +/** + * 服务器相关信息 + * + * @author limap + */ +public class Server +{ + private static final int OSHI_WAIT_SECOND = 1000; + + /** + * CPU相关信息 + */ + private Cpu cpu = new Cpu(); + + /** + * 內存相关信息 + */ + private Mem mem = new Mem(); + + /** + * JVM相关信息 + */ + private Jvm jvm = new Jvm(); + + /** + * 服务器相关信息 + */ + private Sys sys = new Sys(); + + /** + * 磁盘相关信息 + */ + private List sysFiles = new LinkedList(); + + public Cpu getCpu() + { + return cpu; + } + + public void setCpu(Cpu cpu) + { + this.cpu = cpu; + } + + public Mem getMem() + { + return mem; + } + + public void setMem(Mem mem) + { + this.mem = mem; + } + + public Jvm getJvm() + { + return jvm; + } + + public void setJvm(Jvm jvm) + { + this.jvm = jvm; + } + + public Sys getSys() + { + return sys; + } + + public void setSys(Sys sys) + { + this.sys = sys; + } + + public List getSysFiles() + { + return sysFiles; + } + + public void setSysFiles(List sysFiles) + { + this.sysFiles = sysFiles; + } + + public void copyTo() throws Exception + { + SystemInfo si = new SystemInfo(); + HardwareAbstractionLayer hal = si.getHardware(); + + setCpuInfo(hal.getProcessor()); + + setMemInfo(hal.getMemory()); + + setSysInfo(); + + setJvmInfo(); + + setSysFiles(si.getOperatingSystem()); + } + + /** + * 设置CPU信息 + */ + private void setCpuInfo(CentralProcessor processor) + { + // CPU信息 + long[] prevTicks = processor.getSystemCpuLoadTicks(); + Util.sleep(OSHI_WAIT_SECOND); + long[] ticks = processor.getSystemCpuLoadTicks(); + long nice = ticks[TickType.NICE.getIndex()] - prevTicks[TickType.NICE.getIndex()]; + long irq = ticks[TickType.IRQ.getIndex()] - prevTicks[TickType.IRQ.getIndex()]; + long softirq = ticks[TickType.SOFTIRQ.getIndex()] - prevTicks[TickType.SOFTIRQ.getIndex()]; + long steal = ticks[TickType.STEAL.getIndex()] - prevTicks[TickType.STEAL.getIndex()]; + long cSys = ticks[TickType.SYSTEM.getIndex()] - prevTicks[TickType.SYSTEM.getIndex()]; + long user = ticks[TickType.USER.getIndex()] - prevTicks[TickType.USER.getIndex()]; + long iowait = ticks[TickType.IOWAIT.getIndex()] - prevTicks[TickType.IOWAIT.getIndex()]; + long idle = ticks[TickType.IDLE.getIndex()] - prevTicks[TickType.IDLE.getIndex()]; + long totalCpu = user + nice + cSys + idle + iowait + irq + softirq + steal; + cpu.setCpuNum(processor.getLogicalProcessorCount()); + cpu.setTotal(totalCpu); + cpu.setSys(cSys); + cpu.setUsed(user); + cpu.setWait(iowait); + cpu.setFree(idle); + } + + /** + * 设置内存信息 + */ + private void setMemInfo(GlobalMemory memory) + { + mem.setTotal(memory.getTotal()); + mem.setUsed(memory.getTotal() - memory.getAvailable()); + mem.setFree(memory.getAvailable()); + } + + /** + * 设置服务器信息 + */ + private void setSysInfo() + { + Properties props = System.getProperties(); + sys.setComputerName(IpUtils.getHostName()); + sys.setComputerIp(IpUtils.getHostIp()); + sys.setOsName(props.getProperty("os.name")); + sys.setOsArch(props.getProperty("os.arch")); + sys.setUserDir(props.getProperty("user.dir")); + } + + /** + * 设置Java虚拟机 + */ + private void setJvmInfo() throws UnknownHostException + { + Properties props = System.getProperties(); + jvm.setTotal(Runtime.getRuntime().totalMemory()); + jvm.setMax(Runtime.getRuntime().maxMemory()); + jvm.setFree(Runtime.getRuntime().freeMemory()); + jvm.setVersion(props.getProperty("java.version")); + jvm.setHome(props.getProperty("java.home")); + } + + /** + * 设置磁盘信息 + */ + private void setSysFiles(OperatingSystem os) + { + FileSystem fileSystem = os.getFileSystem(); + List fsArray = fileSystem.getFileStores(); + for (OSFileStore fs : fsArray) + { + long free = fs.getUsableSpace(); + long total = fs.getTotalSpace(); + long used = total - free; + SysFile sysFile = new SysFile(); + sysFile.setDirName(fs.getMount()); + sysFile.setSysTypeName(fs.getType()); + sysFile.setTypeName(fs.getName()); + sysFile.setTotal(convertFileSize(total)); + sysFile.setFree(convertFileSize(free)); + sysFile.setUsed(convertFileSize(used)); + sysFile.setUsage(Arith.mul(Arith.div(used, total, 4), 100)); + sysFiles.add(sysFile); + } + } + + /** + * 字节转换 + * + * @param size 字节大小 + * @return 转换后值 + */ + public String convertFileSize(long size) + { + long kb = 1024; + long mb = kb * 1024; + long gb = mb * 1024; + if (size >= gb) + { + return String.format("%.1f GB", (float) size / gb); + } + else if (size >= mb) + { + float f = (float) size / mb; + return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f); + } + else if (size >= kb) + { + float f = (float) size / kb; + return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f); + } + else + { + return String.format("%d B", size); + } + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Cpu.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Cpu.java new file mode 100644 index 0000000..bbd82dc --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Cpu.java @@ -0,0 +1,101 @@ +package com.limap.common.web.domain.server; + +import com.limap.common.utils.Arith; + +/** + * CPU相关信息 + * + * @author limap + */ +public class Cpu +{ + /** + * 核心数 + */ + private int cpuNum; + + /** + * CPU总的使用率 + */ + private double total; + + /** + * CPU系统使用率 + */ + private double sys; + + /** + * CPU用户使用率 + */ + private double used; + + /** + * CPU当前等待率 + */ + private double wait; + + /** + * CPU当前空闲率 + */ + private double free; + + public int getCpuNum() + { + return cpuNum; + } + + public void setCpuNum(int cpuNum) + { + this.cpuNum = cpuNum; + } + + public double getTotal() + { + return Arith.round(Arith.mul(total, 100), 2); + } + + public void setTotal(double total) + { + this.total = total; + } + + public double getSys() + { + return Arith.round(Arith.mul(sys / total, 100), 2); + } + + public void setSys(double sys) + { + this.sys = sys; + } + + public double getUsed() + { + return Arith.round(Arith.mul(used / total, 100), 2); + } + + public void setUsed(double used) + { + this.used = used; + } + + public double getWait() + { + return Arith.round(Arith.mul(wait / total, 100), 2); + } + + public void setWait(double wait) + { + this.wait = wait; + } + + public double getFree() + { + return Arith.round(Arith.mul(free / total, 100), 2); + } + + public void setFree(double free) + { + this.free = free; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Jvm.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Jvm.java new file mode 100644 index 0000000..4844d98 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Jvm.java @@ -0,0 +1,130 @@ +package com.limap.common.web.domain.server; + +import java.lang.management.ManagementFactory; +import com.limap.common.utils.Arith; +import com.limap.common.utils.DateUtils; + +/** + * JVM相关信息 + * + * @author limap + */ +public class Jvm +{ + /** + * 当前JVM占用的内存总数(M) + */ + private double total; + + /** + * JVM最大可用内存总数(M) + */ + private double max; + + /** + * JVM空闲内存(M) + */ + private double free; + + /** + * JDK版本 + */ + private String version; + + /** + * JDK路径 + */ + private String home; + + public double getTotal() + { + return Arith.div(total, (1024 * 1024), 2); + } + + public void setTotal(double total) + { + this.total = total; + } + + public double getMax() + { + return Arith.div(max, (1024 * 1024), 2); + } + + public void setMax(double max) + { + this.max = max; + } + + public double getFree() + { + return Arith.div(free, (1024 * 1024), 2); + } + + public void setFree(double free) + { + this.free = free; + } + + public double getUsed() + { + return Arith.div(total - free, (1024 * 1024), 2); + } + + public double getUsage() + { + return Arith.mul(Arith.div(total - free, total, 4), 100); + } + + /** + * 获取JDK名称 + */ + public String getName() + { + return ManagementFactory.getRuntimeMXBean().getVmName(); + } + + public String getVersion() + { + return version; + } + + public void setVersion(String version) + { + this.version = version; + } + + public String getHome() + { + return home; + } + + public void setHome(String home) + { + this.home = home; + } + + /** + * JDK启动时间 + */ + public String getStartTime() + { + return DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.getServerStartDate()); + } + + /** + * JDK运行时间 + */ + public String getRunTime() + { + return DateUtils.timeDistance(DateUtils.getNowDate(), DateUtils.getServerStartDate()); + } + + /** + * 运行参数 + */ + public String getInputArgs() + { + return ManagementFactory.getRuntimeMXBean().getInputArguments().toString(); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Mem.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Mem.java new file mode 100644 index 0000000..b287c07 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Mem.java @@ -0,0 +1,61 @@ +package com.limap.common.web.domain.server; + +import com.limap.common.utils.Arith; + +/** + * 內存相关信息 + * + * @author limap + */ +public class Mem +{ + /** + * 内存总量 + */ + private double total; + + /** + * 已用内存 + */ + private double used; + + /** + * 剩余内存 + */ + private double free; + + public double getTotal() + { + return Arith.div(total, (1024 * 1024 * 1024), 2); + } + + public void setTotal(long total) + { + this.total = total; + } + + public double getUsed() + { + return Arith.div(used, (1024 * 1024 * 1024), 2); + } + + public void setUsed(long used) + { + this.used = used; + } + + public double getFree() + { + return Arith.div(free, (1024 * 1024 * 1024), 2); + } + + public void setFree(long free) + { + this.free = free; + } + + public double getUsage() + { + return Arith.mul(Arith.div(used, total, 4), 100); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Sys.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Sys.java new file mode 100644 index 0000000..384a543 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/Sys.java @@ -0,0 +1,84 @@ +package com.limap.common.web.domain.server; + +/** + * 系统相关信息 + * + * @author limap + */ +public class Sys +{ + /** + * 服务器名称 + */ + private String computerName; + + /** + * 服务器Ip + */ + private String computerIp; + + /** + * 项目路径 + */ + private String userDir; + + /** + * 操作系统 + */ + private String osName; + + /** + * 系统架构 + */ + private String osArch; + + public String getComputerName() + { + return computerName; + } + + public void setComputerName(String computerName) + { + this.computerName = computerName; + } + + public String getComputerIp() + { + return computerIp; + } + + public void setComputerIp(String computerIp) + { + this.computerIp = computerIp; + } + + public String getUserDir() + { + return userDir; + } + + public void setUserDir(String userDir) + { + this.userDir = userDir; + } + + public String getOsName() + { + return osName; + } + + public void setOsName(String osName) + { + this.osName = osName; + } + + public String getOsArch() + { + return osArch; + } + + public void setOsArch(String osArch) + { + this.osArch = osArch; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/SysFile.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/SysFile.java new file mode 100644 index 0000000..2a70f8a --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/domain/server/SysFile.java @@ -0,0 +1,114 @@ +package com.limap.common.web.domain.server; + +/** + * 系统文件相关信息 + * + * @author limap + */ +public class SysFile +{ + /** + * 盘符路径 + */ + private String dirName; + + /** + * 盘符类型 + */ + private String sysTypeName; + + /** + * 文件类型 + */ + private String typeName; + + /** + * 总大小 + */ + private String total; + + /** + * 剩余大小 + */ + private String free; + + /** + * 已经使用量 + */ + private String used; + + /** + * 资源的使用率 + */ + private double usage; + + public String getDirName() + { + return dirName; + } + + public void setDirName(String dirName) + { + this.dirName = dirName; + } + + public String getSysTypeName() + { + return sysTypeName; + } + + public void setSysTypeName(String sysTypeName) + { + this.sysTypeName = sysTypeName; + } + + public String getTypeName() + { + return typeName; + } + + public void setTypeName(String typeName) + { + this.typeName = typeName; + } + + public String getTotal() + { + return total; + } + + public void setTotal(String total) + { + this.total = total; + } + + public String getFree() + { + return free; + } + + public void setFree(String free) + { + this.free = free; + } + + public String getUsed() + { + return used; + } + + public void setUsed(String used) + { + this.used = used; + } + + public double getUsage() + { + return usage; + } + + public void setUsage(double usage) + { + this.usage = usage; + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/exception/GlobalExceptionHandler.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..716045d --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/exception/GlobalExceptionHandler.java @@ -0,0 +1,114 @@ +package com.limap.common.web.exception; + +import javax.servlet.http.HttpServletRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.validation.BindException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import com.limap.common.constant.HttpStatus; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.exception.DemoModeException; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; + +/** + * 全局异常处理器 + * + * @author limap + */ +@RestControllerAdvice +public class GlobalExceptionHandler +{ + private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + /** + * 权限校验异常 + */ + @ExceptionHandler(AccessDeniedException.class) + public AjaxResult handleAccessDeniedException(AccessDeniedException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',权限校验失败'{}'", requestURI, e.getMessage()); + return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权"); + } + + /** + * 请求方式不支持 + */ + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e, + HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod()); + return AjaxResult.error(e.getMessage()); + } + + /** + * 业务异常 + */ + @ExceptionHandler(ServiceException.class) + public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request) + { + log.error(e.getMessage(), e); + Integer code = e.getCode(); + return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage()); + } + + /** + * 拦截未知的运行时异常 + */ + @ExceptionHandler(RuntimeException.class) + public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',发生未知异常.", requestURI, e); + return AjaxResult.error(e.getMessage()); + } + + /** + * 系统异常 + */ + @ExceptionHandler(Exception.class) + public AjaxResult handleException(Exception e, HttpServletRequest request) + { + String requestURI = request.getRequestURI(); + log.error("请求地址'{}',发生系统异常.", requestURI, e); + return AjaxResult.error(e.getMessage()); + } + + /** + * 自定义验证异常 + */ + @ExceptionHandler(BindException.class) + public AjaxResult handleBindException(BindException e) + { + log.error(e.getMessage(), e); + String message = e.getAllErrors().get(0).getDefaultMessage(); + return AjaxResult.error(message); + } + + /** + * 自定义验证异常 + */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e) + { + log.error(e.getMessage(), e); + String message = e.getBindingResult().getFieldError().getDefaultMessage(); + return AjaxResult.error(message); + } + + /** + * 演示模式异常 + */ + @ExceptionHandler(DemoModeException.class) + public AjaxResult handleDemoModeException(DemoModeException e) + { + return AjaxResult.error("演示模式，不允许操作"); + } +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/RepeatSubmitInterceptor.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/RepeatSubmitInterceptor.java new file mode 100644 index 0000000..3948d6d --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/RepeatSubmitInterceptor.java @@ -0,0 +1,55 @@ +package com.limap.common.web.interceptor; + +import java.lang.reflect.Method; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; +import com.alibaba.fastjson2.JSON; +import com.limap.common.annotation.RepeatSubmit; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.utils.ServletUtils; + +/** + * 防止重复提交拦截器 + * + * @author limap + */ +@Component +public abstract class RepeatSubmitInterceptor implements HandlerInterceptor +{ + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception + { + if (handler instanceof HandlerMethod) + { + HandlerMethod handlerMethod = (HandlerMethod) handler; + Method method = handlerMethod.getMethod(); + RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class); + if (annotation != null) + { + if (this.isRepeatSubmit(request, annotation)) + { + AjaxResult ajaxResult = AjaxResult.error(annotation.message()); + ServletUtils.renderString(response, JSON.toJSONString(ajaxResult)); + return false; + } + } + return true; + } + else + { + return true; + } + } + + /** + * 验证是否重复提交由子类实现具体的防重复提交的规则 + * + * @param request + * @return + * @throws Exception + */ + public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation); +} diff --git a/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/impl/SameUrlDataInterceptor.java b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/impl/SameUrlDataInterceptor.java new file mode 100644 index 0000000..9bde9b1 --- /dev/null +++ b/fishery-common/fishery-common-web/src/main/java/com/limap/common/web/interceptor/impl/SameUrlDataInterceptor.java @@ -0,0 +1,110 @@ +package com.limap.common.web.interceptor.impl; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import javax.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import com.alibaba.fastjson2.JSON; +import com.limap.common.annotation.RepeatSubmit; +import com.limap.common.constant.CacheConstants; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.filter.RepeatedlyRequestWrapper; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.http.HttpHelper; +import com.limap.common.web.interceptor.RepeatSubmitInterceptor; + +/** + * 判断请求url和数据是否和上一次相同， + * 如果和上次相同，则是重复提交表单。 有效时间为10秒内。 + * + * @author limap + */ +@Component +public class SameUrlDataInterceptor extends RepeatSubmitInterceptor +{ + public final String REPEAT_PARAMS = "repeatParams"; + + public final String REPEAT_TIME = "repeatTime"; + + // 令牌自定义标识 + @Value("${token.header}") + private String header; + + @Autowired + private RedisCache redisCache; + + @SuppressWarnings("unchecked") + @Override + public boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation) + { + String nowParams = ""; + if (request instanceof RepeatedlyRequestWrapper) + { + RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request; + nowParams = HttpHelper.getBodyString(repeatedlyRequest); + } + + // body参数为空，获取Parameter的数据 + if (StringUtils.isEmpty(nowParams)) + { + nowParams = JSON.toJSONString(request.getParameterMap()); + } + Map nowDataMap = new HashMap(); + nowDataMap.put(REPEAT_PARAMS, nowParams); + nowDataMap.put(REPEAT_TIME, System.currentTimeMillis()); + + // 请求地址（作为存放cache的key值） + String url = request.getRequestURI(); + + // 唯一值（没有消息头则使用请求地址） + String submitKey = StringUtils.trimToEmpty(request.getHeader(header)); + + // 唯一标识（指定key + url + 消息头） + String cacheRepeatKey = CacheConstants.REPEAT_SUBMIT_KEY + url + submitKey; + + Object sessionObj = redisCache.getCacheObject(cacheRepeatKey); + if (sessionObj != null) + { + Map sessionMap = (Map) sessionObj; + if (sessionMap.containsKey(url)) + { + Map preDataMap = (Map) sessionMap.get(url); + if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap, annotation.interval())) + { + return true; + } + } + } + Map cacheMap = new HashMap(); + cacheMap.put(url, nowDataMap); + redisCache.setCacheObject(cacheRepeatKey, cacheMap, annotation.interval(), TimeUnit.MILLISECONDS); + return false; + } + + /** + * 判断参数是否相同 + */ + private boolean compareParams(Map nowMap, Map preMap) + { + String nowParams = (String) nowMap.get(REPEAT_PARAMS); + String preParams = (String) preMap.get(REPEAT_PARAMS); + return nowParams.equals(preParams); + } + + /** + * 判断两次间隔时间 + */ + private boolean compareTime(Map nowMap, Map preMap, int interval) + { + long time1 = (Long) nowMap.get(REPEAT_TIME); + long time2 = (Long) preMap.get(REPEAT_TIME); + if ((time1 - time2) < interval) + { + return true; + } + return false; + } +} diff --git a/fishery-common/pom.xml b/fishery-common/pom.xml new file mode 100644 index 0000000..811d939 --- /dev/null +++ b/fishery-common/pom.xml @@ -0,0 +1,23 @@ + + 4.0.0 + + com.limap + fishery_base + 3.8.5 + + fishery-common + pom + 通用模块 + + + fishery-common-api + fishery-common-core + fishery-common-mybatis + fishery-common-security + fishery-common-web + fishery-common-log + + + \ No newline at end of file diff --git a/fishery-core/pom.xml b/fishery-core/pom.xml new file mode 100644 index 0000000..c048ad5 --- /dev/null +++ b/fishery-core/pom.xml @@ -0,0 +1,55 @@ + + + + fishery_base + com.limap + 3.8.5 + + 4.0.0 + + fishery-core + + + system系统模块 + + + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-security + + + + com.limap + fishery-common-api + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + com.limap + fishery-system + + + + + com.aliyun + aliyun-java-sdk-dyvmsapi + 3.2.0 + + + + \ No newline at end of file diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/AquDevice.java b/fishery-core/src/main/java/com/limap/core/basic/domain/AquDevice.java new file mode 100644 index 0000000..ed83c81 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/AquDevice.java @@ -0,0 +1,45 @@ +package com.limap.core.basic.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@TableName("aqu_device") +@Data +public class AquDevice implements Serializable { + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @TableField(value = "iot_id") + private String iotId; + + @TableField(value = "value_dissolved_oxygen") + private Double valueDissolvedOxygen; + + @TableField(value = "value_temperature") + private Double valueTemperature; + + @TableField(value = "value_saturability") + private Double valueSaturability; + + @TableField(value = "value_salinity") + private Double valueSalinity; + + @TableField(value = "phase_difference") + private Double phasedifference; + + @TableField(value = "tfluorescence") + private Double tfluorescence; + + @TableField(value = "treference") + private Double treference; + + @TableField(value = "value_ph") + private Double valuePH; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/AquDeviceDataHistory.java b/fishery-core/src/main/java/com/limap/core/basic/domain/AquDeviceDataHistory.java new file mode 100644 index 0000000..40dbc18 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/AquDeviceDataHistory.java @@ -0,0 +1,49 @@ +package com.limap.core.basic.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@TableName("aqu_device_data_history") +@Data +public class AquDeviceDataHistory implements Serializable { + + @TableId(value = "Id",type = IdType.AUTO) + private Long id; + + @TableField(value = "DeviceId") + private Long deviceId; + + @TableField(value = "ValueDissolvedOxygen") + private Double valueDissolvedOxygen; + + @TableField(value = "ValueTemperature") + private Double valueTemperature; + + @TableField(value = "ValueSaturability") + private Double valueSaturability; + + @TableField(value = "ValueSalinity") + private Double valueSalinity; + + @TableField(value = "ValuePH") + private Double valuePH; + + @TableField(value = "Phasedifference") + private Double phasedifference; + + @TableField(value = "Tfluorescence") + private Double tfluorescence; + + @TableField(value = "Treference") + private Double treference; + + @TableField(value = "CreatedTime") + private Date createdTime; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayDevice.java b/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayDevice.java new file mode 100644 index 0000000..f010973 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayDevice.java @@ -0,0 +1,45 @@ +package com.limap.core.basic.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 支付订单对象 aqu_pay_order + * @author jjb + */ +@TableName("aqu_pay_device") +@Data +public class AquPayDevice { + + @TableField(value = "id") + private Long id; + + @TableField(value = "user_id") + private Long userId; + + @TableField(value = "pay_amount") + private Integer payAmount; + + @TableField(value = "pay_type") + private Integer payType; + + @TableField(value = "create_time") + private Date createdTime; + + @TableField(value = "device_type") + private Integer deviceType; + + @TableField(value = "serial_num") + private String serialNum; + + @TableField(value = "order_id") + private Long orderId; + + @TableField(value = "profit_status") + private Integer profitStatus; + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayOrder.java b/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayOrder.java new file mode 100644 index 0000000..2db4791 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/AquPayOrder.java @@ -0,0 +1,44 @@ +package com.limap.core.basic.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 支付订单对象 aqu_pay_order + * @author jjb + */ +@TableName("aqu_pay_order") +@Data +public class AquPayOrder { + + @TableField(value = "id") + private Long id; + + @TableField(value = "user_id") + private Long userId; + + @TableField(value = "total_amount") + private Integer totalAmount; + + @TableField(value = "payer_total") + private Integer payerTotal; + + @TableField(value = "create_time") + private Date createdTime; + + @TableField(value = "description") + private String description; + + @TableField(value = "ison_device_serial_num") + private String jsonDeviceSerialNum; + + @TableField(value = "order_status") + private Integer orderStatus; + + @TableField(value = "profit_status") + private Integer profitStatus; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicEquipmentPrice.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicEquipmentPrice.java new file mode 100644 index 0000000..5ccffcc --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicEquipmentPrice.java @@ -0,0 +1,58 @@ +package com.limap.core.basic.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 设备基础价格信息对象 basic_equipment_price + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "basic_equipment_price") +public class BasicEquipmentPrice extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** 设备名称 */ + @Excel(name = "设备名称") + @ApiModelProperty("设备名称") + private String name; + + /** 分润级别 */ + @Excel(name = "分润级别") + @ApiModelProperty("分润级别") + private String sharingCode; + + /** 销售价格 */ + @Excel(name = "销售价格") + @ApiModelProperty("销售价格") + private BigDecimal sellingPrice; + + /** 经销商价格 */ + @Excel(name = "经销商价格") + @ApiModelProperty("经销商价格") + private BigDecimal dealerPrice; + + /** 设备编码 */ + @Excel(name = "设备编码") + @ApiModelProperty("设备编码") + private String productKey; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharing.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharing.java new file mode 100644 index 0000000..7912463 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharing.java @@ -0,0 +1,52 @@ +package com.limap.core.basic.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 基础分润信息对象 basic_profit_sharing + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "basic_profit_sharing") +public class BasicProfitSharing extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 等级名称 */ + @Excel(name = "等级名称") + @ApiModelProperty("等级名称") + private String name; + + /** 编码 */ + @Excel(name = "编码") + @ApiModelProperty("编码") + private String code; + + /** 分润比例 */ + @Excel(name = "测氧仪分润比例") + @ApiModelProperty("测氧仪分润比例") + private BigDecimal omRatio; + + @Excel(name = "控制器分润比例") + @ApiModelProperty("控制器分润比例") + private BigDecimal controlRatio; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingRecord.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingRecord.java new file mode 100644 index 0000000..4f1bae0 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingRecord.java @@ -0,0 +1,112 @@ +package com.limap.core.basic.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 分润记录对象 basic_profit_sharing_record + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@TableName(value = "basic_profit_sharing_record") +public class BasicProfitSharingRecord { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Integer id; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + private Long deptId; + private String userName; + + /** 分润金额 */ + @Excel(name = "分润金额") + @ApiModelProperty("分润金额") + private BigDecimal amount; + + /** 金额来源 */ + @Excel(name = "金额来源") + @ApiModelProperty("金额来源") + private String fromWay; + private String title; + private String tel; + + /** 分润状态 0未 1 以分 9无效 */ + @Excel(name = "分润状态 0未 1 以分 9无效") + @ApiModelProperty("分润状态 0未 1 以分 9无效") + private Integer status; + + /** 利益产生时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "利益产生时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("利益产生时间") + private Date generateTime; + + /** 原始订单号 */ + @Excel(name = "原始订单号") + @ApiModelProperty("原始订单号") + private String orderNo; + private String deviceName; + + /** 提现状态 0 未 1已 */ + @Excel(name = "提现状态 0 未 1已") + @ApiModelProperty("提现状态 0 未 1已") + private Integer withdrawalStatus; + + /** 提现申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提现申请时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提现申请时间") + private Date withdrawalTime; + + /** 打款状态 0 未 1已 9驳回 */ + @Excel(name = "打款状态 0 未 1已 9驳回") + @ApiModelProperty("打款状态 0 未 1已 9驳回") + private Integer paymentStatus; + + /** 打款时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "打款时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("打款时间") + private Date paymentTime; + + /** 驳回原因 */ + @Excel(name = "驳回原因") + @ApiModelProperty("驳回原因") + private String paymentReason; + + /** 提现id */ + @Excel(name = "提现id") + @ApiModelProperty("提现id") + private Long withdrawId; + + + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("查询开始时间") + @TableField(exist = false) + private Date startTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("查询结束时间") + @TableField(exist = false) + private Date endTime; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingUser.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingUser.java new file mode 100644 index 0000000..934db24 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicProfitSharingUser.java @@ -0,0 +1,69 @@ +package com.limap.core.basic.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户分润基础信息对象 basic_profit_sharing_user + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "basic_profit_sharing_user") +public class BasicProfitSharingUser extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + + /** 分润级别 */ + @Excel(name = "分润级别") + @ApiModelProperty("分润级别") + private String sharingCode; + + /** 分润比例 */ + @Excel(name = "分润比例") + @ApiModelProperty("分润比例") + private BigDecimal omRatio; + + @ApiModelProperty("控制器比例") + private BigDecimal controlRatio; + + @ApiModelProperty("公司名称") + private String company; + + /** 银行卡开户行 */ + @Excel(name = "银行卡开户行") + @ApiModelProperty("银行卡开户行") + private String bank; + + /** 银行卡号 */ + @Excel(name = "银行卡号") + @ApiModelProperty("银行卡号") + private String bankNumber; + + /** 姓名 */ + @Excel(name = "姓名") + @ApiModelProperty("姓名") + private String name; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserBindInfo.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserBindInfo.java new file mode 100644 index 0000000..7fb1f45 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserBindInfo.java @@ -0,0 +1,78 @@ +package com.limap.core.basic.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户设备绑定信息对象 basic_user_bind_info + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "basic_user_bind_info") +public class BasicUserBindInfo extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + + private String userName; + + private Long deviceId; + + /** 设备编号 */ + @Excel(name = "设备编号") + @ApiModelProperty("设备编号") + private String deviceName; + + /** 产品key */ + @Excel(name = "产品key") + @ApiModelProperty("产品key") + private String productKey; + + /** 阿里云唯一编号 */ + @Excel(name = "阿里云唯一编号") + @ApiModelProperty("阿里云唯一编号") + private String iotId; + + /** 设备类型 */ + @Excel(name = "设备类型") + @ApiModelProperty("设备类型") + private String type; + + /** 设备绑定时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "设备绑定时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("设备绑定时间") + private Date bindTime; + + /** 设备分润状态 1 分润 0不分 2已分 */ + @Excel(name = "设备分润状态 1 分润 0不分 2已分") + @ApiModelProperty("设备分润状态 1 分润 0不分 2已分") + private Integer profitStatus; + private String appUserName; + + private String appUser; + private String appUserTel; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserWithdraw.java b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserWithdraw.java new file mode 100644 index 0000000..cc7889d --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/BasicUserWithdraw.java @@ -0,0 +1,90 @@ +package com.limap.core.basic.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import com.limap.common.core.domain.BasePlusEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 提现记录对象 basic_user_withdraw + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "basic_user_withdraw") +public class BasicUserWithdraw extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + @ApiModelProperty("用户id") + private Long userId; + private String nickName; + private String tel; + + /** 提现记录标题 */ + @Excel(name = "提现记录标题") + @ApiModelProperty("提现记录标题") + private String title; + + /** 提现开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提现开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("提现开始时间") + private Date withdrawTime; + + /** 提现总金额 */ + @Excel(name = "提现总金额") + @ApiModelProperty("提现总金额") + private BigDecimal totalAmount; + + /** 银行卡开户行 */ + @Excel(name = "银行卡开户行") + @ApiModelProperty("银行卡开户行") + private String bank; + + /** 银行卡号 */ + @Excel(name = "银行卡号") + @ApiModelProperty("银行卡号") + private String bankNumber; + + /** 姓名 */ + @Excel(name = "姓名") + @ApiModelProperty("姓名") + private String name; + + + @ApiModelProperty("打款金额") + private BigDecimal paymentAmount; + + @ApiModelProperty("打款状态") + private String paymentStatus; + + @ApiModelProperty("打款时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date paymentTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date startTime; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date endTime; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/domain/SysCellNumber.java b/fishery-core/src/main/java/com/limap/core/basic/domain/SysCellNumber.java new file mode 100644 index 0000000..414dd28 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/domain/SysCellNumber.java @@ -0,0 +1,42 @@ +package com.limap.core.basic.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BasePlusEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 提现记录对象 basic_user_withdraw + * + * @author jjb + * @date 2025-04-11 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "sys_cell_number") +public class SysCellNumber extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 用户id */ + @Excel(name = "号码") + @ApiModelProperty("号码") + private String tel; + + + private Boolean isUse; + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceDataHistoryMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceDataHistoryMapper.java new file mode 100644 index 0000000..b25c0f5 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceDataHistoryMapper.java @@ -0,0 +1,18 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.AquDeviceDataHistory; +import org.apache.ibatis.annotations.Mapper; + +/** + * 分润记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +@Mapper +public interface AquDeviceDataHistoryMapper extends BaseMapper { + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceMapper.java new file mode 100644 index 0000000..947a446 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquDeviceMapper.java @@ -0,0 +1,22 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 分润记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +@Mapper +public interface AquDeviceMapper extends BaseMapper { + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/AquPayOrderMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquPayOrderMapper.java new file mode 100644 index 0000000..09e8e7b --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/AquPayOrderMapper.java @@ -0,0 +1,26 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 分润记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +@Mapper +public interface AquPayOrderMapper extends BaseMapper { + + List selectInfoByHour(Integer hour); + + void updatePayDeviceStatus(@Param("list") List list); + + void dealRechargeWarnCode(); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicEquipmentPriceMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicEquipmentPriceMapper.java new file mode 100644 index 0000000..8a7875b --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicEquipmentPriceMapper.java @@ -0,0 +1,13 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicEquipmentPrice; + +/** + * 设备基础价格信息Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicEquipmentPriceMapper extends BaseMapper { +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingMapper.java new file mode 100644 index 0000000..750df8f --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingMapper.java @@ -0,0 +1,13 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicProfitSharing; + +/** + * 基础分润信息Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicProfitSharingMapper extends BaseMapper { +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingRecordMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingRecordMapper.java new file mode 100644 index 0000000..dd4b0e6 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingRecordMapper.java @@ -0,0 +1,18 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import com.limap.core.basic.vo.SharingRecordSearchVo; + +import java.util.Map; + +/** + * 分润记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicProfitSharingRecordMapper extends BaseMapper { + + Map getReportData(SharingRecordSearchVo searchVo); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingUserMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingUserMapper.java new file mode 100644 index 0000000..01b2494 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicProfitSharingUserMapper.java @@ -0,0 +1,19 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicProfitSharingUser; +import com.limap.core.basic.vo.SharingUserTaskVo; + +import java.util.List; + +/** + * 用户分润基础信息Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicProfitSharingUserMapper extends BaseMapper { + + List selectBasicInfoList(); + List selectCacheList(); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserBindInfoMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserBindInfoMapper.java new file mode 100644 index 0000000..05227fc --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserBindInfoMapper.java @@ -0,0 +1,21 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.screen.vo.ControlSwitch; + +import java.util.List; + +/** + * 用户设备绑定信息Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicUserBindInfoMapper extends BaseMapper { + + List selectBasicUserBindInfoList(BasicUserBindInfo basicUserBindInfo); + List selectAppUserInfo(BasicUserBindInfo basicUserBindInfo); + + List getcControlInfo(String deviceName); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserWithdrawMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserWithdrawMapper.java new file mode 100644 index 0000000..cecc585 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/BasicUserWithdrawMapper.java @@ -0,0 +1,13 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.BasicUserWithdraw; + +/** + * 提现记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface BasicUserWithdrawMapper extends BaseMapper { +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/mapper/SysCellNumberMapper.java b/fishery-core/src/main/java/com/limap/core/basic/mapper/SysCellNumberMapper.java new file mode 100644 index 0000000..6c2b1f7 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/mapper/SysCellNumberMapper.java @@ -0,0 +1,17 @@ +package com.limap.core.basic.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.core.basic.domain.SysCellNumber; +import org.apache.ibatis.annotations.Mapper; + +/** + * 分润记录Mapper接口 + * + * @author jjb + * @date 2025-04-11 + */ +@Mapper +public interface SysCellNumberMapper extends BaseMapper { + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceDataHistoryService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceDataHistoryService.java new file mode 100644 index 0000000..2ab101b --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceDataHistoryService.java @@ -0,0 +1,17 @@ +package com.limap.core.basic.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.AquDeviceDataHistory; + + +/** + * + * @author jjb + * @date 2025-04-11 + */ +public interface IAquDeviceDataHistoryService extends IService { + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceService.java new file mode 100644 index 0000000..db69c04 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IAquDeviceService.java @@ -0,0 +1,19 @@ +package com.limap.core.basic.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.AquDevice; + + +/** + * + * @author jjb + * @date 2025-04-11 + */ +public interface IAquDeviceService extends IService { + + + AquDevice getInfoByIotId(String iotId); + + void dealNowAndHistoryData(AquDevice aquDevice, JSONObject data); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IAquPayOrderService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IAquPayOrderService.java new file mode 100644 index 0000000..ca8836d --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IAquPayOrderService.java @@ -0,0 +1,30 @@ +package com.limap.core.basic.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; + + +import java.util.List; + +/** + * + * @author jjb + * @date 2025-04-11 + */ +public interface IAquPayOrderService extends IService { + + /** + * 查询指定小时内的支付订单 + * @param hour 小时内的订单 + * @return 支付订单列表 + */ + List selectByHour(Integer hour); + + + List selectInfoByHour(Integer hour); + + void updatePayDeviceStatus(List list); + + void dealRechargeWarnCode(); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicEquipmentPriceService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicEquipmentPriceService.java new file mode 100644 index 0000000..913623f --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicEquipmentPriceService.java @@ -0,0 +1,21 @@ +package com.limap.core.basic.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.BasicEquipmentPrice; + +/** + * 设备基础价格信息Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicEquipmentPriceService extends IService { + /** + * 查询设备基础价格信息列表 + * + * @param basicEquipmentPrice 设备基础价格信息 + * @return 设备基础价格信息集合 + */ + public List selectBasicEquipmentPriceList(BasicEquipmentPrice basicEquipmentPrice); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingRecordService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingRecordService.java new file mode 100644 index 0000000..f007db3 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingRecordService.java @@ -0,0 +1,47 @@ +package com.limap.core.basic.service; + +import java.util.List; +import java.util.Map; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.common.core.domain.AjaxResult; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.basic.vo.BasicUserWithdrawVo; +import com.limap.core.basic.vo.SharingRecordSearchVo; +import com.limap.core.basic.vo.SharingUserTaskVo; + +/** + * 分润记录Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicProfitSharingRecordService extends IService { + /** + * 查询分润记录列表 + * + * @param basicProfitSharingRecord 分润记录 + * @return 分润记录集合 + */ + public List selectBasicProfitSharingRecordList(BasicProfitSharingRecord basicProfitSharingRecord); + + /** + * 处理分润计算 + * @param aquPayOrder + * @param basicUserBindInfo + * @param sharingUserTaskVo + * @return + */ + BasicProfitSharingRecord calculateProfit(AquPayDevice aquPayOrder, SharingUserTaskVo sharingUserTaskVo); + + Map getReportData(SharingRecordSearchVo searchVo); + + List selectRecordByWithdraw(BasicUserWithdrawVo basicUserWithdraw); + + void updateRecordByWithdraw(BasicUserWithdrawVo basicUserWithdraw); + + AjaxResult dealRefund(BasicProfitSharingRecord basicProfitSharingRecord); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingService.java new file mode 100644 index 0000000..bf177d4 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingService.java @@ -0,0 +1,21 @@ +package com.limap.core.basic.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.BasicProfitSharing; + +/** + * 基础分润信息Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicProfitSharingService extends IService { + /** + * 查询基础分润信息列表 + * + * @param basicProfitSharing 基础分润信息 + * @return 基础分润信息集合 + */ + public List selectBasicProfitSharingList(BasicProfitSharing basicProfitSharing); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingUserService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingUserService.java new file mode 100644 index 0000000..a66e18f --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicProfitSharingUserService.java @@ -0,0 +1,35 @@ +package com.limap.core.basic.service; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.BasicProfitSharingUser; +import com.limap.core.basic.vo.SharingUserTaskVo; + +/** + * 用户分润基础信息Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicProfitSharingUserService extends IService { + /** + * 查询用户分润基础信息列表 + * + * @param basicProfitSharingUser 用户分润基础信息 + * @return 用户分润基础信息集合 + */ + public List selectBasicProfitSharingUserList(BasicProfitSharingUser basicProfitSharingUser); + + /** + * 查询用户分润基础数据 + * @return 用户分润基础数据 + */ + public List selectBasicInfoList(); + + public Map getSuperiorRatio(Long userId); + + public boolean checkRatio(BasicProfitSharingUser basicProfitSharingUser); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserBindInfoService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserBindInfoService.java new file mode 100644 index 0000000..a1a23bf --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserBindInfoService.java @@ -0,0 +1,30 @@ +package com.limap.core.basic.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.screen.vo.ControlSwitch; + +/** + * 用户设备绑定信息Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicUserBindInfoService extends IService { + /** + * 查询用户设备绑定信息列表 + * + * @param basicUserBindInfo 用户设备绑定信息 + * @return 用户设备绑定信息集合 + */ + public List selectBasicUserBindInfoList(BasicUserBindInfo basicUserBindInfo); + + public BasicUserBindInfo selectAppUserInfo(BasicUserBindInfo basicUserBindInfo); + + public BasicUserBindInfo getInfoByDeviceId(Long deviceId); + + public List selectAppUserInfo(); + + public List getcControlInfo(String deviceName); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserWithdrawService.java b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserWithdrawService.java new file mode 100644 index 0000000..18f1d32 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/IBasicUserWithdrawService.java @@ -0,0 +1,38 @@ +package com.limap.core.basic.service; + +import java.math.BigDecimal; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.common.core.domain.AjaxResult; +import com.limap.core.basic.domain.BasicUserWithdraw; +import com.limap.core.basic.vo.BasicUserWithdrawVo; + +/** + * 提现记录Service接口 + * + * @author jjb + * @date 2025-04-11 + */ +public interface IBasicUserWithdrawService extends IService { + /** + * 查询提现记录列表 + * + * @param basicUserWithdraw 提现记录 + * @return 提现记录集合 + */ + public List selectBasicUserWithdrawList(BasicUserWithdraw basicUserWithdraw); + + /** + * 用户提现 + * @param basicUserWithdraw + * @return + */ + public AjaxResult addUserWithdraw(BasicUserWithdrawVo basicUserWithdraw); + + /** + * 更新体现金额 + * @param id + * @return + */ + public void updatePayment(Long id, BigDecimal amount); +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/ISysCellNumberService.java b/fishery-core/src/main/java/com/limap/core/basic/service/ISysCellNumberService.java new file mode 100644 index 0000000..e270933 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/ISysCellNumberService.java @@ -0,0 +1,16 @@ +package com.limap.core.basic.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.SysCellNumber; + + +/** + * + * @author jjb + * @date 2025-04-11 + */ +public interface ISysCellNumberService extends IService { + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceDataHistoryServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceDataHistoryServiceImpl.java new file mode 100644 index 0000000..473acf5 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceDataHistoryServiceImpl.java @@ -0,0 +1,34 @@ +package com.limap.core.basic.service.impl; + + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.AquDeviceDataHistory; +import com.limap.core.basic.mapper.AquDeviceDataHistoryMapper; +import com.limap.core.basic.mapper.AquDeviceMapper; +import com.limap.core.basic.service.IAquDeviceDataHistoryService; +import com.limap.core.basic.service.IAquDeviceService; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.Date; + + +/** + * 分润记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +@DS("test") +public class AquDeviceDataHistoryServiceImpl extends ServiceImpl implements IAquDeviceDataHistoryService { + + + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceServiceImpl.java new file mode 100644 index 0000000..09d11ee --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquDeviceServiceImpl.java @@ -0,0 +1,117 @@ +package com.limap.core.basic.service.impl; + + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.limap.core.basic.domain.AquDevice; + +import com.limap.core.basic.domain.AquDeviceDataHistory; +import com.limap.core.basic.mapper.AquDeviceMapper; +import com.limap.core.basic.service.IAquDeviceDataHistoryService; +import com.limap.core.basic.service.IAquDeviceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; + + +/** + * 分润记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +@DS("test") +@Slf4j +public class AquDeviceServiceImpl extends ServiceImpl implements IAquDeviceService { + + + @Autowired + private IAquDeviceDataHistoryService aquDeviceDataHistoryService; + + HashSet ids = new HashSet<>(); + + @Override + @Cacheable(value = "getInfoByIotId",key = "#iotId",unless = "#result == null") + public AquDevice getInfoByIotId(String iotId) { + AquDevice iotId1 = this.getOne(new LambdaQueryWrapper().eq(AquDevice::getIotId, iotId).last("limit 1")); + return iotId1; + } + + @Override + @Async + public void dealNowAndHistoryData(AquDevice aquDevice, JSONObject data) { + if(ids.contains(aquDevice.getId())){ + return; + } + AquDeviceDataHistory history = new AquDeviceDataHistory(); + try{ + Date now = null; + if(data.containsKey("PH")){ + JSONObject ph = data.getJSONObject("PH"); + Date time = ph.getDate("time"); + if(time != null )now = time ; + aquDevice.setValuePH(ph.getDoubleValue("value")); + }if(data.containsKey("currentTemperature")){ + JSONObject ph = data.getJSONObject("currentTemperature"); + Date time = ph.getDate("time"); + if(time != null )now = time ; + aquDevice.setValueTemperature(ph.getDoubleValue("value")); + }if(data.containsKey("dissolvedOxygen")){ + JSONObject ph = data.getJSONObject("dissolvedOxygen"); + Date time = ph.getDate("time"); + if(time != null )now = time ; + aquDevice.setValueDissolvedOxygen(ph.getDoubleValue("value")); + }if(data.containsKey("dosat")){ + JSONObject ph = data.getJSONObject("dosat"); + Date time = ph.getDate("time"); + if(time != null )now = time ; + aquDevice.setValueSaturability(ph.getDoubleValue("value")); + }if(data.containsKey("salinity")){ + JSONObject ph = data.getJSONObject("salinity"); + Date time = ph.getDate("time"); + if(time != null )now = time ; + aquDevice.setValueSalinity(ph.getDoubleValue("value")); + }if(data.containsKey("Phasedifference")){ + JSONObject ph = data.getJSONObject("Phasedifference"); + aquDevice.setPhasedifference(ph.getDoubleValue("value")); + }if(data.containsKey("Tfluorescence")){ + JSONObject ph = data.getJSONObject("Tfluorescence"); + aquDevice.setTfluorescence(ph.getDoubleValue("value")); + }if(data.containsKey("Treference")){ + JSONObject ph = data.getJSONObject("Treference"); + aquDevice.setTreference(ph.getDoubleValue("value")); + } + + BeanUtils.copyProperties(aquDevice,history); + history.setDeviceId(aquDevice.getId()); + history.setCreatedTime(now); + history.setId(null); + if(now != null ){ + try{ + aquDeviceDataHistoryService.save(history); + }catch (Exception e){ + log.error("保存历史数据异常：{}",JSONObject.toJSON(history)); + } + } + if(now != null && (System.currentTimeMillis() -now.getTime() <= 1000*60) ){ + this.updateById(aquDevice); + } + }catch (Exception e){ + log.error("dealNowAndHistoryData error:{}",JSONObject.toJSON(history)); + log.error("dealNowAndHistoryData error:{}",e.getMessage()); + } + } + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquPayOrderServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquPayOrderServiceImpl.java new file mode 100644 index 0000000..2ce85d3 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/AquPayOrderServiceImpl.java @@ -0,0 +1,58 @@ +package com.limap.core.basic.service.impl; + + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; +import com.limap.core.basic.mapper.AquPayOrderMapper; +import com.limap.core.basic.service.IAquPayOrderService; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.Duration; +import java.util.List; +import java.util.Date; + +/** + * 分润记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +@DS("test") +public class AquPayOrderServiceImpl extends ServiceImpl implements IAquPayOrderService { + @Autowired + private AquPayOrderMapper aquPayOrderMapper; + + + /** + * 查询指定小时内的支付订单 + * + * @param hour 小时内的订单 + * @return 支付订单列表 + */ + @Override + public List selectByHour(Integer hour) { + Date date = new Date(System.currentTimeMillis() - Duration.ofHours(hour).toMillis()); + return this.list(new QueryWrapper().eq("OrderStatus",2).between("SuccessTime", date,new Date())); + } + + @Override + public List selectInfoByHour(Integer hour) { + return aquPayOrderMapper.selectInfoByHour(hour); + } + + @Override + public void updatePayDeviceStatus(List list) { + aquPayOrderMapper.updatePayDeviceStatus(list); + } + + @Override + public void dealRechargeWarnCode() { + aquPayOrderMapper.dealRechargeWarnCode(); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicEquipmentPriceServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicEquipmentPriceServiceImpl.java new file mode 100644 index 0000000..6d3c347 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicEquipmentPriceServiceImpl.java @@ -0,0 +1,46 @@ +package com.limap.core.basic.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicEquipmentPriceMapper; +import com.limap.core.basic.domain.BasicEquipmentPrice; +import com.limap.core.basic.service.IBasicEquipmentPriceService; + +/** + * 设备基础价格信息Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +public class BasicEquipmentPriceServiceImpl extends ServiceImpl implements IBasicEquipmentPriceService { + @Autowired + private BasicEquipmentPriceMapper basicEquipmentPriceMapper; + + /** + * 查询设备基础价格信息列表 + * + * @param basicEquipmentPrice 设备基础价格信息 + * @return 设备基础价格信息 + */ + @Override + public List selectBasicEquipmentPriceList(BasicEquipmentPrice basicEquipmentPrice) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotEmpty(basicEquipmentPrice.getName())) { + queryWrapper.like(BasicEquipmentPrice::getName, basicEquipmentPrice.getName()); + } + if (StringUtils.isNotEmpty(basicEquipmentPrice.getSharingCode())) { + queryWrapper.eq(BasicEquipmentPrice::getSharingCode, basicEquipmentPrice.getSharingCode()); + } + if (StringUtils.isNotEmpty(basicEquipmentPrice.getProductKey())) { + queryWrapper.eq(BasicEquipmentPrice::getProductKey, basicEquipmentPrice.getProductKey()); + } + queryWrapper.orderByDesc(BasicEquipmentPrice::getCreateTime); + return basicEquipmentPriceMapper.selectList(queryWrapper); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingRecordServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingRecordServiceImpl.java new file mode 100644 index 0000000..f7df464 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingRecordServiceImpl.java @@ -0,0 +1,176 @@ +package com.limap.core.basic.service.impl; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.limap.common.core.domain.AjaxResult; +import com.limap.core.basic.domain.AquPayDevice; +import com.limap.core.basic.domain.AquPayOrder; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.basic.service.IBasicUserWithdrawService; +import com.limap.core.basic.vo.BasicUserWithdrawVo; +import com.limap.core.basic.vo.SharingRecordSearchVo; +import com.limap.core.basic.vo.SharingUserTaskVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicProfitSharingRecordMapper; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import com.limap.core.basic.service.IBasicProfitSharingRecordService; + +/** + * 分润记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +@Slf4j +public class BasicProfitSharingRecordServiceImpl extends ServiceImpl implements IBasicProfitSharingRecordService { + @Autowired + private BasicProfitSharingRecordMapper basicProfitSharingRecordMapper; + @Autowired + private IBasicUserWithdrawService basicUserWithdrawService; + + /** + * 查询分润记录列表 + * + * @param basicProfitSharingRecord 分润记录 + * @return 分润记录 + */ + @Override + public List selectBasicProfitSharingRecordList(BasicProfitSharingRecord basicProfitSharingRecord) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotNull(basicProfitSharingRecord.getUserId())) { + queryWrapper.eq(BasicProfitSharingRecord::getUserId, basicProfitSharingRecord.getUserId()); + } + if (StringUtils.isNotEmpty(basicProfitSharingRecord.getFromWay())) { + queryWrapper.like(BasicProfitSharingRecord::getFromWay, basicProfitSharingRecord.getFromWay()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getStatus())) { + queryWrapper.eq(BasicProfitSharingRecord::getStatus, basicProfitSharingRecord.getStatus()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getGenerateTime())) { + queryWrapper.eq(BasicProfitSharingRecord::getGenerateTime, basicProfitSharingRecord.getGenerateTime()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getWithdrawalStatus())) { + queryWrapper.eq(BasicProfitSharingRecord::getWithdrawalStatus, basicProfitSharingRecord.getWithdrawalStatus()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getWithdrawalTime())) { + queryWrapper.eq(BasicProfitSharingRecord::getWithdrawalTime, basicProfitSharingRecord.getWithdrawalTime()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getPaymentStatus())) { + queryWrapper.eq(BasicProfitSharingRecord::getPaymentStatus, basicProfitSharingRecord.getPaymentStatus()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getPaymentTime())) { + queryWrapper.eq(BasicProfitSharingRecord::getPaymentTime, basicProfitSharingRecord.getPaymentTime()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getWithdrawId())) { + queryWrapper.eq(BasicProfitSharingRecord::getWithdrawId, basicProfitSharingRecord.getWithdrawId()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getDeviceName())) { + queryWrapper.eq(BasicProfitSharingRecord::getDeviceName, basicProfitSharingRecord.getDeviceName()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getStartTime())) { + queryWrapper.between(BasicProfitSharingRecord::getGenerateTime, basicProfitSharingRecord.getStartTime(), basicProfitSharingRecord.getEndTime()); + } + if (StringUtils.isNotNull(basicProfitSharingRecord.getTel())) { + queryWrapper.like(BasicProfitSharingRecord::getTel, basicProfitSharingRecord.getTel()); + } + queryWrapper.orderByDesc(BasicProfitSharingRecord::getGenerateTime); + return basicProfitSharingRecordMapper.selectList(queryWrapper); + } + + /** + * 处理分润计算 + * + * @param aquPayOrder + * @param sharingUserTaskVo + * @return + */ + @Override + public BasicProfitSharingRecord calculateProfit(AquPayDevice aquPayOrder, SharingUserTaskVo sharingUserTaskVo) { + if(aquPayOrder.getOrderId() == null){ + log.info("异常数据 aquPayOrder ：{}。sharingUserTaskVo：{}", JSONObject.toJSONString(aquPayOrder), JSONObject.toJSONString(sharingUserTaskVo)); + } + BigDecimal decimal = new BigDecimal(aquPayOrder.getPayAmount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); + BigDecimal ratio = BigDecimal.ZERO; + if(aquPayOrder.getDeviceType() == 1){ + ratio = sharingUserTaskVo.getOmRatio(); + }else{ + ratio = sharingUserTaskVo.getControlRatio(); + } + String serialNum = aquPayOrder.getSerialNum(); + BigDecimal amount = decimal.multiply(ratio).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP); + BasicProfitSharingRecord basicProfitSharingRecord = new BasicProfitSharingRecord(); + basicProfitSharingRecord.setUserId(sharingUserTaskVo.getUserId()); + basicProfitSharingRecord.setUserName(sharingUserTaskVo.getNickName()); + basicProfitSharingRecord.setAmount(amount); + basicProfitSharingRecord.setTitle("设备："+ serialNum + ",微信充值：" + decimal + "元,分润：" + amount + "元"); + basicProfitSharingRecord.setFromWay("微信充值账单分润"); + basicProfitSharingRecord.setStatus(1); + basicProfitSharingRecord.setGenerateTime(aquPayOrder.getCreatedTime()); + basicProfitSharingRecord.setOrderNo(aquPayOrder.getOrderId() + ""); + basicProfitSharingRecord.setDeviceName(serialNum); + basicProfitSharingRecord.setWithdrawalStatus(0); + basicProfitSharingRecord.setPaymentStatus(0); + basicProfitSharingRecord.setTel(sharingUserTaskVo.getTel()); + basicProfitSharingRecord.setDeptId(sharingUserTaskVo.getDeptId()); + return basicProfitSharingRecord; + } + + @Override + public Map getReportData(SharingRecordSearchVo searchVo) { + return basicProfitSharingRecordMapper.getReportData(searchVo); + } + + @Override + public List selectRecordByWithdraw(BasicUserWithdrawVo basicUserWithdraw) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(BasicProfitSharingRecord::getUserId, basicUserWithdraw.getUserId()); + queryWrapper.eq(BasicProfitSharingRecord::getWithdrawalStatus, 0); + LocalDateTime thirtyDaysAgo = LocalDateTime.now().minusDays(30); + queryWrapper.lt(BasicProfitSharingRecord::getGenerateTime, thirtyDaysAgo); +// queryWrapper.between(BasicProfitSharingRecord::getGenerateTime, basicUserWithdraw.getStartTime(), basicUserWithdraw.getEndTime()); + return list(queryWrapper); + } + + @Override + public void updateRecordByWithdraw(BasicUserWithdrawVo basicUserWithdraw) { + LambdaUpdateWrapper queryWrapper = Wrappers.lambdaUpdate(); + queryWrapper.eq(BasicProfitSharingRecord::getUserId, basicUserWithdraw.getUserId()); + queryWrapper.eq(BasicProfitSharingRecord::getWithdrawalStatus, 0); + LocalDateTime thirtyDaysAgo = LocalDateTime.now().minusDays(30); + queryWrapper.lt(BasicProfitSharingRecord::getGenerateTime, thirtyDaysAgo); + queryWrapper.set(BasicProfitSharingRecord::getWithdrawalStatus, 1); + queryWrapper.set(BasicProfitSharingRecord::getStatus, 0); + } + + @Override + public AjaxResult dealRefund(BasicProfitSharingRecord basicProfitSharingRecord) { + List orderRecord = this.list(new QueryWrapper().eq("order_no", basicProfitSharingRecord.getOrderNo())); + orderRecord.forEach(record -> { + if(record.getStatus() != 9 && record.getPaymentStatus() != 9){ + record.setStatus(9); + record.setPaymentStatus(9); + record.setPaymentReason(basicProfitSharingRecord.getPaymentReason()); + if(basicProfitSharingRecord.getWithdrawId() != null){ + basicUserWithdrawService.updatePayment(basicProfitSharingRecord.getWithdrawId(),basicProfitSharingRecord.getAmount()); + } + this.updateById(record); + } + }); + return AjaxResult.success("退款成功"); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingServiceImpl.java new file mode 100644 index 0000000..2180e5f --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingServiceImpl.java @@ -0,0 +1,41 @@ +package com.limap.core.basic.service.impl; + +import java.util.List; +import com.limap.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicProfitSharingMapper; +import com.limap.core.basic.domain.BasicProfitSharing; +import com.limap.core.basic.service.IBasicProfitSharingService; + +/** + * 基础分润信息Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +public class BasicProfitSharingServiceImpl extends ServiceImpl implements IBasicProfitSharingService { + @Autowired + private BasicProfitSharingMapper basicProfitSharingMapper; + + /** + * 查询基础分润信息列表 + * + * @param basicProfitSharing 基础分润信息 + * @return 基础分润信息 + */ + @Override + public List selectBasicProfitSharingList(BasicProfitSharing basicProfitSharing) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotEmpty(basicProfitSharing.getName())) { + queryWrapper.like(BasicProfitSharing::getName, basicProfitSharing.getName()); + } + queryWrapper.orderByDesc(BasicProfitSharing::getCreateTime); + return basicProfitSharingMapper.selectList(queryWrapper); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingUserServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingUserServiceImpl.java new file mode 100644 index 0000000..e124494 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicProfitSharingUserServiceImpl.java @@ -0,0 +1,157 @@ +package com.limap.core.basic.service.impl; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.DateUtils; +import com.limap.core.basic.vo.SharingUserTaskVo; +import com.limap.system.service.ISysUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicProfitSharingUserMapper; +import com.limap.core.basic.domain.BasicProfitSharingUser; +import com.limap.core.basic.service.IBasicProfitSharingUserService; + +import javax.annotation.Resource; + +/** + * 用户分润基础信息Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +@Slf4j +public class BasicProfitSharingUserServiceImpl extends ServiceImpl implements IBasicProfitSharingUserService { + @Autowired + private BasicProfitSharingUserMapper basicProfitSharingUserMapper; + + @Autowired + private ISysUserService sysUserService; + + @Resource + private RedisCache redisCache; + + private static final String listCacheKey = "BasicProfitSharingUser:list"; + + /** + * 查询用户分润基础信息列表 + * + * @param basicProfitSharingUser 用户分润基础信息 + * @return 用户分润基础信息 + */ + @Override + public List selectBasicProfitSharingUserList(BasicProfitSharingUser basicProfitSharingUser) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotNull(basicProfitSharingUser.getUserId())) { + queryWrapper.eq(BasicProfitSharingUser::getUserId, basicProfitSharingUser.getUserId()); + } + if (StringUtils.isNotEmpty(basicProfitSharingUser.getSharingCode())) { + queryWrapper.eq(BasicProfitSharingUser::getSharingCode, basicProfitSharingUser.getSharingCode()); + } + if (StringUtils.isNotEmpty(basicProfitSharingUser.getName())) { + queryWrapper.like(BasicProfitSharingUser::getName, basicProfitSharingUser.getName()); + } + queryWrapper.orderByDesc(BasicProfitSharingUser::getCreateTime); + return basicProfitSharingUserMapper.selectList(queryWrapper); + } + + /** + * 查询用户分润基础数据 + * + * @return 用户分润基础数据 + */ + @Override + public List selectBasicInfoList() { + return basicProfitSharingUserMapper.selectBasicInfoList(); + } + + @Override + public Map getSuperiorRatio(Long userId) { + Map result = new HashMap<>(); + result.put("omRatio",BigDecimal.ZERO); + result.put("controlRatio",BigDecimal.ZERO); + BasicProfitSharingUser byId = this.getById("101"); + if (byId!= null) { + result.put("controlRatio",byId.getControlRatio()); + } + SysUser user = sysUserService.selectUserById(userId); + + if (user != null) { + Long parentId = user.getParentId(); + if (parentId == null) { + return result; + } + + List list = null; + if (redisCache.getCacheObject(listCacheKey) == null) { + list = basicProfitSharingUserMapper.selectCacheList(); + redisCache.setCacheObject(listCacheKey, list); + }else{ + list = (List) redisCache.getCacheObject(listCacheKey); + } + + while (parentId != null) { + try{ + Long finalParentId = parentId; + SharingUserTaskVo parent = list.stream() + .filter(f -> f != null && f.getUserId() != null && f.getUserId().equals(finalParentId)) + .findFirst() + .orElse(null); + + + result.put("omRatio",result.get("omRatio").add(parent.getOmRatio())); + result.put("controlRatio",result.get("controlRatio").add(parent.getControlRatio())); + parentId = parent.getParentId(); + }catch (Exception e){ + log.error("获取上级分润比例异常：{},parentId{}",e.getMessage(),parentId); + return result; + } + + } + + } + return result; + } + + @Override + public boolean checkRatio(BasicProfitSharingUser basicProfitSharingUser) { + + try{ + Map superiorRatio = this.getSuperiorRatio(basicProfitSharingUser.getUserId()); + BigDecimal omRatio = superiorRatio.get("omRatio"); + BigDecimal controlRatio = superiorRatio.get("controlRatio"); + + BigDecimal omRatio1 = basicProfitSharingUser.getOmRatio(); + BigDecimal val = BigDecimal.valueOf(100); + if(omRatio1 != null){ + BigDecimal add = omRatio1.add(omRatio); + if(add.compareTo(val)>0){ + throw new ServiceException("溶氧分润比例总和不能超过100%,当前已分配比例："+omRatio+"%,最大比例为："+val.subtract(omRatio)+"%"); + } + } + BigDecimal controlRatio1 = basicProfitSharingUser.getControlRatio(); + if(controlRatio1 != null){ + BigDecimal add = controlRatio1.add(controlRatio); + if(add.compareTo(val)>0){ + throw new ServiceException("控制器分润比例总和不能超过100%,当前已分配比例："+controlRatio+"%,最大比例为："+val.subtract(controlRatio)+"%"); + } + } + redisCache.deleteObject(listCacheKey); + return true; + }catch (Exception e){ + log.error("分润校验异常：{}",e.getMessage()); + } + return false; + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserBindInfoServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserBindInfoServiceImpl.java new file mode 100644 index 0000000..0c50595 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserBindInfoServiceImpl.java @@ -0,0 +1,86 @@ +package com.limap.core.basic.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.utils.DateUtils; +import com.limap.core.screen.vo.ControlSwitch; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicUserBindInfoMapper; +import com.limap.core.basic.domain.BasicUserBindInfo; +import com.limap.core.basic.service.IBasicUserBindInfoService; + +import javax.annotation.Resource; + +/** + * 用户设备绑定信息Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +public class BasicUserBindInfoServiceImpl extends ServiceImpl implements IBasicUserBindInfoService { + @Autowired + private BasicUserBindInfoMapper basicUserBindInfoMapper; + + /** + * 查询用户设备绑定信息列表 + * + * @param basicUserBindInfo 用户设备绑定信息 + * @return 用户设备绑定信息 + */ + @Override + public List selectBasicUserBindInfoList(BasicUserBindInfo basicUserBindInfo) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotNull(basicUserBindInfo.getUserId())) { + queryWrapper.eq(BasicUserBindInfo::getUserId, basicUserBindInfo.getUserId()); + } + if (StringUtils.isNotEmpty(basicUserBindInfo.getDeviceName())) { + queryWrapper.like(BasicUserBindInfo::getDeviceName, basicUserBindInfo.getDeviceName()); + } + if (StringUtils.isNotEmpty(basicUserBindInfo.getProductKey())) { + queryWrapper.eq(BasicUserBindInfo::getProductKey, basicUserBindInfo.getProductKey()); + } + if (StringUtils.isNotEmpty(basicUserBindInfo.getType())) { + queryWrapper.eq(BasicUserBindInfo::getType, basicUserBindInfo.getType()); + } + if (StringUtils.isNotEmpty(basicUserBindInfo.getUserName())) { + queryWrapper.likeLeft(BasicUserBindInfo::getUserName, basicUserBindInfo.getUserName()); + } + queryWrapper.orderByDesc(BasicUserBindInfo::getCreateTime); + return basicUserBindInfoMapper.selectBasicUserBindInfoList(basicUserBindInfo); + } + + @Override + @DS("test") + public BasicUserBindInfo selectAppUserInfo(BasicUserBindInfo basicUserBindInfo) { + List list = basicUserBindInfoMapper.selectAppUserInfo(basicUserBindInfo); + list.forEach(item -> item.setUserId(basicUserBindInfo.getUserId())); + return list.stream().findFirst().orElse(null); + } + + @Override + @Cacheable(value = "userBindInfo", key = "#deviceId", unless = "#result == null") + public BasicUserBindInfo getInfoByDeviceId(Long deviceId) { + return this.getById(deviceId); + } + + @Override + @DS("test") + public List selectAppUserInfo() { + return basicUserBindInfoMapper.selectAppUserInfo(new BasicUserBindInfo()); + } + + @Override + @DS("test") + public List getcControlInfo(String deviceName) { + return basicUserBindInfoMapper.getcControlInfo(deviceName); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserWithdrawServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserWithdrawServiceImpl.java new file mode 100644 index 0000000..a121f2a --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/BasicUserWithdrawServiceImpl.java @@ -0,0 +1,133 @@ +package com.limap.core.basic.service.impl; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; +import java.util.List; + +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.SecurityUtils; +import com.limap.core.basic.domain.BasicProfitSharingRecord; +import com.limap.core.basic.domain.BasicProfitSharingUser; +import com.limap.core.basic.service.IBasicProfitSharingRecordService; +import com.limap.core.basic.service.IBasicProfitSharingUserService; +import com.limap.core.basic.vo.BasicUserWithdrawVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.core.basic.mapper.BasicUserWithdrawMapper; +import com.limap.core.basic.domain.BasicUserWithdraw; +import com.limap.core.basic.service.IBasicUserWithdrawService; + +import javax.annotation.Resource; + +/** + * 提现记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +public class BasicUserWithdrawServiceImpl extends ServiceImpl implements IBasicUserWithdrawService { + @Resource + private BasicUserWithdrawMapper basicUserWithdrawMapper; + @Resource + private IBasicProfitSharingRecordService basicProfitSharingRecordService; + @Resource + private IBasicProfitSharingUserService basicProfitSharingUserService; + + /** + * 查询提现记录列表 + * + * @param basicUserWithdraw 提现记录 + * @return 提现记录 + */ + @Override + public List selectBasicUserWithdrawList(BasicUserWithdraw basicUserWithdraw) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotNull(basicUserWithdraw.getUserId())) { + queryWrapper.eq(BasicUserWithdraw::getUserId, basicUserWithdraw.getUserId()); + } + if (StringUtils.isNotEmpty(basicUserWithdraw.getTitle())) { + queryWrapper.eq(BasicUserWithdraw::getTitle, basicUserWithdraw.getTitle()); + } + if (StringUtils.isNotNull(basicUserWithdraw.getWithdrawTime())) { + queryWrapper.eq(BasicUserWithdraw::getWithdrawTime, basicUserWithdraw.getWithdrawTime()); + } + if (StringUtils.isNotNull(basicUserWithdraw.getNickName())) { + queryWrapper.like(BasicUserWithdraw::getNickName, basicUserWithdraw.getNickName()); + } + if (StringUtils.isNotNull(basicUserWithdraw.getTel())) { + queryWrapper.like(BasicUserWithdraw::getTel, basicUserWithdraw.getTel()); + } + queryWrapper.orderByDesc(BasicUserWithdraw::getCreateTime); + return basicUserWithdrawMapper.selectList(queryWrapper); + } + + /** + * 用户提现 + * + * @param basicUserWithdraw + * @return + */ + @Override + public AjaxResult addUserWithdraw(BasicUserWithdrawVo basicUserWithdraw) { + Date date = DateUtils.getNowDate(); + SysUser user = SecurityUtils.getLoginUser().getUser(); + List records = basicProfitSharingRecordService.selectRecordByWithdraw(basicUserWithdraw); + if(records.size() == 0){ + return AjaxResult.error("暂无可提现金额"); + } + BasicProfitSharingUser byId = basicProfitSharingUserService.getById(basicUserWithdraw.getUserId()); + if(byId == null || byId.getBankNumber() == null || byId.getCompany() == null){ + return AjaxResult.error("请先补充打款信息: 点击头像-》个人中心-》基本资料-》分润信息中补充相关信息"); + } + String title = DateUtils.parseDateToStr("yyyy-MM-dd", date) + "用户提现"; + double sum = records.stream().mapToDouble(e -> e.getAmount().doubleValue()).sum(); + + BasicUserWithdraw basicUserWithdraw1 = new BasicUserWithdraw(); + basicUserWithdraw1.setUserId(basicUserWithdraw.getUserId()); + basicUserWithdraw1.setTitle(title); + basicUserWithdraw1.setWithdrawTime(date); + basicUserWithdraw1.setStartTime( basicUserWithdraw.getStartTime()); + basicUserWithdraw1.setEndTime(basicUserWithdraw.getEndTime()); + basicUserWithdraw1.setTotalAmount(BigDecimal.valueOf(sum).setScale(2, RoundingMode.HALF_UP)); + basicUserWithdraw1.setBank(byId.getCompany()); + basicUserWithdraw1.setBankNumber(byId.getBankNumber()); + basicUserWithdraw1.setName(byId.getName()); + basicUserWithdraw1.setPaymentStatus("0"); + basicUserWithdraw1.setNickName(user.getNickName()); + basicUserWithdraw1.setTel(user.getPhonenumber()); + this.save(basicUserWithdraw1); + records.forEach(e -> e.setWithdrawId(basicUserWithdraw1.getId())); + basicProfitSharingRecordService.updateBatchById(records); + return AjaxResult.success("提现申请成功，请等待审核"); + } + + /** + * 更新体现金额 + * + * @param id + * @param amount + * @return + */ + @Override + public void updatePayment(Long id, BigDecimal amount) { + BasicUserWithdraw byId = this.getById(id); + if(byId == null){ + return; + } + BigDecimal paymentAmount = byId.getPaymentAmount(); + if(paymentAmount == null){ + paymentAmount = byId.getTotalAmount(); + } + paymentAmount = paymentAmount.subtract(amount); + byId.setPaymentAmount(paymentAmount); + this.updateById(byId); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/service/impl/SysCellNumberServiceImpl.java b/fishery-core/src/main/java/com/limap/core/basic/service/impl/SysCellNumberServiceImpl.java new file mode 100644 index 0000000..3148728 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/service/impl/SysCellNumberServiceImpl.java @@ -0,0 +1,36 @@ +package com.limap.core.basic.service.impl; + + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.limap.core.basic.domain.AquDevice; +import com.limap.core.basic.domain.AquDeviceDataHistory; +import com.limap.core.basic.domain.SysCellNumber; +import com.limap.core.basic.mapper.AquDeviceMapper; +import com.limap.core.basic.mapper.SysCellNumberMapper; +import com.limap.core.basic.service.IAquDeviceDataHistoryService; +import com.limap.core.basic.service.IAquDeviceService; +import com.limap.core.basic.service.ISysCellNumberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; + +import java.util.Date; + + +/** + * 分润记录Service业务层处理 + * + * @author jjb + * @date 2025-04-11 + */ +@Service +public class SysCellNumberServiceImpl extends ServiceImpl implements ISysCellNumberService { + + + +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/vo/BasicDeviceSearchVO.java b/fishery-core/src/main/java/com/limap/core/basic/vo/BasicDeviceSearchVO.java new file mode 100644 index 0000000..207d53f --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/vo/BasicDeviceSearchVO.java @@ -0,0 +1,17 @@ +package com.limap.core.basic.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class BasicDeviceSearchVO { + + @ApiModelProperty("设备id") + @NotNull(message = "设备id不能为空") + private Long deviceId; + + @ApiModelProperty("查询近几天") + private Integer days; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/vo/BasicUserWithdrawVo.java b/fishery-core/src/main/java/com/limap/core/basic/vo/BasicUserWithdrawVo.java new file mode 100644 index 0000000..4877f3d --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/vo/BasicUserWithdrawVo.java @@ -0,0 +1,19 @@ +package com.limap.core.basic.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicUserWithdrawVo { + + @ApiModelProperty("用户id") + private Long userId; + + @ApiModelProperty("提现开始日期") + private Date startTime; + + @ApiModelProperty("提现截止日期") + private Date endTime; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/vo/SharingRecordSearchVo.java b/fishery-core/src/main/java/com/limap/core/basic/vo/SharingRecordSearchVo.java new file mode 100644 index 0000000..cc5103c --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/vo/SharingRecordSearchVo.java @@ -0,0 +1,13 @@ +package com.limap.core.basic.vo; + +import lombok.Data; + +@Data +public class SharingRecordSearchVo { + + private String startDate; + private String endDate; + + private Long userId; + private Long deptId; +} diff --git a/fishery-core/src/main/java/com/limap/core/basic/vo/SharingUserTaskVo.java b/fishery-core/src/main/java/com/limap/core/basic/vo/SharingUserTaskVo.java new file mode 100644 index 0000000..f88d54d --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/basic/vo/SharingUserTaskVo.java @@ -0,0 +1,41 @@ +package com.limap.core.basic.vo; + +import com.limap.common.annotation.Excel; +import com.limap.core.basic.domain.BasicUserBindInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author jjb + */ +@Data +public class SharingUserTaskVo { + + @ApiModelProperty("用户id") + private Long userId; + private Long deptId; + + private String userName; + private String tel; + private String nickName; + private Long parentId; + + /** 分润级别 */ + @Excel(name = "分润级别") + @ApiModelProperty("分润级别") + private String sharingCode; + + + /** 分润比例 */ + @Excel(name = "分润比例") + @ApiModelProperty("分润比例") + private BigDecimal omRatio; + private BigDecimal controlRatio; + + private String deviceName; + + private String type; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/domain/DeviceSensorData.java b/fishery-core/src/main/java/com/limap/core/screen/domain/DeviceSensorData.java new file mode 100644 index 0000000..98cad28 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/domain/DeviceSensorData.java @@ -0,0 +1,89 @@ +package com.limap.core.screen.domain; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.time.LocalDateTime; + +/** + * TDengine 设备传感器数据 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DeviceSensorData { + + // 测量字段（随时间变化的数值） + private String time; // 时序主键时间戳 + private String createTime; // 数据创建时间 + private Double dissolvedOxygen; // 溶解氧 + private Double temperature; // 温度 + private Double saturability; // 饱和度 + private Double ph; // pH值 + private Double salinity; // 盐度 + private Double treference; // 参考值 + private Double tfluorescence; // 荧光值 + private Double phaseDifference; // 相位差 + private Double battery; // 电池电量 + + // Getter 方法，返回保留两位小数的值 + public Double getDissolvedOxygen() { + return roundToTwoDecimals(dissolvedOxygen); + } + + public Double getTemperature() { + return roundToTwoDecimals(temperature); + } + + public Double getSaturability() { + return roundToTwoDecimals(saturability); + } + + public Double getPh() { + return roundToTwoDecimals(ph); + } + + public Double getSalinity() { + return roundToTwoDecimals(salinity); + } + + public Double getTreference() { + return roundToTwoDecimals(treference); + } + + public Double getTfluorescence() { + return roundToTwoDecimals(tfluorescence); + } + + public Double getPhaseDifference() { + return roundToTwoDecimals(phaseDifference); + } + + public Double getBattery() { + return roundToTwoDecimals(battery); + } + + // 工具方法：保留两位小数 + private Double roundToTwoDecimals(Double value) { + if (value == null) { + return null; + } + return BigDecimal.valueOf(value) + .setScale(2, RoundingMode.HALF_UP) + .doubleValue(); + } + + // 标签字段（元数据，不随时间频繁变化） + private String tenantId = "111111"; // 租户ID（默认值） + private String serialNum; // 设备序列号 + private Long deviceId; // 设备ID + private Long userId; // 用户ID + private String userName; // 用户名 + private String mobilePhone; // 手机号 + private String deviceName; // 设备名称 + private Integer deviceType; // 设备类型 +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/mapper/DeviceSensorDataMapper.java b/fishery-core/src/main/java/com/limap/core/screen/mapper/DeviceSensorDataMapper.java new file mode 100644 index 0000000..af3ce13 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/mapper/DeviceSensorDataMapper.java @@ -0,0 +1,32 @@ +package com.limap.core.screen.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import com.limap.core.screen.domain.DeviceSensorData; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * TDengine 设备传感器数据 Mapper + */ +@Repository +public interface DeviceSensorDataMapper { + + /** + * 查询历史数据列表（支持按时间间隔聚合） + * + * @param serialNum 设备序列号 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param intervalType 间隔类型：1-原始数据，2-10分钟，3-30分钟，4-1小时 + * @return 设备传感器数据列表 + */ + @DS("taos") + @InterceptorIgnore(tenantLine = "true") + List getHistoryDataList(@Param("serialNum") String serialNum, + @Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("intervalType") Integer intervalType); +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/mapper/ScreenMapper.java b/fishery-core/src/main/java/com/limap/core/screen/mapper/ScreenMapper.java new file mode 100644 index 0000000..211e344 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/mapper/ScreenMapper.java @@ -0,0 +1,25 @@ +package com.limap.core.screen.mapper; + +import com.limap.core.screen.vo.*; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface ScreenMapper { + + List getUserPonds(Long userId); + + List getUserEquipments(@Param("userId") Long userId,@Param("pondIds") Long[] pondIds,@Param("deviceType")String deviceType); + + AppEquipmentVo getEquipmentById(@Param("deviceId") Long deviceId,@Param("deviceName") String deviceName); + + List getWarnList(@Param("userId")Long userId,@Param("pageNum")Integer pageNum,@Param("pageSize")Integer pageSize); + + List getWarnListByDevice(@Param("deviceId")Long userId,@Param("pageNum")Integer pageNum,@Param("pageSize")Integer pageSize); + + long getWarnListCount(Long userId); + long getWarnListCountByDevice(Long deviceId); + + List getControlSwitch(@Param("deviceId") Long deviceId); +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/service/IScreenService.java b/fishery-core/src/main/java/com/limap/core/screen/service/IScreenService.java new file mode 100644 index 0000000..ceb544c --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/service/IScreenService.java @@ -0,0 +1,50 @@ +package com.limap.core.screen.service; + +import com.limap.core.screen.vo.*; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * 大屏接口 + * @author jjb + */ +@Component +public interface IScreenService { + + /** + * 获取用户池塘信息 + * @return 池塘基础信息 + */ + public List getUserPonds(Long userId); + + /** + * 获取用户所有设备 + * @param userId 用户id + * @param pondIds 池塘id + * @return 设备数据 + */ + public List getUserEquipments(Long userId, Long[] pondIds,String deviceType); + public List getEquipmentsList(Long userId, Long[] pondIds,String deviceType); + + public AppEquipmentVo getEquipmentById(Long deviceId); + public AppEquipmentVo getEquipmentByDeviceNo(String deviceName); + + + public List getEquipmentHistory(Long userId, Long deviceId); + + public List getEquipmentHistory(Integer days, Long deviceId); + + + public List getWarnList(Long userId,Integer pageNum,Integer pageSize); + + public List getWarnListByDevice(Long deviceId,Integer pageNum,Integer pageSize); + + public long getWarnListCount(Long userId); + public long getWarnListCountByDevice(Long deviceId); + + public List getControlSwitch(Long deviceId); + + public List historyCompare(CompareSearchVo vo); +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/service/impl/ScreenServiceImpl.java b/fishery-core/src/main/java/com/limap/core/screen/service/impl/ScreenServiceImpl.java new file mode 100644 index 0000000..d0505db --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/service/impl/ScreenServiceImpl.java @@ -0,0 +1,305 @@ +package com.limap.core.screen.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.utils.ali.iot.ClientUtil; +import com.limap.core.screen.domain.DeviceSensorData; +import com.limap.core.screen.mapper.DeviceSensorDataMapper; +import com.limap.core.screen.mapper.ScreenMapper; +import com.limap.core.screen.service.IScreenService; +import com.limap.core.screen.vo.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +/** + * @author jjb + */ +@Service +@DS("test") +public class ScreenServiceImpl implements IScreenService { + + @Resource + private ScreenMapper screenMapper; + @Resource + private RedisCache redisCache; + @Autowired + private ClientUtil clientUtil; + @Resource + private DeviceSensorDataMapper deviceSensorDataMapper; + + @Override +// @Cacheable(value = "getUserPonds",key = "#{userId}",unless ="#result?.size() == 0" ) + public List getUserPonds(Long userId) { + String key = "getUserPonds:" + userId; + if(redisCache.hasKey(key)){ + return (List)redisCache.getCacheObject(key); + } + List userPonds = screenMapper.getUserPonds(userId); + if(userPonds != null && !userPonds.isEmpty()){ + redisCache.setCacheObject(key,userPonds,60, TimeUnit.MINUTES); + } + return userPonds; + } + + @Override + public List getUserEquipments(Long userId, Long[] pondIds,String deviceType) { + List equipments = screenMapper.getUserEquipments(userId, pondIds,deviceType); + if(equipments == null || equipments.isEmpty()){ + return Collections.emptyList(); + } + equipments.forEach(e->{ + String iotId = e.getIotId(); + String key = "deviceOnline:status:" + iotId; + if(redisCache.hasKey(key)){ + e.setOnline((Integer) redisCache.getCacheObject(iotId)); + }else{ + JSONObject statusObject = clientUtil.thingStatusGet(iotId); + if(statusObject != null){ + redisCache.setCacheObject(key,statusObject.getInteger("status"),2, TimeUnit.MINUTES); + e.setOnline(statusObject.getInteger("status")); + } + } + }); + if(equipments.stream().anyMatch(e-> "2".equals(e.getDeviceType()))){ + equipments.stream().filter(e-> "2".equals(e.getDeviceType())).forEach(e->{ + e.setSwitches(dealControlSwitch(userId,e.getId())); + }); + } + return equipments; + } + + @Override + public List getEquipmentsList(Long userId, Long[] pondIds, String deviceType) { + List equipments = screenMapper.getUserEquipments(userId, pondIds,deviceType); + if(equipments == null || equipments.isEmpty()){ + return Collections.emptyList(); + } + if(equipments.stream().anyMatch(e-> "2".equals(e.getDeviceType()))){ + equipments.stream().filter(e-> "2".equals(e.getDeviceType())).forEach(e->{ + e.setSwitches(dealControlSwitch(userId,e.getId())); + }); + } + return equipments; + } + + @Override + public AppEquipmentVo getEquipmentById(Long deviceId) { + return screenMapper.getEquipmentById(deviceId,null); + } + + @Override + public AppEquipmentVo getEquipmentByDeviceNo(String deviceName) { + return screenMapper.getEquipmentById(null,deviceName); + } + + @Override + public List getEquipmentHistory(Long userId, Long deviceId) { + return getEquipmentHistory(1, deviceId); + } + + @Override + public List getEquipmentHistory(Integer days, Long deviceId) { + if(days == null){ + days = 1; + } + String key = "getEquipmentHistory:" + deviceId + ":" + days; + if(redisCache.hasKey(key)){ + return (List)redisCache.getCacheObject(key); + } + + // 从 PostgreSQL 获取设备信息（获取 serialNum） + AppEquipmentVo equipment = screenMapper.getEquipmentById(deviceId, null); + if(equipment == null || equipment.getSerialNum() == null){ + return Collections.emptyList(); + } + String serialNum = equipment.getSerialNum(); + + // 计算时间范围 + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime startTime = endTime.minusDays(days); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + // 根据天数确定聚合间隔：1天-30分钟，3天-1小时，7天-3小时 + Integer intervalType; + if(days <= 1){ + intervalType = 1; // 实时数据 + } else if(days <= 3){ + intervalType = 2; // 10min + } else { + intervalType = 3; // 30min + } + + // 从 TDengine 查询历史数据 + List dataList = deviceSensorDataMapper.getHistoryDataList( + serialNum, + startTime.format(formatter), + endTime.format(formatter), + intervalType + ); + + // 转换为 EquipmentHistory + List list = convertToEquipmentHistory(dataList); + + if(list != null && !list.isEmpty()){ + redisCache.setCacheObject(key, list, 30, TimeUnit.MINUTES); + } + return list; + } + + /** + * 将 DeviceSensorData 转换为 EquipmentHistory + */ + private List convertToEquipmentHistory(List dataList) { + if(dataList == null || dataList.isEmpty()){ + return Collections.emptyList(); + } + + DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm"); + + return dataList.stream().map(data -> { + EquipmentHistory history = new EquipmentHistory(); + + // 解析时间字符串 + String timeStr = data.getTime(); + if(timeStr != null && !timeStr.isEmpty()){ + // TDengine 返回的时间格式可能是 "2024-01-15 08:30:00.000" + timeStr = timeStr.split("\\.")[0]; // 去掉毫秒部分 + LocalDateTime dateTime = LocalDateTime.parse(timeStr, inputFormatter); + history.setDay(dateTime.format(dayFormatter)); + history.setTime(dateTime.format(timeFormatter)); + } + + history.setDissolvedOxygen(data.getDissolvedOxygen()); + history.setTemperature(data.getTemperature()); + history.setSaturability(data.getSaturability()); + history.setPH(data.getPh()); + history.setSalinity(data.getSalinity()); + + return history; + }).collect(Collectors.toList()); + } + + @Override + public List getWarnList(Long userId,Integer pageNum,Integer pageSize) { + List warnList = screenMapper.getWarnList(userId, pageNum, pageSize); + return warnList; + } + + @Override + public List getWarnListByDevice(Long deviceId, Integer pageNum, Integer pageSize) { + return screenMapper.getWarnListByDevice(deviceId, pageNum, pageSize); + } + + @Override + public long getWarnListCount(Long userId) { + return screenMapper.getWarnListCount(userId); + } + + @Override + public long getWarnListCountByDevice(Long deviceId) { + return screenMapper.getWarnListCountByDevice(deviceId); + } + + private List dealControlSwitch(Long userId, Long deviceId) { + String key = "dealControlSwitch:" + userId + ":" +deviceId ; + if(redisCache.hasKey(key)){ + return (List)redisCache.getCacheObject(key); + } + List controlSwitch = getControlSwitch(deviceId); + List userPonds = getUserPonds(userId); + if(userPonds != null && !userPonds.isEmpty()){ + Map pondMap = userPonds.stream().collect(Collectors.toMap(PondVo::getId, PondVo::getPondName)); + controlSwitch.stream().forEach(s -> { + s.setPondName(pondMap.get(s.getPondId())); + }); + } + redisCache.setCacheObject(key,controlSwitch,2, TimeUnit.MINUTES); + return controlSwitch; + } + + @Override + public List getControlSwitch(Long deviceId) { + String key = "getControlSwitch:" + (deviceId == null? "all" : deviceId); + if(redisCache.hasKey(key)){ + return (List)redisCache.getCacheObject(key); + } + List controlSwitch = screenMapper.getControlSwitch(deviceId); + if(controlSwitch!= null &&!controlSwitch.isEmpty()){ + redisCache.setCacheObject(key,controlSwitch,1, TimeUnit.MINUTES); + } + return controlSwitch; + } + + @Override + public List historyCompare(CompareSearchVo vo) { + List result = new ArrayList<>(); + Long[] deviceIds = vo.getDeviceIds(); + Integer day = vo.getDay(); + for (Long deviceId : deviceIds) { + String key = "historyCompare:" + deviceId + ":" + day; + if(redisCache.hasKey(key)){ + result.add((CompareRequest)redisCache.getCacheObject(key)); + }else{ + // 从 TDengine 查询历史数据 + List list = getEquipmentHistory(day, deviceId); + if(list != null && !list.isEmpty()){ + CompareRequest compareRequest = new CompareRequest(); + compareRequest.setDeviceId(deviceId); + compareRequest.setDeviceName(null); + compareRequest.setHistory(list); + result.add(compareRequest); + redisCache.setCacheObject(key, compareRequest, 30, TimeUnit.MINUTES); + } + } + } + return result; + } + + /** + * 按时间范围查询设备历史数据（从 TDengine） + */ + public List getEquipmentHistoryByTimeRange(Long deviceId, String startTime, String endTime) { + String key = "getEquipmentHistoryByTimeRange:" + deviceId + ":" + startTime + ":" + endTime; + if(redisCache.hasKey(key)){ + return (List)redisCache.getCacheObject(key); + } + + // 从 PostgreSQL 获取设备信息（获取 serialNum） + AppEquipmentVo equipment = screenMapper.getEquipmentById(deviceId, null); + if(equipment == null || equipment.getSerialNum() == null){ + return Collections.emptyList(); + } + String serialNum = equipment.getSerialNum(); + + // 从 TDengine 查询历史数据（原始数据，不聚合） + List dataList = deviceSensorDataMapper.getHistoryDataList( + serialNum, + startTime, + endTime, + 1 // intervalType = 1 表示原始数据 + ); + + // 转换为 EquipmentHistory + List list = convertToEquipmentHistory(dataList); + + if(list != null && !list.isEmpty()){ + redisCache.setCacheObject(key, list, 30, TimeUnit.MINUTES); + } + return list; + } +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/AppEquipmentVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/AppEquipmentVo.java new file mode 100644 index 0000000..333a244 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/AppEquipmentVo.java @@ -0,0 +1,141 @@ +package com.limap.core.screen.vo; + + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "AppEquipmentVo", description = "设备信息") +public class AppEquipmentVo { + + @ApiModelProperty("设备id") + private Long id; + + @ApiModelProperty("用户id") + private Long userId; + + @ApiModelProperty("物联网id") + private String iotId; + + @ApiModelProperty("设备编码") + private String serialNum; + + @ApiModelProperty("设备名称") + private String deviceName; + + @ApiModelProperty("设备类型 1水质 2 测控一体") + private String deviceType; + + private Date bindTime; + private Date deadTime; + + private Long pondId; + + @ApiModelProperty("池塘名称") + private String pondName; + + @ApiModelProperty("测控一体判断是否有溶氧") + private Boolean oxygenUsed; + + @ApiModelProperty("溶氧") + private Double dissolvedOxygen; + + @ApiModelProperty("水温") + private Double temperature; + + @ApiModelProperty("饱和度") + private Double saturability; + + @ApiModelProperty("ph") + private Double pH; + + @ApiModelProperty("盐度") + private Double salinity; + + @ApiModelProperty("溶解氧报警下限") + private Double oxyWarnLower; + + @ApiModelProperty("溶氧报警开关") + private Boolean oxyWarnCallOpen; + + @ApiModelProperty("溶氧报警免打扰开关") + private Boolean oxyWarnCallNoDis; + + @ApiModelProperty("温度报警下限") + private Double tempWarnLower; + + @ApiModelProperty("温度报警上限") + private Double tempWarnUpper; + + @ApiModelProperty("温度报警开关") + private Boolean tempWarnCallOpen; + + @ApiModelProperty("温度报警免打扰开关") + private Boolean tempWarnCallNoDis; + + @ApiModelProperty("输入额定电压 测控一体") + private Double inputVoltage; + + @ApiModelProperty("告警码 测控一体") + private String warnCode; + + @TableField(exist = false) + private Integer online; + + @ApiModelProperty("deviceType 为2时，返回开关信息") + private List switches; + + // Setter 方法：保留两位小数 + public void setDissolvedOxygen(Double dissolvedOxygen) { + this.dissolvedOxygen = roundToTwoDecimals(dissolvedOxygen); + } + + public void setTemperature(Double temperature) { + this.temperature = roundToTwoDecimals(temperature); + } + + public void setSaturability(Double saturability) { + this.saturability = roundToTwoDecimals(saturability); + } + + public void setPH(Double pH) { + this.pH = roundToTwoDecimals(pH); + } + + public void setSalinity(Double salinity) { + this.salinity = roundToTwoDecimals(salinity); + } + + public void setOxyWarnLower(Double oxyWarnLower) { + this.oxyWarnLower = roundToTwoDecimals(oxyWarnLower); + } + + public void setTempWarnLower(Double tempWarnLower) { + this.tempWarnLower = roundToTwoDecimals(tempWarnLower); + } + + public void setTempWarnUpper(Double tempWarnUpper) { + this.tempWarnUpper = roundToTwoDecimals(tempWarnUpper); + } + + public void setInputVoltage(Double inputVoltage) { + this.inputVoltage = roundToTwoDecimals(inputVoltage); + } + + // 工具方法：保留两位小数 + private Double roundToTwoDecimals(Double value) { + if (value == null) { + return null; + } + return BigDecimal.valueOf(value) + .setScale(2, RoundingMode.HALF_UP) + .doubleValue(); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/CompareRequest.java b/fishery-core/src/main/java/com/limap/core/screen/vo/CompareRequest.java new file mode 100644 index 0000000..924a8ae --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/CompareRequest.java @@ -0,0 +1,17 @@ +package com.limap.core.screen.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @author jjb + */ +@Data +public class CompareRequest { + private Long deviceId; + + private String deviceName; + + private List history; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/CompareSearchVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/CompareSearchVo.java new file mode 100644 index 0000000..d84c196 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/CompareSearchVo.java @@ -0,0 +1,21 @@ +package com.limap.core.screen.vo; + + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * @author jjb + */ +@Data +public class CompareSearchVo { + + @NotNull(message = "设备不能为空") + private Long[] deviceIds; + + @NotNull(message = "请选择时间") + @Min(value = 1, message = "请选择正确的时间") + private Integer day; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitch.java b/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitch.java new file mode 100644 index 0000000..8e5c472 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitch.java @@ -0,0 +1,32 @@ +package com.limap.core.screen.vo; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "控制开关") +public class ControlSwitch { + + @ApiModelProperty("开关顺序") + private Integer index; + @ApiModelProperty("名称") + private String switchName; + private Long deviceId; + + @ApiModelProperty("当前测定电流") + private Double detectElectricValue; + @ApiModelProperty("当前测定电压") + private String detectVoltageValue; + @ApiModelProperty("接线方式设置。1-220V(A)，2-220V(B)，3-220V(C)，4-380V(ABC)") + private String connectVoltageType; + @ApiModelProperty("池塘id") + private Long pondId; + + @ApiModelProperty("池塘名称") + private String pondName; + + @ApiModelProperty("是否打开") + private Boolean openStatus; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitchVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitchVo.java new file mode 100644 index 0000000..8c636ce --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/ControlSwitchVo.java @@ -0,0 +1,25 @@ +package com.limap.core.screen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +public class ControlSwitchVo { + + @NotBlank(message = "iotId不能为空") + private String iotId; + + @NotNull(message = "开关标识不能为空") + private Integer index; + + @ApiModelProperty(value = "控制状态 0 1") + @NotNull(message = "控制状态不能为空") + @Min(value = 0,message = "控制状态只能是0或1") + @Max(value = 1,message = "控制状态只能是0或1") + private Integer status; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/EquipmentHistory.java b/fishery-core/src/main/java/com/limap/core/screen/vo/EquipmentHistory.java new file mode 100644 index 0000000..cdd1fff --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/EquipmentHistory.java @@ -0,0 +1,66 @@ +package com.limap.core.screen.vo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Date; + +@Data +@ApiModel(value = "EquipmentHistory", description = "历史数据") +public class EquipmentHistory { + + @ApiModelProperty("日期") + private String day; + @ApiModelProperty("时间") + private String time; + + @ApiModelProperty("溶氧") + private Double dissolvedOxygen; + + @ApiModelProperty("水温") + private Double temperature; + + @ApiModelProperty("饱和度") + private Double saturability; + + private Double pH; + + @ApiModelProperty("盐度") + private Double salinity; + + // Setter 方法：保留两位小数 + public void setDissolvedOxygen(Double dissolvedOxygen) { + this.dissolvedOxygen = roundToTwoDecimals(dissolvedOxygen); + } + + public void setTemperature(Double temperature) { + this.temperature = roundToTwoDecimals(temperature); + } + + public void setSaturability(Double saturability) { + this.saturability = roundToTwoDecimals(saturability); + } + + public void setPH(Double pH) { + this.pH = roundToTwoDecimals(pH); + } + + public void setSalinity(Double salinity) { + this.salinity = roundToTwoDecimals(salinity); + } + + // 工具方法：保留两位小数 + private Double roundToTwoDecimals(Double value) { + if (value == null) { + return null; + } + return BigDecimal.valueOf(value) + .setScale(2, RoundingMode.HALF_UP) + .doubleValue(); + } +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/PondVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/PondVo.java new file mode 100644 index 0000000..86126d8 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/PondVo.java @@ -0,0 +1,10 @@ +package com.limap.core.screen.vo; + +import lombok.Data; + +@Data +public class PondVo { + private Long id; + + private String pondName; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/SearchVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/SearchVo.java new file mode 100644 index 0000000..d9cb9ea --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/SearchVo.java @@ -0,0 +1,13 @@ +package com.limap.core.screen.vo; + +import lombok.Data; + +@Data +public class SearchVo { + + private Long[] pondIds; + + private String deviceType; + + private Long deviceId; +} diff --git a/fishery-core/src/main/java/com/limap/core/screen/vo/WarnVo.java b/fishery-core/src/main/java/com/limap/core/screen/vo/WarnVo.java new file mode 100644 index 0000000..28a4ab0 --- /dev/null +++ b/fishery-core/src/main/java/com/limap/core/screen/vo/WarnVo.java @@ -0,0 +1,21 @@ +package com.limap.core.screen.vo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class WarnVo { + private Long id; + + private String deviceName; + + private String title; + + private String message; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date creatTime; +} diff --git a/fishery-core/src/main/resources/mapper/AquDeviceDataHistoryMapper.xml b/fishery-core/src/main/resources/mapper/AquDeviceDataHistoryMapper.xml new file mode 100644 index 0000000..8029c63 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/AquDeviceDataHistoryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fishery-core/src/main/resources/mapper/AquDeviceMapper.xml b/fishery-core/src/main/resources/mapper/AquDeviceMapper.xml new file mode 100644 index 0000000..adc5314 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/AquDeviceMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fishery-core/src/main/resources/mapper/AquPayOrderMapper.xml b/fishery-core/src/main/resources/mapper/AquPayOrderMapper.xml new file mode 100644 index 0000000..545bec0 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/AquPayOrderMapper.xml @@ -0,0 +1,26 @@ + + + + + update aqu_pay_device set profit_status = 1 + where id in + + #{item.id} + + + + update aqu_device set warn_code = 0 where serial_num in( + SELECT DISTINCT apd.serial_num FROM aqu_pay_order apo + INNER JOIN aqu_pay_device apd on apo.id = apd.order_id + where apo.order_status = 2 + and apo.success_time >= now() - interval '2 minute' + and apd.serial_num is not null) + + + + + diff --git a/fishery-core/src/main/resources/mapper/BasicProfitSharingRecordMapper.xml b/fishery-core/src/main/resources/mapper/BasicProfitSharingRecordMapper.xml new file mode 100644 index 0000000..0281e6e --- /dev/null +++ b/fishery-core/src/main/resources/mapper/BasicProfitSharingRecordMapper.xml @@ -0,0 +1,30 @@ + + + + + + + diff --git a/fishery-core/src/main/resources/mapper/BasicProfitSharingUserMapper.xml b/fishery-core/src/main/resources/mapper/BasicProfitSharingUserMapper.xml new file mode 100644 index 0000000..34d4093 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/BasicProfitSharingUserMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + diff --git a/fishery-core/src/main/resources/mapper/BasicUserBindInfoMapper.xml b/fishery-core/src/main/resources/mapper/BasicUserBindInfoMapper.xml new file mode 100644 index 0000000..18fe8a2 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/BasicUserBindInfoMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + diff --git a/fishery-core/src/main/resources/mapper/DeviceSensorDataMapper.xml b/fishery-core/src/main/resources/mapper/DeviceSensorDataMapper.xml new file mode 100644 index 0000000..e1d0787 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/DeviceSensorDataMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + diff --git a/fishery-core/src/main/resources/mapper/ScreenMapper.xml b/fishery-core/src/main/resources/mapper/ScreenMapper.xml new file mode 100644 index 0000000..df37259 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/ScreenMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/fishery-core/src/main/resources/mapper/SysCellNumberMapper.xml b/fishery-core/src/main/resources/mapper/SysCellNumberMapper.xml new file mode 100644 index 0000000..e99fd40 --- /dev/null +++ b/fishery-core/src/main/resources/mapper/SysCellNumberMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/fishery-demo/pom.xml b/fishery-demo/pom.xml new file mode 100644 index 0000000..d623c86 --- /dev/null +++ b/fishery-demo/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + com.limap + fishery_base + 3.8.5 + + fishery-demo + demo演示模块 + + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-log + + + + + \ No newline at end of file diff --git a/fishery-demo/src/main/java/com/limap/demo/controller/DemoClassesController.java b/fishery-demo/src/main/java/com/limap/demo/controller/DemoClassesController.java new file mode 100644 index 0000000..d0bc81c --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/controller/DemoClassesController.java @@ -0,0 +1,98 @@ +package com.limap.demo.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.demo.domain.DemoClasses; +import com.limap.demo.service.IDemoClassesService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 主子表演示Controller + * + * @author metaee + * @date 2023-02-28 + */ +@RestController +@RequestMapping("/demo/classes") +public class DemoClassesController extends BaseController { + @Autowired + private IDemoClassesService demoClassesService; + + /** + * 查询主子表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:list')") + @GetMapping("/list") + public TableDataInfo list(DemoClasses demoClasses) { + startPage(); + List list = demoClassesService.selectDemoClassesList(demoClasses); + return getDataTable(list); + } + + /** + * 导出主子表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:export')") + @Log(title = "主子表演示", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DemoClasses demoClasses) { + List list = demoClassesService.selectDemoClassesList(demoClasses); + ExcelUtil util = new ExcelUtil(DemoClasses.class); + util.exportExcel(response, list, "主子表演示数据"); + } + + /** + * 获取主子表演示详细信息 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:query')") + @GetMapping(value = "/{classesId}") + public AjaxResult getInfo(@PathVariable("classesId") Long classesId) { + return success(demoClassesService.selectDemoClassesByClassesId(classesId)); + } + + /** + * 新增主子表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:add')") + @Log(title = "主子表演示", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DemoClasses demoClasses) { + return toAjax(demoClassesService.insertDemoClasses(demoClasses)); + } + + /** + * 修改主子表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:edit')") + @Log(title = "主子表演示", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DemoClasses demoClasses) { + return toAjax(demoClassesService.updateDemoClasses(demoClasses)); + } + + /** + * 删除主子表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:classes:remove')") + @Log(title = "主子表演示", businessType = BusinessType.DELETE) + @DeleteMapping("/{classesIds}") + public AjaxResult remove(@PathVariable Long[] classesIds) { + return toAjax(demoClassesService.deleteDemoClassesByClassesIds(classesIds)); + } +} diff --git a/fishery-demo/src/main/java/com/limap/demo/controller/DemoSchoolController.java b/fishery-demo/src/main/java/com/limap/demo/controller/DemoSchoolController.java new file mode 100644 index 0000000..f8984d5 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/controller/DemoSchoolController.java @@ -0,0 +1,97 @@ +package com.limap.demo.controller; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +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.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.demo.domain.DemoSchool; +import com.limap.demo.service.IDemoSchoolService; +import com.limap.common.utils.poi.ExcelUtil; + +/** + * 树表演示Controller + * + * @author metaee + * @date 2023-02-28 + */ +@RestController +@RequestMapping("/demo/school") +public class DemoSchoolController extends BaseController { + @Autowired + private IDemoSchoolService demoSchoolService; + + /** + * 查询树表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:school:list')") + @GetMapping("/list") + public AjaxResult list(DemoSchool demoSchool) { + List list = demoSchoolService.selectDemoSchoolList(demoSchool); + return success(list); + } + + /** + * 导出树表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:school:export')") + @Log(title = "树表演示", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DemoSchool demoSchool) { + List list = demoSchoolService.selectDemoSchoolList(demoSchool); + ExcelUtil util = new ExcelUtil(DemoSchool.class); + util.exportExcel(response, list, "树表演示数据"); + } + + /** + * 获取树表演示详细信息 + */ + @PreAuthorize("@ss.hasPermi('demo:school:query')") + @GetMapping(value = "/{schoolId}") + public AjaxResult getInfo(@PathVariable("schoolId") Long schoolId) { + return success(demoSchoolService.getById(schoolId)); + } + + /** + * 新增树表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:school:add')") + @Log(title = "树表演示", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DemoSchool demoSchool) { + return toAjax(demoSchoolService.save(demoSchool)); + } + + /** + * 修改树表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:school:edit')") + @Log(title = "树表演示", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DemoSchool demoSchool) { + return toAjax(demoSchoolService.updateById(demoSchool)); + } + + /** + * 删除树表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:school:remove')") + @Log(title = "树表演示", businessType = BusinessType.DELETE) + @DeleteMapping("/{schoolIds}") + public AjaxResult remove(@PathVariable Long[] schoolIds) { + return toAjax(demoSchoolService.removeByIds(Arrays.asList(schoolIds))); + } +} diff --git a/fishery-demo/src/main/java/com/limap/demo/controller/DemoStudentController.java b/fishery-demo/src/main/java/com/limap/demo/controller/DemoStudentController.java new file mode 100644 index 0000000..ff8163b --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/controller/DemoStudentController.java @@ -0,0 +1,99 @@ +package com.limap.demo.controller; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +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.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.demo.domain.DemoStudent; +import com.limap.demo.service.IDemoStudentService; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.common.core.page.TableDataInfo; + +/** + * 单表演示Controller + * + * @author metaee + * @date 2023-02-28 + */ +@RestController +@RequestMapping("/demo/student") +public class DemoStudentController extends BaseController { + @Autowired + private IDemoStudentService demoStudentService; + + /** + * 查询单表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:student:list')") + @GetMapping("/list") + public TableDataInfo list(DemoStudent demoStudent) { + startPage(); + List list = demoStudentService.selectDemoStudentList(demoStudent); + return getDataTable(list); + } + + /** + * 导出单表演示列表 + */ + @PreAuthorize("@ss.hasPermi('demo:student:export')") + @Log(title = "单表演示", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DemoStudent demoStudent) { + List list = demoStudentService.selectDemoStudentList(demoStudent); + ExcelUtil util = new ExcelUtil(DemoStudent.class); + util.exportExcel(response, list, "单表演示数据"); + } + + /** + * 获取单表演示详细信息 + */ + @PreAuthorize("@ss.hasPermi('demo:student:query')") + @GetMapping(value = "/{studentId}") + public AjaxResult getInfo(@PathVariable("studentId") Long studentId) { + return success(demoStudentService.getById(studentId)); + } + + /** + * 新增单表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:student:add')") + @Log(title = "单表演示", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DemoStudent demoStudent) { + return toAjax(demoStudentService.save(demoStudent)); + } + + /** + * 修改单表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:student:edit')") + @Log(title = "单表演示", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DemoStudent demoStudent) { + return toAjax(demoStudentService.updateById(demoStudent)); + } + + /** + * 删除单表演示 + */ + @PreAuthorize("@ss.hasPermi('demo:student:remove')") + @Log(title = "单表演示", businessType = BusinessType.DELETE) + @DeleteMapping("/{studentIds}") + public AjaxResult remove(@PathVariable Long[] studentIds) { + return toAjax(demoStudentService.removeByIds(Arrays.asList(studentIds))); + } +} diff --git a/fishery-demo/src/main/java/com/limap/demo/domain/DemoClasses.java b/fishery-demo/src/main/java/com/limap/demo/domain/DemoClasses.java new file mode 100644 index 0000000..cce307c --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/domain/DemoClasses.java @@ -0,0 +1,51 @@ +package com.limap.demo.domain; + +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BasePlusEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 主子表演示对象 demo_classes + * + * @author metaee + * @date 2023-02-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "demo_classes") +public class DemoClasses extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long classesId; + + /** 班级名称 */ + @Excel(name = "班级名称") + private String classesName; + + /** 班级年级 */ + @Excel(name = "班级年级") + private Long classesGrade; + + /** 班主任 */ + @Excel(name = "班主任") + private String classesTeacher; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 单表演示信息 */ + @TableField(exist = false) + private List demoStudentList; +} diff --git a/fishery-demo/src/main/java/com/limap/demo/domain/DemoSchool.java b/fishery-demo/src/main/java/com/limap/demo/domain/DemoSchool.java new file mode 100644 index 0000000..23520c7 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/domain/DemoSchool.java @@ -0,0 +1,37 @@ +package com.limap.demo.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.TreePlusEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 树表演示对象 demo_school + * + * @author metaee + * @date 2023-02-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "demo_school") +public class DemoSchool extends TreePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long schoolId; + + /** 学生名称 */ + @Excel(name = "学生名称") + private String schoolName; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; +} diff --git a/fishery-demo/src/main/java/com/limap/demo/domain/DemoStudent.java b/fishery-demo/src/main/java/com/limap/demo/domain/DemoStudent.java new file mode 100644 index 0000000..0729b69 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/domain/DemoStudent.java @@ -0,0 +1,57 @@ +package com.limap.demo.domain; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BasePlusEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 单表演示对象 demo_student + * + * @author metaee + * @date 2023-02-28 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "demo_student") +public class DemoStudent extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** 编号 */ + @TableId(type = IdType.AUTO) + private Long studentId; + + /** 所属班级ID */ + @Excel(name = "所属班级ID") + private Long classesId; + + /** 学生名称 */ + @Excel(name = "学生名称") + private String studentName; + + /** 年龄 */ + @Excel(name = "年龄") + private Long studentAge; + + /** 性别（0男 1女 2未知） */ + @Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知") + private String studentSex; + + /** 生日 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd") + private Date studentBirthday; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; +} diff --git a/fishery-demo/src/main/java/com/limap/demo/mapper/DemoClassesMapper.java b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoClassesMapper.java new file mode 100644 index 0000000..7b8f643 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoClassesMapper.java @@ -0,0 +1,20 @@ +package com.limap.demo.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.demo.domain.DemoClasses; + +/** + * 主子表演示Mapper接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface DemoClassesMapper extends BaseMapper { + /** + * 查询主子表演示 + * + * @param classesId 主子表演示主键 + * @return 主子表演示 + */ + public DemoClasses selectDemoClassesByClassesId(Long classesId); +} diff --git a/fishery-demo/src/main/java/com/limap/demo/mapper/DemoSchoolMapper.java b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoSchoolMapper.java new file mode 100644 index 0000000..95aac40 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoSchoolMapper.java @@ -0,0 +1,13 @@ +package com.limap.demo.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.demo.domain.DemoSchool; + +/** + * 树表演示Mapper接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface DemoSchoolMapper extends BaseMapper { +} diff --git a/fishery-demo/src/main/java/com/limap/demo/mapper/DemoStudentMapper.java b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoStudentMapper.java new file mode 100644 index 0000000..33b637f --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/mapper/DemoStudentMapper.java @@ -0,0 +1,13 @@ +package com.limap.demo.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.limap.demo.domain.DemoStudent; + +/** + * 单表演示Mapper接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface DemoStudentMapper extends BaseMapper { +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/IDemoClassesService.java b/fishery-demo/src/main/java/com/limap/demo/service/IDemoClassesService.java new file mode 100644 index 0000000..ed1e0ce --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/IDemoClassesService.java @@ -0,0 +1,60 @@ +package com.limap.demo.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.demo.domain.DemoClasses; + +/** + * 主子表演示Service接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface IDemoClassesService extends IService { + /** + * 查询主子表演示列表 + * + * @param demoClasses 主子表演示 + * @return 主子表演示集合 + */ + public List selectDemoClassesList(DemoClasses demoClasses); + /** + * 查询主子表演示 + * + * @param classesId 主子表演示主键 + * @return 主子表演示 + */ + public DemoClasses selectDemoClassesByClassesId(Long classesId); + + /** + * 新增主子表演示 + * + * @param demoClasses 主子表演示 + * @return 结果 + */ + public int insertDemoClasses(DemoClasses demoClasses); + + /** + * 修改主子表演示 + * + * @param demoClasses 主子表演示 + * @return 结果 + */ + public int updateDemoClasses(DemoClasses demoClasses); + + /** + * 批量删除主子表演示 + * + * @param classesIds 需要删除的主子表演示主键集合 + * @return 结果 + */ + public int deleteDemoClassesByClassesIds(Long[] classesIds); + + /** + * 删除主子表演示信息 + * + * @param classesId 主子表演示主键 + * @return 结果 + */ + public int deleteDemoClassesByClassesId(Long classesId); +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/IDemoSchoolService.java b/fishery-demo/src/main/java/com/limap/demo/service/IDemoSchoolService.java new file mode 100644 index 0000000..ece437c --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/IDemoSchoolService.java @@ -0,0 +1,21 @@ +package com.limap.demo.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.demo.domain.DemoSchool; + +/** + * 树表演示Service接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface IDemoSchoolService extends IService { + /** + * 查询树表演示列表 + * + * @param demoSchool 树表演示 + * @return 树表演示集合 + */ + public List selectDemoSchoolList(DemoSchool demoSchool); +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/IDemoStudentService.java b/fishery-demo/src/main/java/com/limap/demo/service/IDemoStudentService.java new file mode 100644 index 0000000..7a229fc --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/IDemoStudentService.java @@ -0,0 +1,21 @@ +package com.limap.demo.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.limap.demo.domain.DemoStudent; + +/** + * 单表演示Service接口 + * + * @author metaee + * @date 2023-02-28 + */ +public interface IDemoStudentService extends IService { + /** + * 查询单表演示列表 + * + * @param demoStudent 单表演示 + * @return 单表演示集合 + */ + public List selectDemoStudentList(DemoStudent demoStudent); +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoClassesServiceImpl.java b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoClassesServiceImpl.java new file mode 100644 index 0000000..8c753c1 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoClassesServiceImpl.java @@ -0,0 +1,141 @@ +package com.limap.demo.service.impl; + +import java.util.List; +import com.limap.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import java.util.Arrays; +import org.springframework.transaction.annotation.Transactional; +import com.limap.demo.domain.DemoStudent; +import com.limap.demo.mapper.DemoStudentMapper; +import com.limap.demo.mapper.DemoClassesMapper; +import com.limap.demo.domain.DemoClasses; +import com.limap.demo.service.IDemoClassesService; + +/** + * 主子表演示Service业务层处理 + * + * @author metaee + * @date 2023-02-28 + */ +@Service +public class DemoClassesServiceImpl extends ServiceImpl implements IDemoClassesService { + @Autowired + private DemoClassesMapper demoClassesMapper; + + @Autowired + private DemoStudentMapper demoStudentMapper; + + /** + * 查询主子表演示列表 + * + * @param demoClasses 主子表演示 + * @return 主子表演示 + */ + @Override + public List selectDemoClassesList(DemoClasses demoClasses) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotEmpty(demoClasses.getClassesName())) { + queryWrapper.like(DemoClasses::getClassesName, demoClasses.getClassesName()); + } + if (StringUtils.isNotEmpty(demoClasses.getStatus())) { + queryWrapper.eq(DemoClasses::getStatus, demoClasses.getStatus()); + } + return demoClassesMapper.selectList(queryWrapper); + } + + /** + * 查询主子表演示 + * + * @param classesId 主子表演示主键 + * @return 主子表演示 + */ + @Override + public DemoClasses selectDemoClassesByClassesId(Long classesId) { + return demoClassesMapper.selectDemoClassesByClassesId(classesId); + } + + /** + * 新增主子表演示 + * + * @param demoClasses 主子表演示 + * @return 结果 + */ + @Transactional + @Override + public int insertDemoClasses(DemoClasses demoClasses) { + demoClasses.setCreateTime(DateUtils.getNowDate()); + int rows = demoClassesMapper.insert(demoClasses); + insertDemoStudent(demoClasses); + return rows; + } + + /** + * 修改主子表演示 + * + * @param demoClasses 主子表演示 + * @return 结果 + */ + @Transactional + @Override + public int updateDemoClasses(DemoClasses demoClasses) { + demoClasses.setUpdateTime(DateUtils.getNowDate()); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(DemoStudent::getClassesId, demoClasses.getClassesId()); + demoStudentMapper.delete(queryWrapper); + + insertDemoStudent(demoClasses); + return demoClassesMapper.updateById(demoClasses); + } + + /** + * 批量删除主子表演示 + * + * @param classesIds 需要删除的主子表演示主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteDemoClassesByClassesIds(Long[] classesIds) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.in(DemoStudent::getClassesId, Arrays.asList(classesIds)); + demoStudentMapper.delete(queryWrapper); + return demoClassesMapper.deleteBatchIds(Arrays.asList(classesIds)); + } + + /** + * 删除主子表演示信息 + * + * @param classesId 主子表演示主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteDemoClassesByClassesId(Long classesId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(DemoStudent::getClassesId, classesId); + demoStudentMapper.delete(queryWrapper); + return demoClassesMapper.deleteById(classesId); + } + + /** + * 新增单表演示信息 + * + * @param demoClasses 主子表演示对象 + */ + public void insertDemoStudent(DemoClasses demoClasses) { + List demoStudentList = demoClasses.getDemoStudentList(); + Long classesId = demoClasses.getClassesId(); + if (StringUtils.isNotNull(demoStudentList)) { + for (DemoStudent demoStudent : demoStudentList) { + demoStudent.setClassesId(classesId); + demoStudentMapper.insert(demoStudent); + } + } + } + +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoSchoolServiceImpl.java b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoSchoolServiceImpl.java new file mode 100644 index 0000000..4ceb449 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoSchoolServiceImpl.java @@ -0,0 +1,42 @@ +package com.limap.demo.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.demo.mapper.DemoSchoolMapper; +import com.limap.demo.domain.DemoSchool; +import com.limap.demo.service.IDemoSchoolService; + +/** + * 树表演示Service业务层处理 + * + * @author metaee + * @date 2023-02-28 + */ +@Service +public class DemoSchoolServiceImpl extends ServiceImpl implements IDemoSchoolService { + @Autowired + private DemoSchoolMapper demoSchoolMapper; + + /** + * 查询树表演示列表 + * + * @param demoSchool 树表演示 + * @return 树表演示 + */ + @Override + public List selectDemoSchoolList(DemoSchool demoSchool) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotEmpty(demoSchool.getSchoolName())) { + queryWrapper.like(DemoSchool::getSchoolName, demoSchool.getSchoolName()); + } + if (StringUtils.isNotEmpty(demoSchool.getStatus())) { + queryWrapper.eq(DemoSchool::getStatus, demoSchool.getStatus()); + } + return demoSchoolMapper.selectList(queryWrapper); + } +} diff --git a/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoStudentServiceImpl.java b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoStudentServiceImpl.java new file mode 100644 index 0000000..e647f80 --- /dev/null +++ b/fishery-demo/src/main/java/com/limap/demo/service/impl/DemoStudentServiceImpl.java @@ -0,0 +1,45 @@ +package com.limap.demo.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +import com.limap.demo.mapper.DemoStudentMapper; +import com.limap.demo.domain.DemoStudent; +import com.limap.demo.service.IDemoStudentService; + +/** + * 单表演示Service业务层处理 + * + * @author metaee + * @date 2023-02-28 + */ +@Service +public class DemoStudentServiceImpl extends ServiceImpl implements IDemoStudentService { + @Autowired + private DemoStudentMapper demoStudentMapper; + + /** + * 查询单表演示列表 + * + * @param demoStudent 单表演示 + * @return 单表演示 + */ + @Override + public List selectDemoStudentList(DemoStudent demoStudent) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); + if (StringUtils.isNotEmpty(demoStudent.getStudentName())) { + queryWrapper.like(DemoStudent::getStudentName, demoStudent.getStudentName()); + } + if (StringUtils.isNotEmpty(demoStudent.getStudentSex())) { + queryWrapper.eq(DemoStudent::getStudentSex, demoStudent.getStudentSex()); + } + if (StringUtils.isNotEmpty(demoStudent.getStatus())) { + queryWrapper.eq(DemoStudent::getStatus, demoStudent.getStatus()); + } + return demoStudentMapper.selectList(queryWrapper); + } +} diff --git a/fishery-demo/src/main/resources/mapper/demo/DemoClassesMapper.xml b/fishery-demo/src/main/resources/mapper/demo/DemoClassesMapper.xml new file mode 100644 index 0000000..3763325 --- /dev/null +++ b/fishery-demo/src/main/resources/mapper/demo/DemoClassesMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fishery-demo/src/main/resources/mapper/demo/DemoSchoolMapper.xml b/fishery-demo/src/main/resources/mapper/demo/DemoSchoolMapper.xml new file mode 100644 index 0000000..a513529 --- /dev/null +++ b/fishery-demo/src/main/resources/mapper/demo/DemoSchoolMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/fishery-demo/src/main/resources/mapper/demo/DemoStudentMapper.xml b/fishery-demo/src/main/resources/mapper/demo/DemoStudentMapper.xml new file mode 100644 index 0000000..613f9e4 --- /dev/null +++ b/fishery-demo/src/main/resources/mapper/demo/DemoStudentMapper.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/fishery-generator/pom.xml b/fishery-generator/pom.xml new file mode 100644 index 0000000..d74ea97 --- /dev/null +++ b/fishery-generator/pom.xml @@ -0,0 +1,46 @@ + + + + fishery_base + com.limap + 3.8.5 + + 4.0.0 + + fishery-generator + + + generator代码生成 + + + + + + + org.apache.velocity + velocity-engine-core + + + + + commons-collections + commons-collections + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-log + + + + + \ No newline at end of file diff --git a/fishery-generator/src/main/java/com/limap/generator/config/GenConfig.java b/fishery-generator/src/main/java/com/limap/generator/config/GenConfig.java new file mode 100644 index 0000000..727d75d --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/config/GenConfig.java @@ -0,0 +1,73 @@ +package com.limap.generator.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.PropertySource; +import org.springframework.stereotype.Component; + +/** + * 读取代码生成相关配置 + * + * @author limap + */ +@Component +@ConfigurationProperties(prefix = "gen") +@PropertySource(value = { "classpath:generator.yml" }) +public class GenConfig +{ + /** 作者 */ + public static String author; + + /** 生成包路径 */ + public static String packageName; + + /** 自动去除表前缀，默认是false */ + public static boolean autoRemovePre; + + /** 表前缀(类名不会包含表前缀) */ + public static String tablePrefix; + + public static String getAuthor() + { + return author; + } + + @Value("${author}") + public void setAuthor(String author) + { + GenConfig.author = author; + } + + public static String getPackageName() + { + return packageName; + } + + @Value("${packageName}") + public void setPackageName(String packageName) + { + GenConfig.packageName = packageName; + } + + public static boolean getAutoRemovePre() + { + return autoRemovePre; + } + + @Value("${autoRemovePre}") + public void setAutoRemovePre(boolean autoRemovePre) + { + GenConfig.autoRemovePre = autoRemovePre; + } + + public static String getTablePrefix() + { + return tablePrefix; + } + + @Value("${tablePrefix}") + public void setTablePrefix(String tablePrefix) + { + GenConfig.tablePrefix = tablePrefix; + } +} diff --git a/fishery-generator/src/main/java/com/limap/generator/controller/GenController.java b/fishery-generator/src/main/java/com/limap/generator/controller/GenController.java new file mode 100644 index 0000000..f66725c --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/controller/GenController.java @@ -0,0 +1,215 @@ +package com.limap.generator.controller; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.core.text.Convert; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.generator.domain.GenTable; +import com.limap.generator.domain.GenTableColumn; +import com.limap.generator.service.IGenTableColumnService; +import com.limap.generator.service.IGenTableService; + +/** + * 代码生成 操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/tool/gen") +public class GenController extends BaseController +{ + @Autowired + private IGenTableService genTableService; + + @Autowired + private IGenTableColumnService genTableColumnService; + + /** + * 查询代码生成列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @GetMapping("/list") + public TableDataInfo genList(GenTable genTable) + { + startPage(); + List list = genTableService.selectGenTableList(genTable); + return getDataTable(list); + } + + /** + * 修改代码生成业务 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:query')") + @GetMapping(value = "/{tableId}") + public AjaxResult getInfo(@PathVariable Long tableId) + { + GenTable table = genTableService.selectGenTableById(tableId); + List tables = genTableService.selectGenTableAll(); + List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); + Map map = new HashMap(); + map.put("info", table); + map.put("rows", list); + map.put("tables", tables); + return success(map); + } + + /** + * 查询数据库列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @GetMapping("/db/list") + public TableDataInfo dataList(GenTable genTable) + { + startPage(); + List list = genTableService.selectDbTableList(genTable); + return getDataTable(list); + } + + /** + * 查询数据表字段列表 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @GetMapping(value = "/column/{tableId}") + public TableDataInfo columnList(Long tableId) + { + TableDataInfo dataInfo = new TableDataInfo(); + List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); + dataInfo.setRows(list); + dataInfo.setTotal(list.size()); + return dataInfo; + } + + /** + * 导入表结构（保存） + */ + @PreAuthorize("@ss.hasPermi('tool:gen:import')") + @Log(title = "代码生成", businessType = BusinessType.IMPORT) + @PostMapping("/importTable") + public AjaxResult importTableSave(String tables) + { + String[] tableNames = Convert.toStrArray(tables); + // 查询表信息 + List tableList = genTableService.selectDbTableListByNames(tableNames); + genTableService.importGenTable(tableList); + return success(); + } + + /** + * 修改保存代码生成业务 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult editSave(@Validated @RequestBody GenTable genTable) + { + genTableService.validateEdit(genTable); + genTableService.updateGenTable(genTable); + return success(); + } + + /** + * 删除代码生成 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:remove')") + @Log(title = "代码生成", businessType = BusinessType.DELETE) + @DeleteMapping("/{tableIds}") + public AjaxResult remove(@PathVariable Long[] tableIds) + { + genTableService.deleteGenTableByIds(tableIds); + return success(); + } + + /** + * 预览代码 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:preview')") + @GetMapping("/preview/{tableId}") + public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException + { + Map dataMap = genTableService.previewCode(tableId); + return success(dataMap); + } + + /** + * 生成代码（下载方式） + */ + @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/download/{tableName}") + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException + { + byte[] data = genTableService.downloadCode(tableName); + genCode(response, data); + } + + /** + * 生成代码（自定义路径） + */ + @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/genCode/{tableName}") + public AjaxResult genCode(@PathVariable("tableName") String tableName) + { + genTableService.generatorCode(tableName); + return success(); + } + + /** + * 同步数据库 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @GetMapping("/synchDb/{tableName}") + public AjaxResult synchDb(@PathVariable("tableName") String tableName) + { + genTableService.synchDb(tableName); + return success(); + } + + /** + * 批量生成代码 + */ + @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @GetMapping("/batchGenCode") + public void batchGenCode(HttpServletResponse response, String tables) throws IOException + { + String[] tableNames = Convert.toStrArray(tables); + byte[] data = genTableService.downloadCode(tableNames); + genCode(response, data); + } + + /** + * 生成zip文件 + */ + private void genCode(HttpServletResponse response, byte[] data) throws IOException + { + response.reset(); + response.addHeader("Access-Control-Allow-Origin", "*"); + response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("Content-Disposition", "attachment; filename=\"limap.zip\""); + response.addHeader("Content-Length", "" + data.length); + response.setContentType("application/octet-stream; charset=UTF-8"); + IOUtils.write(data, response.getOutputStream()); + } +} \ No newline at end of file diff --git a/fishery-generator/src/main/java/com/limap/generator/domain/GenTable.java b/fishery-generator/src/main/java/com/limap/generator/domain/GenTable.java new file mode 100644 index 0000000..c7443a7 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/domain/GenTable.java @@ -0,0 +1,383 @@ +package com.limap.generator.domain; + +import java.util.List; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import org.apache.commons.lang3.ArrayUtils; +import com.limap.common.constant.GenConstants; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.utils.StringUtils; + +/** + * 业务表 gen_table + * + * @author limap + */ +public class GenTable extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long tableId; + + /** 表名称 */ + @NotBlank(message = "表名称不能为空") + private String tableName; + + /** 表描述 */ + @NotBlank(message = "表描述不能为空") + private String tableComment; + + /** 关联父表的表名 */ + private String subTableName; + + /** 本表关联父表的外键名 */ + private String subTableFkName; + + /** 实体类名称(首字母大写) */ + @NotBlank(message = "实体类名称不能为空") + private String className; + + /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */ + private String tplCategory; + + /** 生成包路径 */ + @NotBlank(message = "生成包路径不能为空") + private String packageName; + + /** 生成模块名 */ + @NotBlank(message = "生成模块名不能为空") + private String moduleName; + + /** 生成业务名 */ + @NotBlank(message = "生成业务名不能为空") + private String businessName; + + /** 生成功能名 */ + @NotBlank(message = "生成功能名不能为空") + private String functionName; + + /** 生成作者 */ + @NotBlank(message = "作者不能为空") + private String functionAuthor; + + /** 生成代码方式（0zip压缩包 1自定义路径） */ + private String genType; + + /** 生成代码风格（0原生mybatis 1增强mybatis-plus） */ + private String codeType; + + /** 生成路径（不填默认项目路径） */ + private String genPath; + + /** 主键信息 */ + private GenTableColumn pkColumn; + + /** 子表信息 */ + private GenTable subTable; + + /** 表列信息 */ + @Valid + private List columns; + + /** 其它生成选项 */ + private String options; + + /** 树编码字段 */ + private String treeCode; + + /** 树父编码字段 */ + private String treeParentCode; + + /** 树名称字段 */ + private String treeName; + + /** 上级菜单ID字段 */ + private String parentMenuId; + + /** 上级菜单名称字段 */ + private String parentMenuName; + + public Long getTableId() + { + return tableId; + } + + public void setTableId(Long tableId) + { + this.tableId = tableId; + } + + public String getTableName() + { + return tableName; + } + + public void setTableName(String tableName) + { + this.tableName = tableName; + } + + public String getTableComment() + { + return tableComment; + } + + public void setTableComment(String tableComment) + { + this.tableComment = tableComment; + } + + public String getSubTableName() + { + return subTableName; + } + + public void setSubTableName(String subTableName) + { + this.subTableName = subTableName; + } + + public String getSubTableFkName() + { + return subTableFkName; + } + + public void setSubTableFkName(String subTableFkName) + { + this.subTableFkName = subTableFkName; + } + + public String getClassName() + { + return className; + } + + public void setClassName(String className) + { + this.className = className; + } + + public String getTplCategory() + { + return tplCategory; + } + + public void setTplCategory(String tplCategory) + { + this.tplCategory = tplCategory; + } + + public String getPackageName() + { + return packageName; + } + + public void setPackageName(String packageName) + { + this.packageName = packageName; + } + + public String getModuleName() + { + return moduleName; + } + + public void setModuleName(String moduleName) + { + this.moduleName = moduleName; + } + + public String getBusinessName() + { + return businessName; + } + + public void setBusinessName(String businessName) + { + this.businessName = businessName; + } + + public String getFunctionName() + { + return functionName; + } + + public void setFunctionName(String functionName) + { + this.functionName = functionName; + } + + public String getFunctionAuthor() + { + return functionAuthor; + } + + public void setFunctionAuthor(String functionAuthor) + { + this.functionAuthor = functionAuthor; + } + + public String getGenType() + { + return genType; + } + + public void setGenType(String genType) + { + this.genType = genType; + } + + public String getGenPath() + { + return genPath; + } + + public void setGenPath(String genPath) + { + this.genPath = genPath; + } + + public GenTableColumn getPkColumn() + { + return pkColumn; + } + + public void setPkColumn(GenTableColumn pkColumn) + { + this.pkColumn = pkColumn; + } + + public GenTable getSubTable() + { + return subTable; + } + + public void setSubTable(GenTable subTable) + { + this.subTable = subTable; + } + + public List getColumns() + { + return columns; + } + + public void setColumns(List columns) + { + this.columns = columns; + } + + public String getOptions() + { + return options; + } + + public void setOptions(String options) + { + this.options = options; + } + + public String getTreeCode() + { + return treeCode; + } + + public void setTreeCode(String treeCode) + { + this.treeCode = treeCode; + } + + public String getTreeParentCode() + { + return treeParentCode; + } + + public void setTreeParentCode(String treeParentCode) + { + this.treeParentCode = treeParentCode; + } + + public String getTreeName() + { + return treeName; + } + + public void setTreeName(String treeName) + { + this.treeName = treeName; + } + + public String getParentMenuId() + { + return parentMenuId; + } + + public void setParentMenuId(String parentMenuId) + { + this.parentMenuId = parentMenuId; + } + + public String getParentMenuName() + { + return parentMenuName; + } + + public void setParentMenuName(String parentMenuName) + { + this.parentMenuName = parentMenuName; + } + + public boolean isSub() + { + return isSub(this.tplCategory); + } + + public static boolean isSub(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); + } + + public boolean isTree() + { + return isTree(this.tplCategory); + } + + public static boolean isTree(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); + } + + public boolean isCrud() + { + return isCrud(this.tplCategory); + } + + public static boolean isCrud(String tplCategory) + { + return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); + } + + public boolean isSuperColumn(String javaField) + { + return isSuperColumn(this.tplCategory, javaField); + } + + public static boolean isSuperColumn(String tplCategory, String javaField) + { + if (isTree(tplCategory)) + { + return StringUtils.equalsAnyIgnoreCase(javaField, + ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); + } + return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); + } + + public String getCodeType() { + return codeType; + } + + public void setCodeType(String codeType) { + this.codeType = codeType; + } +} \ No newline at end of file diff --git a/fishery-generator/src/main/java/com/limap/generator/domain/GenTableColumn.java b/fishery-generator/src/main/java/com/limap/generator/domain/GenTableColumn.java new file mode 100644 index 0000000..449a1bf --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/domain/GenTableColumn.java @@ -0,0 +1,373 @@ +package com.limap.generator.domain; + +import javax.validation.constraints.NotBlank; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.utils.StringUtils; + +/** + * 代码生成业务字段表 gen_table_column + * + * @author limap + */ +public class GenTableColumn extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编号 */ + private Long columnId; + + /** 归属表编号 */ + private Long tableId; + + /** 列名称 */ + private String columnName; + + /** 列描述 */ + private String columnComment; + + /** 列类型 */ + private String columnType; + + /** JAVA类型 */ + private String javaType; + + /** JAVA字段名 */ + @NotBlank(message = "Java属性不能为空") + private String javaField; + + /** 是否主键（1是） */ + private String isPk; + + /** 是否自增（1是） */ + private String isIncrement; + + /** 是否必填（1是） */ + private String isRequired; + + /** 是否为插入字段（1是） */ + private String isInsert; + + /** 是否编辑字段（1是） */ + private String isEdit; + + /** 是否列表字段（1是） */ + private String isList; + + /** 是否查询字段（1是） */ + private String isQuery; + + /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */ + private String queryType; + + /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */ + private String htmlType; + + /** 字典类型 */ + private String dictType; + + /** 排序 */ + private Integer sort; + + public void setColumnId(Long columnId) + { + this.columnId = columnId; + } + + public Long getColumnId() + { + return columnId; + } + + public void setTableId(Long tableId) + { + this.tableId = tableId; + } + + public Long getTableId() + { + return tableId; + } + + public void setColumnName(String columnName) + { + this.columnName = columnName; + } + + public String getColumnName() + { + return columnName; + } + + public void setColumnComment(String columnComment) + { + this.columnComment = columnComment; + } + + public String getColumnComment() + { + return columnComment; + } + + public void setColumnType(String columnType) + { + this.columnType = columnType; + } + + public String getColumnType() + { + return columnType; + } + + public void setJavaType(String javaType) + { + this.javaType = javaType; + } + + public String getJavaType() + { + return javaType; + } + + public void setJavaField(String javaField) + { + this.javaField = javaField; + } + + public String getJavaField() + { + return javaField; + } + + public String getCapJavaField() + { + return StringUtils.capitalize(javaField); + } + + public void setIsPk(String isPk) + { + this.isPk = isPk; + } + + public String getIsPk() + { + return isPk; + } + + public boolean isPk() + { + return isPk(this.isPk); + } + + public boolean isPk(String isPk) + { + return isPk != null && StringUtils.equals("1", isPk); + } + + public String getIsIncrement() + { + return isIncrement; + } + + public void setIsIncrement(String isIncrement) + { + this.isIncrement = isIncrement; + } + + public boolean isIncrement() + { + return isIncrement(this.isIncrement); + } + + public boolean isIncrement(String isIncrement) + { + return isIncrement != null && StringUtils.equals("1", isIncrement); + } + + public void setIsRequired(String isRequired) + { + this.isRequired = isRequired; + } + + public String getIsRequired() + { + return isRequired; + } + + public boolean isRequired() + { + return isRequired(this.isRequired); + } + + public boolean isRequired(String isRequired) + { + return isRequired != null && StringUtils.equals("1", isRequired); + } + + public void setIsInsert(String isInsert) + { + this.isInsert = isInsert; + } + + public String getIsInsert() + { + return isInsert; + } + + public boolean isInsert() + { + return isInsert(this.isInsert); + } + + public boolean isInsert(String isInsert) + { + return isInsert != null && StringUtils.equals("1", isInsert); + } + + public void setIsEdit(String isEdit) + { + this.isEdit = isEdit; + } + + public String getIsEdit() + { + return isEdit; + } + + public boolean isEdit() + { + return isInsert(this.isEdit); + } + + public boolean isEdit(String isEdit) + { + return isEdit != null && StringUtils.equals("1", isEdit); + } + + public void setIsList(String isList) + { + this.isList = isList; + } + + public String getIsList() + { + return isList; + } + + public boolean isList() + { + return isList(this.isList); + } + + public boolean isList(String isList) + { + return isList != null && StringUtils.equals("1", isList); + } + + public void setIsQuery(String isQuery) + { + this.isQuery = isQuery; + } + + public String getIsQuery() + { + return isQuery; + } + + public boolean isQuery() + { + return isQuery(this.isQuery); + } + + public boolean isQuery(String isQuery) + { + return isQuery != null && StringUtils.equals("1", isQuery); + } + + public void setQueryType(String queryType) + { + this.queryType = queryType; + } + + public String getQueryType() + { + return queryType; + } + + public String getHtmlType() + { + return htmlType; + } + + public void setHtmlType(String htmlType) + { + this.htmlType = htmlType; + } + + public void setDictType(String dictType) + { + this.dictType = dictType; + } + + public String getDictType() + { + return dictType; + } + + public void setSort(Integer sort) + { + this.sort = sort; + } + + public Integer getSort() + { + return sort; + } + + public boolean isSuperColumn() + { + return isSuperColumn(this.javaField); + } + + public static boolean isSuperColumn(String javaField) + { + return StringUtils.equalsAnyIgnoreCase(javaField, + // BaseEntity + "createBy", "createTime", "updateBy", "updateTime", "remark", + // TreeEntity + "parentName", "parentId", "orderNum", "ancestors"); + } + + public boolean isUsableColumn() + { + return isUsableColumn(javaField); + } + + public static boolean isUsableColumn(String javaField) + { + // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 + return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); + } + + public String readConverterExp() + { + String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); + StringBuffer sb = new StringBuffer(); + if (StringUtils.isNotEmpty(remarks)) + { + for (String value : remarks.split(" ")) + { + if (StringUtils.isNotEmpty(value)) + { + Object startStr = value.subSequence(0, 1); + String endStr = value.substring(1); + sb.append("").append(startStr).append("=").append(endStr).append(","); + } + } + return sb.deleteCharAt(sb.length() - 1).toString(); + } + else + { + return this.columnComment; + } + } +} diff --git a/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableColumnMapper.java b/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableColumnMapper.java new file mode 100644 index 0000000..42a0be2 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableColumnMapper.java @@ -0,0 +1,63 @@ +package com.limap.generator.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.generator.domain.GenTableColumn; + +/** + * 业务字段 数据层 + * + * @author limap + */ +@DS("master") +public interface GenTableColumnMapper +{ + /** + * 根据表名称查询列信息 + * + * @param tableName 表名称 + * @return 列信息 + */ + public List selectDbTableColumnsByName(String tableName); + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + public List selectGenTableColumnListByTableId(Long tableId); + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int insertGenTableColumn(GenTableColumn genTableColumn); + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int updateGenTableColumn(GenTableColumn genTableColumn); + + /** + * 删除业务字段 + * + * @param genTableColumns 列数据 + * @return 结果 + */ + public int deleteGenTableColumns(List genTableColumns); + + /** + * 批量删除业务字段 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableColumnByIds(Long[] ids); +} diff --git a/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableMapper.java b/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableMapper.java new file mode 100644 index 0000000..fd0869f --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/mapper/GenTableMapper.java @@ -0,0 +1,86 @@ +package com.limap.generator.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.generator.domain.GenTable; + +/** + * 业务 数据层 + * + * @author limap + */ +@DS("master") +public interface GenTableMapper +{ + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + public List selectGenTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + public List selectDbTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + public List selectDbTableListByNames(String[] tableNames); + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + public List selectGenTableAll(); + + /** + * 查询表ID业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + public GenTable selectGenTableById(Long id); + + /** + * 查询表名称业务信息 + * + * @param tableName 表名称 + * @return 业务信息 + */ + public GenTable selectGenTableByName(String tableName); + + /** + * 新增业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public int insertGenTable(GenTable genTable); + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public int updateGenTable(GenTable genTable); + + /** + * 批量删除业务 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableByIds(Long[] ids); +} diff --git a/fishery-generator/src/main/java/com/limap/generator/service/GenTableColumnServiceImpl.java b/fishery-generator/src/main/java/com/limap/generator/service/GenTableColumnServiceImpl.java new file mode 100644 index 0000000..360dd6c --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/service/GenTableColumnServiceImpl.java @@ -0,0 +1,68 @@ +package com.limap.generator.service; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.core.text.Convert; +import com.limap.generator.domain.GenTableColumn; +import com.limap.generator.mapper.GenTableColumnMapper; + +/** + * 业务字段 服务层实现 + * + * @author limap + */ +@Service +public class GenTableColumnServiceImpl implements IGenTableColumnService +{ + @Autowired + private GenTableColumnMapper genTableColumnMapper; + + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + @Override + public List selectGenTableColumnListByTableId(Long tableId) + { + return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); + } + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + @Override + public int insertGenTableColumn(GenTableColumn genTableColumn) + { + return genTableColumnMapper.insertGenTableColumn(genTableColumn); + } + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + @Override + public int updateGenTableColumn(GenTableColumn genTableColumn) + { + return genTableColumnMapper.updateGenTableColumn(genTableColumn); + } + + /** + * 删除业务字段对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteGenTableColumnByIds(String ids) + { + return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); + } +} diff --git a/fishery-generator/src/main/java/com/limap/generator/service/GenTableServiceImpl.java b/fishery-generator/src/main/java/com/limap/generator/service/GenTableServiceImpl.java new file mode 100644 index 0000000..eadf5fa --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/service/GenTableServiceImpl.java @@ -0,0 +1,543 @@ +package com.limap.generator.service; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.StringWriter; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.limap.common.constant.Constants; +import com.limap.common.constant.GenConstants; +import com.limap.common.core.text.CharsetKit; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.generator.domain.GenTable; +import com.limap.generator.domain.GenTableColumn; +import com.limap.generator.mapper.GenTableColumnMapper; +import com.limap.generator.mapper.GenTableMapper; +import com.limap.generator.util.GenUtils; +import com.limap.generator.util.VelocityInitializer; +import com.limap.generator.util.VelocityUtils; + +/** + * 业务 服务层实现 + * + * @author limap + */ +@Service +public class GenTableServiceImpl implements IGenTableService +{ + private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); + + @Autowired + private GenTableMapper genTableMapper; + + @Autowired + private GenTableColumnMapper genTableColumnMapper; + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + @Override + public GenTable selectGenTableById(Long id) + { + GenTable genTable = genTableMapper.selectGenTableById(id); + setTableFromOptions(genTable); + return genTable; + } + + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + @Override + public List selectGenTableList(GenTable genTable) + { + return genTableMapper.selectGenTableList(genTable); + } + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + @Override + public List selectDbTableList(GenTable genTable) + { + return genTableMapper.selectDbTableList(genTable); + } + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + @Override + public List selectDbTableListByNames(String[] tableNames) + { + return genTableMapper.selectDbTableListByNames(tableNames); + } + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + @Override + public List selectGenTableAll() + { + return genTableMapper.selectGenTableAll(); + } + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + @Override + @Transactional + public void updateGenTable(GenTable genTable) + { + String options = JSON.toJSONString(genTable.getParams()); + genTable.setOptions(options); + int row = genTableMapper.updateGenTable(genTable); + if (row > 0) + { + for (GenTableColumn cenTableColumn : genTable.getColumns()) + { + genTableColumnMapper.updateGenTableColumn(cenTableColumn); + } + } + } + + /** + * 删除业务对象 + * + * @param tableIds 需要删除的数据ID + * @return 结果 + */ + @Override + @Transactional + public void deleteGenTableByIds(Long[] tableIds) + { + genTableMapper.deleteGenTableByIds(tableIds); + genTableColumnMapper.deleteGenTableColumnByIds(tableIds); + } + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + */ + @Override + @Transactional + public void importGenTable(List tableList) + { + String operName = SecurityUtils.getUsername(); + try + { + for (GenTable table : tableList) + { + String tableName = table.getTableName(); + GenUtils.initTable(table, operName); + int row = genTableMapper.insertGenTable(table); + if (row > 0) + { + // 保存列信息 + List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); + for (GenTableColumn column : genTableColumns) + { + GenUtils.initColumnField(column, table); + genTableColumnMapper.insertGenTableColumn(column); + } + } + } + } + catch (Exception e) + { + throw new ServiceException("导入失败：" + e.getMessage()); + } + } + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + @Override + public Map previewCode(Long tableId) + { + Map dataMap = new LinkedHashMap<>(); + // 查询表信息 + GenTable table = genTableMapper.selectGenTableById(tableId); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = null; + if("0".equals(table.getCodeType())) { + templates = VelocityUtils.getTemplateList(table.getTplCategory()); + } else { + templates = VelocityUtils.getTemplateListPlus(table.getTplCategory()); + } + + for (String template : templates) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + dataMap.put(template, sw.toString()); + } + return dataMap; + } + + /** + * 生成代码（下载方式） + * + * @param tableName 表名称 + * @return 数据 + */ + @Override + public byte[] downloadCode(String tableName) + { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + generatorCode(tableName, zip); + IOUtils.closeQuietly(zip); + return outputStream.toByteArray(); + } + + /** + * 生成代码（自定义路径） + * + * @param tableName 表名称 + */ + @Override + public void generatorCode(String tableName) + { + // 查询表信息 + GenTable table = genTableMapper.selectGenTableByName(tableName); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = null; + if("0".equals(table.getCodeType())) { + templates = VelocityUtils.getTemplateList(table.getTplCategory()); + } else { + templates = VelocityUtils.getTemplateListPlus(table.getTplCategory()); + } + + for (String template : templates) + { + // 20230224--update + //if (!StringUtils.endsWith(template,"index-tree.vue.vm")) + if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try + { + String path = getGenPath(table, template); + FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); + } + catch (IOException e) + { + throw new ServiceException("渲染模板失败，表名：" + table.getTableName()); + } + } + } + } + + /** + * 同步数据库 + * + * @param tableName 表名称 + */ + @Override + @Transactional + public void synchDb(String tableName) + { + GenTable table = genTableMapper.selectGenTableByName(tableName); + List tableColumns = table.getColumns(); + Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); + + List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); + if (StringUtils.isEmpty(dbTableColumns)) + { + throw new ServiceException("同步数据失败，原表结构不存在"); + } + List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); + + dbTableColumns.forEach(column -> { + GenUtils.initColumnField(column, table); + if (tableColumnMap.containsKey(column.getColumnName())) + { + GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); + column.setColumnId(prevColumn.getColumnId()); + if (column.isList()) + { + // 如果是列表，继续保留查询方式/字典类型选项 + column.setDictType(prevColumn.getDictType()); + column.setQueryType(prevColumn.getQueryType()); + } + if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() + && (column.isInsert() || column.isEdit()) + && ((column.isUsableColumn()) || (!column.isSuperColumn()))) + { + // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项 + column.setIsRequired(prevColumn.getIsRequired()); + column.setHtmlType(prevColumn.getHtmlType()); + } + genTableColumnMapper.updateGenTableColumn(column); + } + else + { + genTableColumnMapper.insertGenTableColumn(column); + } + }); + + List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); + if (StringUtils.isNotEmpty(delColumns)) + { + genTableColumnMapper.deleteGenTableColumns(delColumns); + } + } + + /** + * 批量生成代码（下载方式） + * + * @param tableNames 表数组 + * @return 数据 + */ + @Override + public byte[] downloadCode(String[] tableNames) + { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(outputStream); + for (String tableName : tableNames) + { + generatorCode(tableName, zip); + } + IOUtils.closeQuietly(zip); + return outputStream.toByteArray(); + } + + /** + * 查询表信息并生成代码 + */ + private void generatorCode(String tableName, ZipOutputStream zip) + { + // 查询表信息 + GenTable table = genTableMapper.selectGenTableByName(tableName); + // 设置主子表信息 + setSubTable(table); + // 设置主键列信息 + setPkColumn(table); + + VelocityInitializer.initVelocity(); + + VelocityContext context = VelocityUtils.prepareContext(table); + + // 获取模板列表 + List templates = null; + if("0".equals(table.getCodeType())) { + templates = VelocityUtils.getTemplateList(table.getTplCategory()); + } else { + templates = VelocityUtils.getTemplateListPlus(table.getTplCategory()); + } + + for (String template : templates) + { + // 渲染模板 + StringWriter sw = new StringWriter(); + Template tpl = Velocity.getTemplate(template, Constants.UTF8); + tpl.merge(context, sw); + try + { + // 添加到zip + zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); + IOUtils.write(sw.toString(), zip, Constants.UTF8); + IOUtils.closeQuietly(sw); + zip.flush(); + zip.closeEntry(); + } + catch (IOException e) + { + log.error("渲染模板失败，表名：" + table.getTableName(), e); + } + } + } + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + @Override + public void validateEdit(GenTable genTable) + { + if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) + { + String options = JSON.toJSONString(genTable.getParams()); + JSONObject paramsObj = JSON.parseObject(options); + if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) + { + throw new ServiceException("树编码字段不能为空"); + } + else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) + { + throw new ServiceException("树父编码字段不能为空"); + } + else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) + { + throw new ServiceException("树名称字段不能为空"); + } + else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) + { + if (StringUtils.isEmpty(genTable.getSubTableName())) + { + throw new ServiceException("关联子表的表名不能为空"); + } + else if (StringUtils.isEmpty(genTable.getSubTableFkName())) + { + throw new ServiceException("子表关联的外键名不能为空"); + } + } + } + } + + /** + * 设置主键列信息 + * + * @param table 业务表信息 + */ + public void setPkColumn(GenTable table) + { + for (GenTableColumn column : table.getColumns()) + { + if (column.isPk()) + { + table.setPkColumn(column); + break; + } + } + if (StringUtils.isNull(table.getPkColumn())) + { + table.setPkColumn(table.getColumns().get(0)); + } + if (GenConstants.TPL_SUB.equals(table.getTplCategory())) + { + for (GenTableColumn column : table.getSubTable().getColumns()) + { + if (column.isPk()) + { + table.getSubTable().setPkColumn(column); + break; + } + } + if (StringUtils.isNull(table.getSubTable().getPkColumn())) + { + table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); + } + } + } + + /** + * 设置主子表信息 + * + * @param table 业务表信息 + */ + public void setSubTable(GenTable table) + { + String subTableName = table.getSubTableName(); + if (StringUtils.isNotEmpty(subTableName)) + { + table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); + } + } + + /** + * 设置代码生成其他选项值 + * + * @param genTable 设置后的生成对象 + */ + public void setTableFromOptions(GenTable genTable) + { + JSONObject paramsObj = JSON.parseObject(genTable.getOptions()); + if (StringUtils.isNotNull(paramsObj)) + { + String treeCode = paramsObj.getString(GenConstants.TREE_CODE); + String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); + String treeName = paramsObj.getString(GenConstants.TREE_NAME); + String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID); + String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME); + + genTable.setTreeCode(treeCode); + genTable.setTreeParentCode(treeParentCode); + genTable.setTreeName(treeName); + genTable.setParentMenuId(parentMenuId); + genTable.setParentMenuName(parentMenuName); + } + } + + /** + * 获取代码生成地址 + * + * @param table 业务表信息 + * @param template 模板文件路径 + * @return 生成地址 + */ + public static String getGenPath(GenTable table, String template) + { + String genPath = table.getGenPath(); + if (StringUtils.equals(genPath, "/")) + { + return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); + } + return genPath + File.separator + VelocityUtils.getFileName(template, table); + } +} \ No newline at end of file diff --git a/fishery-generator/src/main/java/com/limap/generator/service/IGenTableColumnService.java b/fishery-generator/src/main/java/com/limap/generator/service/IGenTableColumnService.java new file mode 100644 index 0000000..f232228 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/service/IGenTableColumnService.java @@ -0,0 +1,44 @@ +package com.limap.generator.service; + +import java.util.List; +import com.limap.generator.domain.GenTableColumn; + +/** + * 业务字段 服务层 + * + * @author limap + */ +public interface IGenTableColumnService +{ + /** + * 查询业务字段列表 + * + * @param tableId 业务字段编号 + * @return 业务字段集合 + */ + public List selectGenTableColumnListByTableId(Long tableId); + + /** + * 新增业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int insertGenTableColumn(GenTableColumn genTableColumn); + + /** + * 修改业务字段 + * + * @param genTableColumn 业务字段信息 + * @return 结果 + */ + public int updateGenTableColumn(GenTableColumn genTableColumn); + + /** + * 删除业务字段信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteGenTableColumnByIds(String ids); +} diff --git a/fishery-generator/src/main/java/com/limap/generator/service/IGenTableService.java b/fishery-generator/src/main/java/com/limap/generator/service/IGenTableService.java new file mode 100644 index 0000000..4eddf16 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/service/IGenTableService.java @@ -0,0 +1,121 @@ +package com.limap.generator.service; + +import java.util.List; +import java.util.Map; +import com.limap.generator.domain.GenTable; + +/** + * 业务 服务层 + * + * @author limap + */ +public interface IGenTableService +{ + /** + * 查询业务列表 + * + * @param genTable 业务信息 + * @return 业务集合 + */ + public List selectGenTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param genTable 业务信息 + * @return 数据库表集合 + */ + public List selectDbTableList(GenTable genTable); + + /** + * 查询据库列表 + * + * @param tableNames 表名称组 + * @return 数据库表集合 + */ + public List selectDbTableListByNames(String[] tableNames); + + /** + * 查询所有表信息 + * + * @return 表信息集合 + */ + public List selectGenTableAll(); + + /** + * 查询业务信息 + * + * @param id 业务ID + * @return 业务信息 + */ + public GenTable selectGenTableById(Long id); + + /** + * 修改业务 + * + * @param genTable 业务信息 + * @return 结果 + */ + public void updateGenTable(GenTable genTable); + + /** + * 删除业务信息 + * + * @param tableIds 需要删除的表数据ID + * @return 结果 + */ + public void deleteGenTableByIds(Long[] tableIds); + + /** + * 导入表结构 + * + * @param tableList 导入表列表 + */ + public void importGenTable(List tableList); + + /** + * 预览代码 + * + * @param tableId 表编号 + * @return 预览数据列表 + */ + public Map previewCode(Long tableId); + + /** + * 生成代码（下载方式） + * + * @param tableName 表名称 + * @return 数据 + */ + public byte[] downloadCode(String tableName); + + /** + * 生成代码（自定义路径） + * + * @param tableName 表名称 + * @return 数据 + */ + public void generatorCode(String tableName); + + /** + * 同步数据库 + * + * @param tableName 表名称 + */ + public void synchDb(String tableName); + + /** + * 批量生成代码（下载方式） + * + * @param tableNames 表数组 + * @return 数据 + */ + public byte[] downloadCode(String[] tableNames); + + /** + * 修改保存参数校验 + * + * @param genTable 业务信息 + */ + public void validateEdit(GenTable genTable); +} diff --git a/fishery-generator/src/main/java/com/limap/generator/util/GenUtils.java b/fishery-generator/src/main/java/com/limap/generator/util/GenUtils.java new file mode 100644 index 0000000..d3d1401 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/util/GenUtils.java @@ -0,0 +1,257 @@ +package com.limap.generator.util; + +import java.util.Arrays; +import org.apache.commons.lang3.RegExUtils; +import com.limap.common.constant.GenConstants; +import com.limap.common.utils.StringUtils; +import com.limap.generator.config.GenConfig; +import com.limap.generator.domain.GenTable; +import com.limap.generator.domain.GenTableColumn; + +/** + * 代码生成器 工具类 + * + * @author limap + */ +public class GenUtils +{ + /** + * 初始化表信息 + */ + public static void initTable(GenTable genTable, String operName) + { + genTable.setClassName(convertClassName(genTable.getTableName())); + genTable.setPackageName(GenConfig.getPackageName()); + genTable.setModuleName(getModuleName(GenConfig.getPackageName())); + genTable.setBusinessName(getBusinessName(genTable.getTableName())); + genTable.setFunctionName(replaceText(genTable.getTableComment())); + genTable.setFunctionAuthor(GenConfig.getAuthor()); + genTable.setCreateBy(operName); + } + + /** + * 初始化列属性字段 + */ + public static void initColumnField(GenTableColumn column, GenTable table) + { + String dataType = getDbType(column.getColumnType()); + String columnName = column.getColumnName(); + column.setTableId(table.getTableId()); + column.setCreateBy(table.getCreateBy()); + // 设置java字段名 + column.setJavaField(StringUtils.toCamelCase(columnName)); + // 设置默认类型 + column.setJavaType(GenConstants.TYPE_STRING); + column.setQueryType(GenConstants.QUERY_EQ); + + if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) + { + // 字符串长度超过500设置为文本域 + Integer columnLength = getColumnLength(column.getColumnType()); + String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; + column.setHtmlType(htmlType); + } + else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) + { + column.setJavaType(GenConstants.TYPE_DATE); + column.setHtmlType(GenConstants.HTML_DATETIME); + } + else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) + { + column.setHtmlType(GenConstants.HTML_INPUT); + + // 如果是浮点型 统一用BigDecimal + String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ","); + if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) + { + column.setJavaType(GenConstants.TYPE_BIGDECIMAL); + } + // 如果是整形 + else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) + { + column.setJavaType(GenConstants.TYPE_INTEGER); + } + // 长整形 + else + { + column.setJavaType(GenConstants.TYPE_LONG); + } + } + + // 插入字段（默认所有字段都需要插入） + column.setIsInsert(GenConstants.REQUIRE); + + // 编辑字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) + { + column.setIsEdit(GenConstants.REQUIRE); + } + // 列表字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) + { + column.setIsList(GenConstants.REQUIRE); + } + // 查询字段 + if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) + { + column.setIsQuery(GenConstants.REQUIRE); + } + + // 查询字段类型 + if (StringUtils.endsWithIgnoreCase(columnName, "name")) + { + column.setQueryType(GenConstants.QUERY_LIKE); + } + // 状态字段设置单选框 + if (StringUtils.endsWithIgnoreCase(columnName, "status")) + { + column.setHtmlType(GenConstants.HTML_RADIO); + } + // 类型&性别字段设置下拉框 + else if (StringUtils.endsWithIgnoreCase(columnName, "type") + || StringUtils.endsWithIgnoreCase(columnName, "sex")) + { + column.setHtmlType(GenConstants.HTML_SELECT); + } + // 图片字段设置图片上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "image")) + { + column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); + } + // 文件字段设置文件上传控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "file")) + { + column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); + } + // 内容字段设置富文本控件 + else if (StringUtils.endsWithIgnoreCase(columnName, "content")) + { + column.setHtmlType(GenConstants.HTML_EDITOR); + } + } + + /** + * 校验数组是否包含指定值 + * + * @param arr 数组 + * @param targetValue 值 + * @return 是否包含 + */ + public static boolean arraysContains(String[] arr, String targetValue) + { + return Arrays.asList(arr).contains(targetValue); + } + + /** + * 获取模块名 + * + * @param packageName 包名 + * @return 模块名 + */ + public static String getModuleName(String packageName) + { + int lastIndex = packageName.lastIndexOf("."); + int nameLength = packageName.length(); + return StringUtils.substring(packageName, lastIndex + 1, nameLength); + } + + /** + * 获取业务名 + * + * @param tableName 表名 + * @return 业务名 + */ + public static String getBusinessName(String tableName) + { + int lastIndex = tableName.lastIndexOf("_"); + int nameLength = tableName.length(); + return StringUtils.substring(tableName, lastIndex + 1, nameLength); + } + + /** + * 表名转换成Java类名 + * + * @param tableName 表名称 + * @return 类名 + */ + public static String convertClassName(String tableName) + { + boolean autoRemovePre = GenConfig.getAutoRemovePre(); + String tablePrefix = GenConfig.getTablePrefix(); + if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) + { + String[] searchList = StringUtils.split(tablePrefix, ","); + tableName = replaceFirst(tableName, searchList); + } + return StringUtils.convertToCamelCase(tableName); + } + + /** + * 批量替换前缀 + * + * @param replacementm 替换值 + * @param searchList 替换列表 + * @return + */ + public static String replaceFirst(String replacementm, String[] searchList) + { + String text = replacementm; + for (String searchString : searchList) + { + if (replacementm.startsWith(searchString)) + { + text = replacementm.replaceFirst(searchString, ""); + break; + } + } + return text; + } + + /** + * 关键字替换 + * + * @param text 需要被替换的名字 + * @return 替换后的名字 + */ + public static String replaceText(String text) + { + return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + } + + /** + * 获取数据库类型字段 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static String getDbType(String columnType) + { + if (StringUtils.indexOf(columnType, "(") > 0) + { + return StringUtils.substringBefore(columnType, "("); + } + else + { + return columnType; + } + } + + /** + * 获取字段长度 + * + * @param columnType 列类型 + * @return 截取后的列类型 + */ + public static Integer getColumnLength(String columnType) + { + if (StringUtils.indexOf(columnType, "(") > 0) + { + String length = StringUtils.substringBetween(columnType, "(", ")"); + return Integer.valueOf(length); + } + else + { + return 0; + } + } +} diff --git a/fishery-generator/src/main/java/com/limap/generator/util/VelocityInitializer.java b/fishery-generator/src/main/java/com/limap/generator/util/VelocityInitializer.java new file mode 100644 index 0000000..263e61e --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/util/VelocityInitializer.java @@ -0,0 +1,34 @@ +package com.limap.generator.util; + +import java.util.Properties; +import org.apache.velocity.app.Velocity; +import com.limap.common.constant.Constants; + +/** + * VelocityEngine工厂 + * + * @author limap + */ +public class VelocityInitializer +{ + /** + * 初始化vm方法 + */ + public static void initVelocity() + { + Properties p = new Properties(); + try + { + // 加载classpath目录下的vm文件 + p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); + // 定义字符集 + p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); + // 初始化Velocity引擎，指定配置Properties + Velocity.init(p); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } +} diff --git a/fishery-generator/src/main/java/com/limap/generator/util/VelocityUtils.java b/fishery-generator/src/main/java/com/limap/generator/util/VelocityUtils.java new file mode 100644 index 0000000..ab69836 --- /dev/null +++ b/fishery-generator/src/main/java/com/limap/generator/util/VelocityUtils.java @@ -0,0 +1,434 @@ +package com.limap.generator.util; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.velocity.VelocityContext; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.limap.common.constant.GenConstants; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.StringUtils; +import com.limap.generator.domain.GenTable; +import com.limap.generator.domain.GenTableColumn; + +/** + * 模板处理工具类 + * + * @author limap + */ +public class VelocityUtils +{ + /** 项目空间路径 */ + private static final String PROJECT_PATH = "main/java"; + + /** mybatis空间路径 */ + private static final String MYBATIS_PATH = "main/resources/mapper"; + + /** 默认上级菜单，系统工具 */ + private static final String DEFAULT_PARENT_MENU_ID = "4"; + + /** + * 设置模板变量信息 + * + * @return 模板列表 + */ + public static VelocityContext prepareContext(GenTable genTable) + { + String moduleName = genTable.getModuleName(); + String businessName = genTable.getBusinessName(); + String packageName = genTable.getPackageName(); + String tplCategory = genTable.getTplCategory(); + String functionName = genTable.getFunctionName(); + + VelocityContext velocityContext = new VelocityContext(); + velocityContext.put("tplCategory", genTable.getTplCategory()); + velocityContext.put("tableName", genTable.getTableName()); + velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); + velocityContext.put("ClassName", genTable.getClassName()); + velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); + velocityContext.put("moduleName", genTable.getModuleName()); + velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); + velocityContext.put("businessName", genTable.getBusinessName()); + velocityContext.put("basePackage", getPackagePrefix(packageName)); + velocityContext.put("packageName", packageName); + velocityContext.put("author", genTable.getFunctionAuthor()); + velocityContext.put("datetime", DateUtils.getDate()); + velocityContext.put("pkColumn", genTable.getPkColumn()); + velocityContext.put("importList", getImportList(genTable)); + velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); + velocityContext.put("columns", genTable.getColumns()); + velocityContext.put("table", genTable); + velocityContext.put("dicts", getDicts(genTable)); + setMenuVelocityContext(velocityContext, genTable); + if (GenConstants.TPL_TREE.equals(tplCategory)) + { + setTreeVelocityContext(velocityContext, genTable); + } + if (GenConstants.TPL_SUB.equals(tplCategory)) + { + setSubVelocityContext(velocityContext, genTable); + } + return velocityContext; + } + + public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String parentMenuId = getParentMenuId(paramsObj); + context.put("parentMenuId", parentMenuId); + } + + public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String treeCode = getTreecode(paramsObj); + String treeParentCode = getTreeParentCode(paramsObj); + String treeName = getTreeName(paramsObj); + + context.put("treeCode", treeCode); + context.put("treeParentCode", treeParentCode); + context.put("treeName", treeName); + context.put("expandColumn", getExpandColumn(genTable)); + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) + { + context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); + } + if (paramsObj.containsKey(GenConstants.TREE_NAME)) + { + context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); + } + } + + public static void setSubVelocityContext(VelocityContext context, GenTable genTable) + { + GenTable subTable = genTable.getSubTable(); + String subTableName = genTable.getSubTableName(); + String subTableFkName = genTable.getSubTableFkName(); + String subClassName = genTable.getSubTable().getClassName(); + String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName); + + context.put("subTable", subTable); + context.put("subTableName", subTableName); + context.put("subTableFkName", subTableFkName); + context.put("subTableFkClassName", subTableFkClassName); + context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName)); + context.put("subClassName", subClassName); + context.put("subclassName", StringUtils.uncapitalize(subClassName)); + context.put("subImportList", getImportList(genTable.getSubTable())); + } + + /** + * 获取模板信息 + * + * @return 模板列表 + */ + public static List getTemplateList(String tplCategory) + { + List templates = new ArrayList(); + templates.add("vm/java/domain.java.vm"); + templates.add("vm/java/mapper.java.vm"); + templates.add("vm/java/service.java.vm"); + templates.add("vm/java/serviceImpl.java.vm"); + templates.add("vm/java/controller.java.vm"); + templates.add("vm/xml/mapper.xml.vm"); + templates.add("vm/sql/sql.vm"); + templates.add("vm/js/api.js.vm"); + if (GenConstants.TPL_CRUD.equals(tplCategory)) + { + templates.add("vm/vue/v3/index.vue.vm"); + } + else if (GenConstants.TPL_TREE.equals(tplCategory)) + { + templates.add("vm/vue/v3/index-tree.vue.vm"); + } + else if (GenConstants.TPL_SUB.equals(tplCategory)) + { + templates.add("vm/vue/v3/index.vue.vm"); + templates.add("vm/java/sub-domain.java.vm"); + } + return templates; + } + + /** + * 获取模板信息 -- Plus + * + * @return 模板列表 + */ + public static List getTemplateListPlus(String tplCategory) + { + List templates = new ArrayList(); + templates.add("vmplus/java/domain.java.vm"); + templates.add("vmplus/java/mapper.java.vm"); + templates.add("vmplus/java/service.java.vm"); + templates.add("vmplus/java/serviceImpl.java.vm"); + templates.add("vmplus/java/controller.java.vm"); + templates.add("vmplus/xml/mapper.xml.vm"); + templates.add("vmplus/sql/sql.vm"); + templates.add("vmplus/js/api.js.vm"); + if (GenConstants.TPL_CRUD.equals(tplCategory)) + { + templates.add("vmplus/vue/v3/index.vue.vm"); + } + else if (GenConstants.TPL_TREE.equals(tplCategory)) + { + templates.add("vmplus/vue/v3/index-tree.vue.vm"); + } + else if (GenConstants.TPL_SUB.equals(tplCategory)) + { + templates.add("vmplus/vue/v3/index.vue.vm"); + templates.add("vmplus/java/sub-domain.java.vm"); + } + return templates; + } + + /** + * 获取文件名 + */ + public static String getFileName(String template, GenTable genTable) + { + // 文件名称 + String fileName = ""; + // 包路径 + String packageName = genTable.getPackageName(); + // 模块名 + String moduleName = genTable.getModuleName(); + // 大写类名 + String className = genTable.getClassName(); + // 业务名称 + String businessName = genTable.getBusinessName(); + + String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); + String mybatisPath = MYBATIS_PATH + "/" + moduleName; + String vuePath = "vue"; + + if (template.contains("domain.java.vm")) + { + fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + } + if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) + { + fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); + } + else if (template.contains("mapper.java.vm")) + { + fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); + } + else if (template.contains("service.java.vm")) + { + fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); + } + else if (template.contains("serviceImpl.java.vm")) + { + fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); + } + else if (template.contains("controller.java.vm")) + { + fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); + } + else if (template.contains("mapper.xml.vm")) + { + fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); + } + else if (template.contains("sql.vm")) + { + fileName = businessName + "Menu.sql"; + } + else if (template.contains("api.js.vm")) + { + fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); + } + else if (template.contains("index.vue.vm")) + { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } + else if (template.contains("index-tree.vue.vm")) + { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); + } + return fileName; + } + + /** + * 获取包前缀 + * + * @param packageName 包名称 + * @return 包前缀名称 + */ + public static String getPackagePrefix(String packageName) + { + int lastIndex = packageName.lastIndexOf("."); + return StringUtils.substring(packageName, 0, lastIndex); + } + + /** + * 根据列类型获取导入包 + * + * @param genTable 业务表对象 + * @return 返回需要导入的包列表 + */ + public static HashSet getImportList(GenTable genTable) + { + List columns = genTable.getColumns(); + GenTable subGenTable = genTable.getSubTable(); + HashSet importList = new HashSet(); + if (StringUtils.isNotNull(subGenTable)) + { + importList.add("java.util.List"); + } + for (GenTableColumn column : columns) + { + if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) + { + importList.add("java.util.Date"); + importList.add("com.fasterxml.jackson.annotation.JsonFormat"); + } + else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) + { + importList.add("java.math.BigDecimal"); + } + } + return importList; + } + + /** + * 根据列类型获取字典组 + * + * @param genTable 业务表对象 + * @return 返回字典组 + */ + public static String getDicts(GenTable genTable) + { + List columns = genTable.getColumns(); + Set dicts = new HashSet(); + addDicts(dicts, columns); + if (StringUtils.isNotNull(genTable.getSubTable())) + { + List subColumns = genTable.getSubTable().getColumns(); + addDicts(dicts, subColumns); + } + return StringUtils.join(dicts, ", "); + } + + /** + * 添加字典列表 + * + * @param dicts 字典列表 + * @param columns 列集合 + */ + public static void addDicts(Set dicts, List columns) + { + for (GenTableColumn column : columns) + { + if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( + column.getHtmlType(), + new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) + { + dicts.add("'" + column.getDictType() + "'"); + } + } + } + + /** + * 获取权限前缀 + * + * @param moduleName 模块名称 + * @param businessName 业务名称 + * @return 返回权限前缀 + */ + public static String getPermissionPrefix(String moduleName, String businessName) + { + return StringUtils.format("{}:{}", moduleName, businessName); + } + + /** + * 获取上级菜单ID字段 + * + * @param paramsObj 生成其他选项 + * @return 上级菜单ID字段 + */ + public static String getParentMenuId(JSONObject paramsObj) + { + if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) + && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) + { + return paramsObj.getString(GenConstants.PARENT_MENU_ID); + } + return DEFAULT_PARENT_MENU_ID; + } + + /** + * 获取树编码 + * + * @param paramsObj 生成其他选项 + * @return 树编码 + */ + public static String getTreecode(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_CODE)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); + } + return StringUtils.EMPTY; + } + + /** + * 获取树父编码 + * + * @param paramsObj 生成其他选项 + * @return 树父编码 + */ + public static String getTreeParentCode(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); + } + return StringUtils.EMPTY; + } + + /** + * 获取树名称 + * + * @param paramsObj 生成其他选项 + * @return 树名称 + */ + public static String getTreeName(JSONObject paramsObj) + { + if (paramsObj.containsKey(GenConstants.TREE_NAME)) + { + return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); + } + return StringUtils.EMPTY; + } + + /** + * 获取需要在哪一列上面显示展开按钮 + * + * @param genTable 业务表对象 + * @return 展开按钮列序号 + */ + public static int getExpandColumn(GenTable genTable) + { + String options = genTable.getOptions(); + JSONObject paramsObj = JSON.parseObject(options); + String treeName = paramsObj.getString(GenConstants.TREE_NAME); + int num = 0; + for (GenTableColumn column : genTable.getColumns()) + { + if (column.isList()) + { + num++; + String columnName = column.getColumnName(); + if (columnName.equals(treeName)) + { + break; + } + } + } + return num; + } +} diff --git a/fishery-generator/src/main/resources/generator.yml b/fishery-generator/src/main/resources/generator.yml new file mode 100644 index 0000000..21e39ce --- /dev/null +++ b/fishery-generator/src/main/resources/generator.yml @@ -0,0 +1,10 @@ +# 代码生成 +gen: + # 作者 + author: jjb + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.limap.core + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） + tablePrefix: sys_ \ No newline at end of file diff --git a/fishery-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/fishery-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..58510dc --- /dev/null +++ b/fishery-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column + + + + + + + + insert into gen_table_column ( + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time + )values( + #{tableId}, + #{columnName}, + #{columnComment}, + #{columnType}, + #{javaType}, + #{javaField}, + #{isPk}, + #{isIncrement}, + #{isRequired}, + #{isInsert}, + #{isEdit}, + #{isList}, + #{isQuery}, + #{queryType}, + #{htmlType}, + #{dictType}, + #{sort}, + #{createBy}, + sysdate() + ) + + + + update gen_table_column + + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, + update_time = sysdate() + + where column_id = #{columnId} + + + + delete from gen_table_column where table_id in + + #{tableId} + + + + + delete from gen_table_column where column_id in + + #{item.columnId} + + + + diff --git a/fishery-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/fishery-generator/src/main/resources/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..c7655e9 --- /dev/null +++ b/fishery-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, code_type, create_by, create_time, update_by, update_time, remark from gen_table + + + + + + + + + + + + + + + + + + insert into gen_table ( + table_name, + table_comment, + class_name, + tpl_category, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + code_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{packageName}, + #{moduleName}, + #{businessName}, + #{functionName}, + #{functionAuthor}, + #{genType}, + #{codeType}, + #{genPath}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update gen_table + + table_name = #{tableName}, + table_comment = #{tableComment}, + sub_table_name = #{subTableName}, + sub_table_fk_name = #{subTableFkName}, + class_name = #{className}, + function_author = #{functionAuthor}, + gen_type = #{genType}, + code_type = #{codeType}, + gen_path = #{genPath}, + tpl_category = #{tplCategory}, + package_name = #{packageName}, + module_name = #{moduleName}, + business_name = #{businessName}, + function_name = #{functionName}, + options = #{options}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where table_id = #{tableId} + + + + delete from gen_table where table_id in + + #{tableId} + + + + diff --git a/fishery-generator/src/main/resources/vm/java/controller.java.vm b/fishery-generator/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 0000000..2680c2d --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1,115 @@ +package ${packageName}.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.limap.common.annotation.Log; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.limap.common.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.limap.common.core.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") + @GetMapping("/list") +#if($table.crud || $table.sub) + public TableDataInfo list(${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public AjaxResult list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") + @GetMapping(value = "/{${pkColumn.javaField}}") + public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) + { + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.insert${ClassName}(${className})); + } + + /** + * 修改${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.update${ClassName}(${className})); + } + + /** + * 删除${functionName} + */ + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) + { + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + } +} diff --git a/fishery-generator/src/main/resources/vm/java/domain.java.vm b/fishery-generator/src/main/resources/vm/java/domain.java.vm new file mode 100644 index 0000000..c1eabbd --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/domain.java.vm @@ -0,0 +1,105 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +#if($table.crud || $table.sub) +import com.limap.common.core.domain.BaseEntity; +#elseif($table.tree) +import com.limap.common.core.domain.TreeEntity; +#end + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end +public class ${ClassName} extends ${Entity} +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + +#if($table.sub) + public List<${subClassName}> get${subClassName}List() + { + return ${subclassName}List; + } + + public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List = ${subclassName}List; + } + +#end + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end +#if($table.sub) + .append("${subclassName}List", get${subClassName}List()) +#end + .toString(); + } +} diff --git a/fishery-generator/src/main/resources/vm/java/mapper.java.vm b/fishery-generator/src/main/resources/vm/java/mapper.java.vm new file mode 100644 index 0000000..7e7d7c2 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/mapper.java.vm @@ -0,0 +1,91 @@ +package ${packageName}.mapper; + +import java.util.List; +import ${packageName}.domain.${ClassName}; +#if($table.sub) +import ${packageName}.domain.${subClassName}; +#end + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +#if($table.sub) + + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/fishery-generator/src/main/resources/vm/java/service.java.vm b/fishery-generator/src/main/resources/vm/java/service.java.vm new file mode 100644 index 0000000..264882b --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/service.java.vm @@ -0,0 +1,61 @@ +package ${packageName}.service; + +import java.util.List; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +} diff --git a/fishery-generator/src/main/resources/vm/java/serviceImpl.java.vm b/fishery-generator/src/main/resources/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..b8ca3cd --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -0,0 +1,169 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.limap.common.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +#if($table.sub) +import java.util.ArrayList; +import com.limap.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service +{ + @Autowired + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) + { + return ${className}Mapper.select${ClassName}List(${className}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert${ClassName}(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); + insert${subClassName}(${className}); +#end + return ${className}Mapper.update${ClassName}(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } +#if($table.sub) + + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) + { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) + { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} : ${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) + { + ${className}Mapper.batch${subClassName}(list); + } + } + } +#end +} diff --git a/fishery-generator/src/main/resources/vm/java/sub-domain.java.vm b/fishery-generator/src/main/resources/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..2d78699 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/java/sub-domain.java.vm @@ -0,0 +1,76 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BaseEntity; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/fishery-generator/src/main/resources/vm/js/api.js.vm b/fishery-generator/src/main/resources/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/fishery-generator/src/main/resources/vm/sql/sql.vm b/fishery-generator/src/main/resources/vm/sql/sql.vm new file mode 100644 index 0000000..50da0c8 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/sql/sql.vm @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', 'edit', 'admin', now(), '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', now(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', now(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', now(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', now(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', now(), '', null, ''); \ No newline at end of file diff --git a/fishery-generator/src/main/resources/vm/vue1/index-tree.vue.vm b/fishery-generator/src/main/resources/vm/vue1/index-tree.vue.vm new file mode 100644 index 0000000..a4c64a0 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/vue1/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/fishery-generator/src/main/resources/vm/vue1/index.vue.vm b/fishery-generator/src/main/resources/vm/vue1/index.vue.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/vue1/index.vue.vm @@ -0,0 +1,602 @@ + + + diff --git a/fishery-generator/src/main/resources/vm/vue1/v3/index-tree.vue.vm b/fishery-generator/src/main/resources/vm/vue1/v3/index-tree.vue.vm new file mode 100644 index 0000000..7bbd2fc --- /dev/null +++ b/fishery-generator/src/main/resources/vm/vue1/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/fishery-generator/src/main/resources/vm/vue1/v3/index.vue.vm b/fishery-generator/src/main/resources/vm/vue1/v3/index.vue.vm new file mode 100644 index 0000000..2e2bd2f --- /dev/null +++ b/fishery-generator/src/main/resources/vm/vue1/v3/index.vue.vm @@ -0,0 +1,587 @@ + + + diff --git a/fishery-generator/src/main/resources/vm/vue1/v3/readme.txt b/fishery-generator/src/main/resources/vm/vue1/v3/readme.txt new file mode 100644 index 0000000..db276a2 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/vue1/v3/readme.txt @@ -0,0 +1 @@ +���ʹ�õ���limap-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼�� \ No newline at end of file diff --git a/fishery-generator/src/main/resources/vm/xml/mapper.xml.vm b/fishery-generator/src/main/resources/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..0ceb3d8 --- /dev/null +++ b/fishery-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -0,0 +1,135 @@ + + + + + +#foreach ($column in $columns) + +#end + +#if($table.sub) + + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + + + + + + + + insert into ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + $column.columnName, +#end +#end + + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + #{$column.javaField}, +#end +#end + + + + + update ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName) + $column.columnName = #{$column.javaField}, +#end +#end + + where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} in + + #{${pkColumn.javaField}} + + +#if($table.sub) + + + delete from ${subTableName} where ${subTableFkName} in + + #{${subTableFkclassName}} + + + + + delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} + + + + insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values + + (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) + + +#end + \ No newline at end of file diff --git a/fishery-generator/src/main/resources/vmplus/java/controller.java.vm b/fishery-generator/src/main/resources/vmplus/java/controller.java.vm new file mode 100644 index 0000000..271c7f6 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/controller.java.vm @@ -0,0 +1,133 @@ +package ${packageName}.controller; + +import java.util.List; +import java.util.Arrays; +import javax.servlet.http.HttpServletResponse; +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.limap.common.log.annotation.Log; +import io.swagger.annotations.Api; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.limap.common.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.limap.common.core.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@Api(tags = "${functionName}") +@RestController +@RequestMapping("/${moduleName}/${businessName}") +public class ${ClassName}Controller extends BaseController { + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @ApiOperation("查询${functionName}列表") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") + @GetMapping("/list") +#if($table.crud || $table.sub) + public TableDataInfo list(${ClassName} ${className}) { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public AjaxResult list(${ClassName} ${className}) { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @ApiOperation("导出${functionName}列表") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @ApiOperation("获取${functionName}详细信息") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')") + @GetMapping(value = "/{${pkColumn.javaField}}") + public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) { +#if($table.crud || $table.tree) + return success(${className}Service.getById(${pkColumn.javaField})); +#elseif($table.sub) + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); +#end + } + + /** + * 新增${functionName} + */ + @ApiOperation("新增${functionName}") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ${ClassName} ${className}) { +#if($table.crud || $table.tree) + return toAjax(${className}Service.save(${className})); +#elseif($table.sub) + return toAjax(${className}Service.insert${ClassName}(${className})); +#end + } + + /** + * 修改${functionName} + */ + @ApiOperation("修改${functionName}") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ${ClassName} ${className}) { +#if($table.crud || $table.tree) + return toAjax(${className}Service.updateById(${className})); +#elseif($table.sub) + return toAjax(${className}Service.update${ClassName}(${className})); +#end + } + + /** + * 删除${functionName} + */ + @ApiOperation("删除${functionName}") + @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) { +#if($table.crud || $table.tree) + return toAjax(${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s))); +#elseif($table.sub) + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); +#end + } +} diff --git a/fishery-generator/src/main/resources/vmplus/java/domain.java.vm b/fishery-generator/src/main/resources/vmplus/java/domain.java.vm new file mode 100644 index 0000000..3215986 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/domain.java.vm @@ -0,0 +1,75 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +#if($table.crud || $table.sub) +import com.limap.common.core.domain.BasePlusEntity; +#elseif($table.tree) +import com.limap.common.core.domain.TreePlusEntity; +#end +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BasePlusEntity") +#elseif($table.tree) +#set($Entity="TreePlusEntity") +#end +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "${tableName}") +public class ${ClassName} extends ${Entity} { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("${comment}") +#else + @Excel(name = "${comment}") + @ApiModelProperty("${comment}") +#end +#end +#if($column.isPk==1) + @TableId(type = IdType.ASSIGN_ID) +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + @TableField(exist = false) + private List<${subClassName}> ${subclassName}List; + +#end +} diff --git a/fishery-generator/src/main/resources/vmplus/java/mapper.java.vm b/fishery-generator/src/main/resources/vmplus/java/mapper.java.vm new file mode 100644 index 0000000..1747eec --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/mapper.java.vm @@ -0,0 +1,22 @@ +package ${packageName}.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { +#if($table.sub) + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/fishery-generator/src/main/resources/vmplus/java/service.java.vm b/fishery-generator/src/main/resources/vmplus/java/service.java.vm new file mode 100644 index 0000000..4e5d717 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/service.java.vm @@ -0,0 +1,62 @@ +package ${packageName}.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service extends IService<${ClassName}> { + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); +#if($table.sub) + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/fishery-generator/src/main/resources/vmplus/java/serviceImpl.java.vm b/fishery-generator/src/main/resources/vmplus/java/serviceImpl.java.vm new file mode 100644 index 0000000..22afb64 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/serviceImpl.java.vm @@ -0,0 +1,245 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.limap.common.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.limap.common.utils.StringUtils; +#if($table.sub) +import java.util.Arrays; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +import ${packageName}.mapper.${subClassName}Mapper; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service { + @Autowired + private ${ClassName}Mapper ${className}Mapper; +#if($table.sub) + + @Autowired + private ${subClassName}Mapper ${subclassName}Mapper; +#end + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) { + LambdaQueryWrapper<${ClassName}> queryWrapper = Wrappers.lambdaQuery(); +#foreach($column in $columns) +#set($queryType=$column.queryType) +#set($javaField=$column.javaField) +#set($javaType=$column.javaType) +#set($columnName=$column.columnName) +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#if($column.query) +#if($column.queryType == "EQ") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.eq(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "NE") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.ne(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "GT") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.gt(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "GTE") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.ge(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "LT") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.lt(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "LTE") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.le(${ClassName}::get$AttrName, ${className}.get$AttrName())); + } +#elseif($queryType == "LIKE") +#if($javaType == 'String') + if (StringUtils.isNotEmpty(${className}.get$AttrName())) { +#else + if (StringUtils.isNotNull(${className}.get$AttrName())) { +#end + queryWrapper.like(${ClassName}::get$AttrName, ${className}.get$AttrName()); + } +#elseif($queryType == "BETWEEN") + if (StringUtils.isNotEmpty(params.begin$AttrName) and StringUtils.isNotEmpty(params.end$AttrName)) { + queryWrapper.between(${ClassName}::get$AttrName, #{params.begin$AttrName}, #{params.end$AttrName}); + } +#end +#end +#end + queryWrapper.orderByDesc(${ClassName}::getCreateTime); + return ${className}Mapper.selectList(queryWrapper); + } +#if($table.sub) + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + LambdaQueryWrapper<${subClassName}> queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(${subClassName}::get${pkColumn.capJavaField}, ${className}.get${pkColumn.capJavaField}()); + ${subclassName}Mapper.delete(queryWrapper); + + insert${subClassName}(${className}); +#end + return ${className}Mapper.updateById(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) { +#if($table.sub) + LambdaQueryWrapper<${subClassName}> queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.in(${subClassName}::get${pkColumn.capJavaField}, Arrays.asList(${pkColumn.javaField}s)); + ${subclassName}Mapper.delete(queryWrapper); +#end + return ${className}Mapper.deleteBatchIds(Arrays.asList(${pkColumn.javaField}s)); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) { +#if($table.sub) + LambdaQueryWrapper<${subClassName}> queryWrapper = Wrappers.lambdaQuery(); + queryWrapper.eq(${subClassName}::get${pkColumn.capJavaField}, ${pkColumn.javaField}); + ${subclassName}Mapper.delete(queryWrapper); +#end + return ${className}Mapper.deleteById(${pkColumn.javaField}); + } + +#if($table.sub) + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) { + for (${subClassName} ${subclassName} : ${subclassName}List) { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + ${subclassName}Mapper.insert(${subclassName}); + } + } + } +#end + +#end +} diff --git a/fishery-generator/src/main/resources/vmplus/java/sub-domain.java.vm b/fishery-generator/src/main/resources/vmplus/java/sub-domain.java.vm new file mode 100644 index 0000000..9eb9ad6 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/java/sub-domain.java.vm @@ -0,0 +1,57 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BasePlusEntity; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName(value = "${subTableName}") +public class ${subClassName} extends BasePlusEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end +#if($column.isPk==1) + @TableId(type = IdType.AUTO) +#end + private $column.javaType $column.javaField; + +#end +#end +} diff --git a/fishery-generator/src/main/resources/vmplus/js/api.js.vm b/fishery-generator/src/main/resources/vmplus/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/fishery-generator/src/main/resources/vmplus/sql/sql.vm b/fishery-generator/src/main/resources/vmplus/sql/sql.vm new file mode 100644 index 0000000..c662143 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/sql/sql.vm @@ -0,0 +1,27 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', current_timestamp, '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +--SELECT @parentId := LAST_INSERT_ID(); +select max(menu_id) from sys_menu; + +/* +全局替换 @parentId 为 上面语句查询出来的 max(menu_id) +*/ + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', current_timestamp, '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', current_timestamp, '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', current_timestamp, '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', current_timestamp, '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', current_timestamp, '', null, ''); \ No newline at end of file diff --git a/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue.vm b/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue.vm new file mode 100644 index 0000000..3f840dd --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue1.vm b/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue1.vm new file mode 100644 index 0000000..a4c64a0 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/index-tree.vue1.vm @@ -0,0 +1,505 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/index.vue.vm b/fishery-generator/src/main/resources/vmplus/vue1/index.vue.vm new file mode 100644 index 0000000..71c9fad --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/index.vue.vm @@ -0,0 +1,590 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/index.vue1.vm b/fishery-generator/src/main/resources/vmplus/vue1/index.vue1.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/index.vue1.vm @@ -0,0 +1,602 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/v3/index-tree.vue.vm b/fishery-generator/src/main/resources/vmplus/vue1/v3/index-tree.vue.vm new file mode 100644 index 0000000..7bbd2fc --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/v3/index.vue.vm b/fishery-generator/src/main/resources/vmplus/vue1/v3/index.vue.vm new file mode 100644 index 0000000..2e2bd2f --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/v3/index.vue.vm @@ -0,0 +1,587 @@ + + + diff --git a/fishery-generator/src/main/resources/vmplus/vue1/v3/readme.txt b/fishery-generator/src/main/resources/vmplus/vue1/v3/readme.txt new file mode 100644 index 0000000..db276a2 --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/vue1/v3/readme.txt @@ -0,0 +1 @@ +���ʹ�õ���limap-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼�� \ No newline at end of file diff --git a/fishery-generator/src/main/resources/vmplus/xml/mapper.xml.vm b/fishery-generator/src/main/resources/vmplus/xml/mapper.xml.vm new file mode 100644 index 0000000..f92314c --- /dev/null +++ b/fishery-generator/src/main/resources/vmplus/xml/mapper.xml.vm @@ -0,0 +1,36 @@ + + + +#if($table.sub) + +#foreach ($column in $columns) + +#end + +#end + +#if($table.sub) + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + +#if($table.sub) + +#end + \ No newline at end of file diff --git a/fishery-quartz/pom.xml b/fishery-quartz/pom.xml new file mode 100644 index 0000000..5aa7961 --- /dev/null +++ b/fishery-quartz/pom.xml @@ -0,0 +1,50 @@ + + + + fishery_base + com.limap + 3.8.5 + + 4.0.0 + + fishery-quartz + + + quartz定时任务 + + + + + + + org.quartz-scheduler + quartz + + + com.mchange + c3p0 + + + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-log + + + + com.limap + fishery-core + + + + \ No newline at end of file diff --git a/fishery-quartz/src/main/java/com/limap/quartz/config/ScheduleConfig.java b/fishery-quartz/src/main/java/com/limap/quartz/config/ScheduleConfig.java new file mode 100644 index 0000000..f1b28a5 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/config/ScheduleConfig.java @@ -0,0 +1,57 @@ +//package com.limap.quartz.config; +// +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.scheduling.quartz.SchedulerFactoryBean; +//import javax.sql.DataSource; +//import java.util.Properties; +// +///** +// * 定时任务配置（单机部署建议删除此类和qrtz数据库表，默认走内存会最高效） +// * +// * @author limap +// */ +//@Configuration +//public class ScheduleConfig +//{ +// @Bean +// public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource) +// { +// SchedulerFactoryBean factory = new SchedulerFactoryBean(); +// factory.setDataSource(dataSource); +// +// // quartz参数 +// Properties prop = new Properties(); +// prop.put("org.quartz.scheduler.instanceName", "limapScheduler"); +// prop.put("org.quartz.scheduler.instanceId", "AUTO"); +// // 线程池配置 +// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); +// prop.put("org.quartz.threadPool.threadCount", "20"); +// prop.put("org.quartz.threadPool.threadPriority", "5"); +// // JobStore配置 +// prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore"); +// // 集群配置 +// prop.put("org.quartz.jobStore.isClustered", "true"); +// prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000"); +// prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1"); +// prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true"); +// +// // sqlserver 启用 +// // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?"); +// prop.put("org.quartz.jobStore.misfireThreshold", "12000"); +// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); +// factory.setQuartzProperties(prop); +// +// factory.setSchedulerName("limapScheduler"); +// // 延时启动 +// factory.setStartupDelay(1); +// factory.setApplicationContextSchedulerContextKey("applicationContextKey"); +// // 可选，QuartzScheduler +// // 启动时更新己存在的Job，这样就不用每次修改targetObject后删除qrtz_job_details表对应记录了 +// factory.setOverwriteExistingJobs(true); +// // 设置自动启动，默认为true +// factory.setAutoStartup(true); +// +// return factory; +// } +//} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobController.java b/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobController.java new file mode 100644 index 0000000..0cac35d --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobController.java @@ -0,0 +1,186 @@ +package com.limap.quartz.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.constant.Constants; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.exception.job.TaskException; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.quartz.domain.SysJob; +import com.limap.quartz.service.ISysJobService; +import com.limap.quartz.util.CronUtils; +import com.limap.quartz.util.ScheduleUtils; + +/** + * 调度任务信息操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/job") +public class SysJobController extends BaseController +{ + @Autowired + private ISysJobService jobService; + + /** + * 查询定时任务列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJob sysJob) + { + startPage(); + List list = jobService.selectJobList(sysJob); + return getDataTable(list); + } + + /** + * 导出定时任务列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:export')") + @Log(title = "定时任务", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysJob sysJob) + { + List list = jobService.selectJobList(sysJob); + ExcelUtil util = new ExcelUtil(SysJob.class); + util.exportExcel(response, list, "定时任务"); + } + + /** + * 获取定时任务详细信息 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{jobId}") + public AjaxResult getInfo(@PathVariable("jobId") Long jobId) + { + return success(jobService.selectJobById(jobId)); + } + + /** + * 新增定时任务 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:add')") + @Log(title = "定时任务", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(job.getCronExpression())) + { + return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确"); + } + else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) + { + return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) + { + return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) + { + return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) + { + return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规"); + } + else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + { + return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); + } + job.setCreateBy(getUsername()); + return toAjax(jobService.insertJob(job)); + } + + /** + * 修改定时任务 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:edit')") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException + { + if (!CronUtils.isValid(job.getCronExpression())) + { + return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确"); + } + else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) + { + return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) + { + return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) + { + return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用"); + } + else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) + { + return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规"); + } + else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) + { + return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); + } + job.setUpdateBy(getUsername()); + return toAjax(jobService.updateJob(job)); + } + + /** + * 定时任务状态修改 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException + { + SysJob newJob = jobService.selectJobById(job.getJobId()); + newJob.setStatus(job.getStatus()); + return toAjax(jobService.changeStatus(newJob)); + } + + /** + * 定时任务立即执行一次 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/run") + public AjaxResult run(@RequestBody SysJob job) throws SchedulerException + { + boolean result = jobService.run(job); + return result ? success() : error("任务不存在或已过期！"); + } + + /** + * 删除定时任务 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "定时任务", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobIds}") + public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException + { + jobService.deleteJobByIds(jobIds); + return success(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobLogController.java b/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobLogController.java new file mode 100644 index 0000000..6e19ca2 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/controller/SysJobLogController.java @@ -0,0 +1,93 @@ +package com.limap.quartz.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.quartz.domain.SysJobLog; +import com.limap.quartz.service.ISysJobLogService; + +/** + * 调度日志操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/jobLog") +public class SysJobLogController extends BaseController +{ + @Autowired + private ISysJobLogService jobLogService; + + /** + * 查询定时任务调度日志列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:list')") + @GetMapping("/list") + public TableDataInfo list(SysJobLog sysJobLog) + { + startPage(); + List list = jobLogService.selectJobLogList(sysJobLog); + return getDataTable(list); + } + + /** + * 导出定时任务调度日志列表 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:export')") + @Log(title = "任务调度日志", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysJobLog sysJobLog) + { + List list = jobLogService.selectJobLogList(sysJobLog); + ExcelUtil util = new ExcelUtil(SysJobLog.class); + util.exportExcel(response, list, "调度日志"); + } + + /** + * 根据调度编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:query')") + @GetMapping(value = "/{jobLogId}") + public AjaxResult getInfo(@PathVariable Long jobLogId) + { + return success(jobLogService.selectJobLogById(jobLogId)); + } + + + /** + * 删除定时任务调度日志 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{jobLogIds}") + public AjaxResult remove(@PathVariable Long[] jobLogIds) + { + return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); + } + + /** + * 清空定时任务调度日志 + */ + @PreAuthorize("@ss.hasPermi('monitor:job:remove')") + @Log(title = "调度日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + jobLogService.cleanJobLog(); + return success(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJob.java b/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJob.java new file mode 100644 index 0000000..234e8c7 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJob.java @@ -0,0 +1,171 @@ +package com.limap.quartz.domain; + +import java.util.Date; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.constant.ScheduleConstants; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.utils.StringUtils; +import com.limap.quartz.util.CronUtils; + +/** + * 定时任务调度表 sys_job + * + * @author limap + */ +public class SysJob extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 任务ID */ + @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) + private Long jobId; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String jobName; + + /** 任务组名 */ + @Excel(name = "任务组名") + private String jobGroup; + + /** 调用目标字符串 */ + @Excel(name = "调用目标字符串") + private String invokeTarget; + + /** cron执行表达式 */ + @Excel(name = "执行表达式 ") + private String cronExpression; + + /** cron计划策略 */ + @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") + private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; + + /** 是否并发执行（0允许 1禁止） */ + @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") + private String concurrent; + + /** 任务状态（0正常 1暂停） */ + @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") + private String status; + + public Long getJobId() + { + return jobId; + } + + public void setJobId(Long jobId) + { + this.jobId = jobId; + } + + @NotBlank(message = "任务名称不能为空") + @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + @NotBlank(message = "调用目标字符串不能为空") + @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + @NotBlank(message = "Cron执行表达式不能为空") + @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") + public String getCronExpression() + { + return cronExpression; + } + + public void setCronExpression(String cronExpression) + { + this.cronExpression = cronExpression; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + public Date getNextValidTime() + { + if (StringUtils.isNotEmpty(cronExpression)) + { + return CronUtils.getNextExecution(cronExpression); + } + return null; + } + + public String getMisfirePolicy() + { + return misfirePolicy; + } + + public void setMisfirePolicy(String misfirePolicy) + { + this.misfirePolicy = misfirePolicy; + } + + public String getConcurrent() + { + return concurrent; + } + + public void setConcurrent(String concurrent) + { + this.concurrent = concurrent; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("cronExpression", getCronExpression()) + .append("nextValidTime", getNextValidTime()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJobLog.java b/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJobLog.java new file mode 100644 index 0000000..9e71ca5 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/domain/SysJobLog.java @@ -0,0 +1,155 @@ +package com.limap.quartz.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.core.domain.BaseEntity; + +/** + * 定时任务调度日志表 sys_job_log + * + * @author limap + */ +public class SysJobLog extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID */ + @Excel(name = "日志序号") + private Long jobLogId; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String jobName; + + /** 任务组名 */ + @Excel(name = "任务组名") + private String jobGroup; + + /** 调用目标字符串 */ + @Excel(name = "调用目标字符串") + private String invokeTarget; + + /** 日志信息 */ + @Excel(name = "日志信息") + private String jobMessage; + + /** 执行状态（0正常 1失败） */ + @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") + private String status; + + /** 异常信息 */ + @Excel(name = "异常信息") + private String exceptionInfo; + + /** 开始时间 */ + private Date startTime; + + /** 停止时间 */ + private Date stopTime; + + public Long getJobLogId() + { + return jobLogId; + } + + public void setJobLogId(Long jobLogId) + { + this.jobLogId = jobLogId; + } + + public String getJobName() + { + return jobName; + } + + public void setJobName(String jobName) + { + this.jobName = jobName; + } + + public String getJobGroup() + { + return jobGroup; + } + + public void setJobGroup(String jobGroup) + { + this.jobGroup = jobGroup; + } + + public String getInvokeTarget() + { + return invokeTarget; + } + + public void setInvokeTarget(String invokeTarget) + { + this.invokeTarget = invokeTarget; + } + + public String getJobMessage() + { + return jobMessage; + } + + public void setJobMessage(String jobMessage) + { + this.jobMessage = jobMessage; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getExceptionInfo() + { + return exceptionInfo; + } + + public void setExceptionInfo(String exceptionInfo) + { + this.exceptionInfo = exceptionInfo; + } + + public Date getStartTime() + { + return startTime; + } + + public void setStartTime(Date startTime) + { + this.startTime = startTime; + } + + public Date getStopTime() + { + return stopTime; + } + + public void setStopTime(Date stopTime) + { + this.stopTime = stopTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobLogMapper.java b/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobLogMapper.java new file mode 100644 index 0000000..65fe2ac --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobLogMapper.java @@ -0,0 +1,67 @@ +package com.limap.quartz.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.quartz.domain.SysJobLog; + +/** + * 调度任务日志信息 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysJobLogMapper +{ + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 查询所有调度任务日志 + * + * @return 调度任务日志列表 + */ + public List selectJobLogAll(); + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + * @return 结果 + */ + public int insertJobLog(SysJobLog jobLog); + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的数据ID + * @return 结果 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + * @return 结果 + */ + public int deleteJobLogById(Long jobId); + + /** + * 清空任务日志 + */ + public void cleanJobLog(); +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobMapper.java b/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobMapper.java new file mode 100644 index 0000000..f06c6de --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/mapper/SysJobMapper.java @@ -0,0 +1,70 @@ +package com.limap.quartz.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.quartz.domain.SysJob; + +/** + * 调度任务信息 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysJobMapper +{ + /** + * 查询调度任务日志集合 + * + * @param job 调度信息 + * @return 操作日志集合 + */ + public List selectJobList(SysJob job); + + /** + * 查询所有调度任务 + * + * @return 调度任务列表 + */ + public List selectJobAll(); + + /** + * 通过调度ID查询调度任务信息 + * + * @param jobId 调度ID + * @return 角色对象信息 + */ + public SysJob selectJobById(Long jobId); + + /** + * 通过调度ID删除调度任务信息 + * + * @param jobId 调度ID + * @return 结果 + */ + public int deleteJobById(Long jobId); + + /** + * 批量删除调度任务信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteJobByIds(Long[] ids); + + /** + * 修改调度任务信息 + * + * @param job 调度任务信息 + * @return 结果 + */ + public int updateJob(SysJob job); + + /** + * 新增调度任务信息 + * + * @param job 调度任务信息 + * @return 结果 + */ + public int insertJob(SysJob job); +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobLogService.java b/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobLogService.java new file mode 100644 index 0000000..9654043 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobLogService.java @@ -0,0 +1,56 @@ +package com.limap.quartz.service; + +import java.util.List; +import com.limap.quartz.domain.SysJobLog; + +/** + * 定时任务调度日志信息信息 服务层 + * + * @author limap + */ +public interface ISysJobLogService +{ + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + public List selectJobLogList(SysJobLog jobLog); + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + public SysJobLog selectJobLogById(Long jobLogId); + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + */ + public void addJobLog(SysJobLog jobLog); + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的日志ID + * @return 结果 + */ + public int deleteJobLogByIds(Long[] logIds); + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + * @return 结果 + */ + public int deleteJobLogById(Long jobId); + + /** + * 清空任务日志 + */ + public void cleanJobLog(); +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobService.java b/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobService.java new file mode 100644 index 0000000..cfb4ba1 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/service/ISysJobService.java @@ -0,0 +1,102 @@ +package com.limap.quartz.service; + +import java.util.List; +import org.quartz.SchedulerException; +import com.limap.common.exception.job.TaskException; +import com.limap.quartz.domain.SysJob; + +/** + * 定时任务调度信息信息 服务层 + * + * @author limap + */ +public interface ISysJobService +{ + /** + * 获取quartz调度器的计划任务 + * + * @param job 调度信息 + * @return 调度任务集合 + */ + public List selectJobList(SysJob job); + + /** + * 通过调度任务ID查询调度信息 + * + * @param jobId 调度任务ID + * @return 调度任务对象信息 + */ + public SysJob selectJobById(Long jobId); + + /** + * 暂停任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int pauseJob(SysJob job) throws SchedulerException; + + /** + * 恢复任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int resumeJob(SysJob job) throws SchedulerException; + + /** + * 删除任务后，所对应的trigger也将被删除 + * + * @param job 调度信息 + * @return 结果 + */ + public int deleteJob(SysJob job) throws SchedulerException; + + /** + * 批量删除调度信息 + * + * @param jobIds 需要删除的任务ID + * @return 结果 + */ + public void deleteJobByIds(Long[] jobIds) throws SchedulerException; + + /** + * 任务调度状态修改 + * + * @param job 调度信息 + * @return 结果 + */ + public int changeStatus(SysJob job) throws SchedulerException; + + /** + * 立即运行任务 + * + * @param job 调度信息 + * @return 结果 + */ + public boolean run(SysJob job) throws SchedulerException; + + /** + * 新增任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int insertJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 更新任务 + * + * @param job 调度信息 + * @return 结果 + */ + public int updateJob(SysJob job) throws SchedulerException, TaskException; + + /** + * 校验cron表达式是否有效 + * + * @param cronExpression 表达式 + * @return 结果 + */ + public boolean checkCronExpressionIsValid(String cronExpression); +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobLogServiceImpl.java b/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobLogServiceImpl.java new file mode 100644 index 0000000..59aa9b0 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobLogServiceImpl.java @@ -0,0 +1,96 @@ +package com.limap.quartz.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.quartz.domain.SysJobLog; +import com.limap.quartz.mapper.SysJobLogMapper; +import com.limap.quartz.service.ISysJobLogService; + +/** + * 定时任务调度日志信息 服务层 + * + * @author limap + */ +@Service +//@DS("test") +public class SysJobLogServiceImpl implements ISysJobLogService +{ + @Autowired + private SysJobLogMapper jobLogMapper; + + /** + * 获取quartz调度器日志的计划任务 + * + * @param jobLog 调度日志信息 + * @return 调度任务日志集合 + */ + @Override + //@DS("test") + public List selectJobLogList(SysJobLog jobLog) + { + return jobLogMapper.selectJobLogList(jobLog); + } + + /** + * 通过调度任务日志ID查询调度信息 + * + * @param jobLogId 调度任务日志ID + * @return 调度任务日志对象信息 + */ + @Override + //@DS("test") + public SysJobLog selectJobLogById(Long jobLogId) + { + return jobLogMapper.selectJobLogById(jobLogId); + } + + /** + * 新增任务日志 + * + * @param jobLog 调度日志信息 + */ + @Override + //@DS("test") + public void addJobLog(SysJobLog jobLog) + { + jobLogMapper.insertJobLog(jobLog); + } + + /** + * 批量删除调度日志信息 + * + * @param logIds 需要删除的数据ID + * @return 结果 + */ + @Override + //@DS("test") + public int deleteJobLogByIds(Long[] logIds) + { + return jobLogMapper.deleteJobLogByIds(logIds); + } + + /** + * 删除任务日志 + * + * @param jobId 调度日志ID + */ + @Override + //@DS("test") + public int deleteJobLogById(Long jobId) + { + return jobLogMapper.deleteJobLogById(jobId); + } + + /** + * 清空任务日志 + */ + @Override + //@DS("test") + public void cleanJobLog() + { + jobLogMapper.cleanJobLog(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobServiceImpl.java b/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobServiceImpl.java new file mode 100644 index 0000000..ac11daf --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/service/impl/SysJobServiceImpl.java @@ -0,0 +1,277 @@ +package com.limap.quartz.service.impl; + +import java.util.List; +import javax.annotation.PostConstruct; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.quartz.JobDataMap; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.limap.common.constant.ScheduleConstants; +import com.limap.common.exception.job.TaskException; +import com.limap.quartz.domain.SysJob; +import com.limap.quartz.mapper.SysJobMapper; +import com.limap.quartz.service.ISysJobService; +import com.limap.quartz.util.CronUtils; +import com.limap.quartz.util.ScheduleUtils; + +/** + * 定时任务调度信息 服务层 + * + * @author limap + */ +@Service +//@DS("test") +public class SysJobServiceImpl implements ISysJobService +{ + @Autowired + private Scheduler scheduler; + + @Autowired + private SysJobMapper jobMapper; + + /** + * 项目启动时，初始化定时器 主要是防止手动修改数据库导致未同步到定时任务处理（注：不能手动修改数据库ID和任务组名，否则会导致脏数据） + */ + @PostConstruct + //@DS("test") + public void init() throws SchedulerException, TaskException + { + scheduler.clear(); + List jobList = jobMapper.selectJobAll(); + for (SysJob job : jobList) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + } + + /** + * 获取quartz调度器的计划任务列表 + * + * @param job 调度信息 + * @return + */ + @Override + //@DS("test") + public List selectJobList(SysJob job) + { + return jobMapper.selectJobList(job); + } + + /** + * 通过调度任务ID查询调度信息 + * + * @param jobId 调度任务ID + * @return 调度任务对象信息 + */ + @Override + //@DS("test") + public SysJob selectJobById(Long jobId) + { + return jobMapper.selectJobById(jobId); + } + + /** + * 暂停任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int pauseJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 恢复任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int resumeJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + job.setStatus(ScheduleConstants.Status.NORMAL.getValue()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 删除任务后，所对应的trigger也将被删除 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int deleteJob(SysJob job) throws SchedulerException + { + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + int rows = jobMapper.deleteJobById(jobId); + if (rows > 0) + { + scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + return rows; + } + + /** + * 批量删除调度信息 + * + * @param jobIds 需要删除的任务ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public void deleteJobByIds(Long[] jobIds) throws SchedulerException + { + for (Long jobId : jobIds) + { + SysJob job = jobMapper.selectJobById(jobId); + deleteJob(job); + } + } + + /** + * 任务调度状态修改 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int changeStatus(SysJob job) throws SchedulerException + { + int rows = 0; + String status = job.getStatus(); + if (ScheduleConstants.Status.NORMAL.getValue().equals(status)) + { + rows = resumeJob(job); + } + else if (ScheduleConstants.Status.PAUSE.getValue().equals(status)) + { + rows = pauseJob(job); + } + return rows; + } + + /** + * 立即运行任务 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public boolean run(SysJob job) throws SchedulerException + { + boolean result = false; + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + SysJob properties = selectJobById(job.getJobId()); + // 参数 + JobDataMap dataMap = new JobDataMap(); + dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties); + JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + if (scheduler.checkExists(jobKey)) + { + result = true; + scheduler.triggerJob(jobKey, dataMap); + } + return result; + } + + /** + * 新增任务 + * + * @param job 调度信息 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int insertJob(SysJob job) throws SchedulerException, TaskException + { + job.setStatus(ScheduleConstants.Status.PAUSE.getValue()); + int rows = jobMapper.insertJob(job); + if (rows > 0) + { + ScheduleUtils.createScheduleJob(scheduler, job); + } + return rows; + } + + /** + * 更新任务的时间表达式 + * + * @param job 调度信息 + */ + @Override + @Transactional(rollbackFor = Exception.class) + //@DS("test") + public int updateJob(SysJob job) throws SchedulerException, TaskException + { + SysJob properties = selectJobById(job.getJobId()); + int rows = jobMapper.updateJob(job); + if (rows > 0) + { + updateSchedulerJob(job, properties.getJobGroup()); + } + return rows; + } + + /** + * 更新任务 + * + * @param job 任务对象 + * @param jobGroup 任务组名 + */ + //@DS("test") + public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException + { + Long jobId = job.getJobId(); + // 判断是否存在 + JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup); + if (scheduler.checkExists(jobKey)) + { + // 防止创建时存在数据问题 先移除，然后在执行创建操作 + scheduler.deleteJob(jobKey); + } + ScheduleUtils.createScheduleJob(scheduler, job); + } + + /** + * 校验cron表达式是否有效 + * + * @param cronExpression 表达式 + * @return 结果 + */ + @Override + //@DS("test") + public boolean checkCronExpressionIsValid(String cronExpression) + { + return CronUtils.isValid(cronExpression); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/task/CellTask.java b/fishery-quartz/src/main/java/com/limap/quartz/task/CellTask.java new file mode 100644 index 0000000..277185d --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/task/CellTask.java @@ -0,0 +1,26 @@ +package com.limap.quartz.task; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.limap.core.basic.domain.SysCellNumber; +import com.limap.core.basic.service.ISysCellNumberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component("CellTask") +@Slf4j +public class CellTask { + + @Autowired + private ISysCellNumberService cellNumberService; + + public void executeCell() { + List list = cellNumberService.list(new QueryWrapper().eq("is_use",1)); + //todo 随机拨打，没有数据使用随机号码 + + + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/task/ProfitTask.java b/fishery-quartz/src/main/java/com/limap/quartz/task/ProfitTask.java new file mode 100644 index 0000000..214c95d --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/task/ProfitTask.java @@ -0,0 +1,182 @@ +package com.limap.quartz.task; + +import com.alibaba.fastjson2.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.limap.core.basic.domain.*; +import com.limap.core.basic.service.IAquPayOrderService; +import com.limap.core.basic.service.IBasicProfitSharingRecordService; +import com.limap.core.basic.service.IBasicProfitSharingUserService; +import com.limap.core.basic.service.IBasicUserBindInfoService; +import com.limap.core.basic.vo.SharingUserTaskVo; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 分润计算定时任务 + * @author jjb + */ +@Component("profitTask") +@Slf4j +public class ProfitTask { + + @Resource + private IBasicProfitSharingRecordService basicProfitSharingRecordService; + @Resource + private IBasicProfitSharingUserService sharingUserService; + @Resource + private IAquPayOrderService aquPayOrderService; + @Autowired + private IBasicUserBindInfoService basicUserBindInfoService; + + public void execute(Integer hour) { + log.info("分润计算定时任务开始"); + // TODO: 抽取支付订单，计算分润，更新分润表 + List list = aquPayOrderService.selectInfoByHour(hour); + if (list != null && list.size() > 0) { + List sharingUserTaskVos = sharingUserService.selectBasicInfoList(); + boolean b = list.stream().anyMatch(e -> e.getDeviceType() == 2); + if (b) { + BasicProfitSharingUser byId = sharingUserService.getById(101); + if (byId != null) { + list.stream().filter(e -> e.getDeviceType() == 2).forEach(e -> { + SharingUserTaskVo sharingUserTaskVo = new SharingUserTaskVo(); + sharingUserTaskVo.setDeviceName(e.getSerialNum()); + sharingUserTaskVo.setUserId(byId.getUserId()); + sharingUserTaskVo.setControlRatio(byId.getControlRatio()); + sharingUserTaskVo.setOmRatio(byId.getOmRatio()); + sharingUserTaskVo.setType("2"); + sharingUserTaskVos.add(sharingUserTaskVo); + }); + } + } + if (sharingUserTaskVos == null || sharingUserTaskVos.size() == 0) { + log.info("没有需要计算的用户"); + return; + } + Map> collect = dealProfitUser(sharingUserTaskVos); + List basicProfitSharingRecords = new ArrayList<>(); + List aquPayOrders = new ArrayList<>(); + list.forEach(aquPayOrder -> { + try{ + String deviceName = aquPayOrder.getSerialNum(); + if (collect.containsKey(deviceName)) { + List sharingUserTaskVos1 = collect.get(deviceName); + sharingUserTaskVos1.forEach(sharingUserTaskVo -> { + // 计算分润 + try{ + BasicProfitSharingRecord basicProfitSharingRecord = basicProfitSharingRecordService.calculateProfit(aquPayOrder, sharingUserTaskVo); + basicProfitSharingRecords.add(basicProfitSharingRecord); + aquPayOrder.setProfitStatus(1); + aquPayOrders.add(aquPayOrder); + }catch (Exception e){ + log.error("订单号：{}，分润计算异常",aquPayOrder.getId(),e); + } + }); + } + }catch (Exception e){ + log.error("订单号：{}，jsonDeviceSerialNum解析异常",aquPayOrder.getId(),e); + } + }); + // 批量更新订单状态和分润表 + if (basicProfitSharingRecords.size() > 0) { + basicProfitSharingRecordService.saveBatch(basicProfitSharingRecords); + aquPayOrderService.updatePayDeviceStatus(aquPayOrders); + } + }else{ + log.info("没有需要计算的订单"); + } + log.info("分润计算定时任务结束"); + } + + public void executeEquipmentBind() { + List deviceId = basicUserBindInfoService.list( + new LambdaQueryWrapper().isNull(BasicUserBindInfo::getDeviceId) + ); + if (!CollectionUtils.isEmpty(deviceId)) { + List appUserInfo = basicUserBindInfoService.selectAppUserInfo(); + if(!CollectionUtils.isEmpty(appUserInfo)){ + Map> collect = appUserInfo.stream().collect(Collectors.groupingBy(BasicUserBindInfo::getDeviceName)); + List updateList = new ArrayList<>(); + deviceId.forEach(e -> { + if (collect.containsKey(e.getDeviceName())) { + List list = collect.get(e.getDeviceName()); + BasicUserBindInfo e1 = list.get(0); + e1.setId(e.getId()); + updateList.add(e1); + } + }); + if (updateList.size() > 0) { + basicUserBindInfoService.updateBatchById(updateList); + } + } + }else{ + log.info("没有需要绑定的设备"); + } + } + + private Map> dealProfitUser(List sharingUserTaskVos){ + Map> collect = sharingUserTaskVos.stream() + .filter(e -> e != null && e.getDeviceName() != null) + .collect(Collectors.groupingBy(SharingUserTaskVo::getDeviceName)); + + Map> result = new HashMap<>(); + collect.forEach((k, v) -> { + List distinctList = v.stream().distinct().collect(Collectors.toList()); + List newList = new ArrayList<>(); + for (SharingUserTaskVo e : distinctList) { + if (e != null && e.getParentId() != null) { + newList = dealParent(e,sharingUserTaskVos,newList); + }else{ + newList.add(e); + } + } + result.put(k, newList.stream().distinct().collect(Collectors.toList())); + }); + + return result; + } + + public List dealParent(SharingUserTaskVo sharingUserTaskVo,List sharingUserTaskVos,List newList){ + List resultList = new ArrayList<>(newList); // 避免副作用 + SharingUserTaskVo current = sharingUserTaskVo; + + // 预处理数据，提高查找效率 + Map userTaskMap = sharingUserTaskVos.stream() + .filter(f -> f != null && f.getDeptId() != null) + .collect(Collectors.toMap(SharingUserTaskVo::getDeptId, f -> f, (existing, replacement) -> existing)); + + Set visited = new HashSet<>(); // 防止循环引用导致的无限循环 + + while (current != null && current.getParentId() != null) { + // 检查是否已经访问过该节点，防止循环引用 + if (visited.contains(current.getParentId())) { + break; + } + visited.add(current.getParentId()); + + SharingUserTaskVo parent = userTaskMap.get(current.getParentId()); + + if (parent == null) { + resultList.add(sharingUserTaskVo); + break; + } + + // 修正逻辑：只添加当前节点和父节点，而不是每次都添加原始节点 + if (current == sharingUserTaskVo) { + resultList.add(sharingUserTaskVo); + } + resultList.add(parent); + current = parent; + } + + return resultList; + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/task/WarnCodeTask.java b/fishery-quartz/src/main/java/com/limap/quartz/task/WarnCodeTask.java new file mode 100644 index 0000000..e3bf27c --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/task/WarnCodeTask.java @@ -0,0 +1,19 @@ +package com.limap.quartz.task; + +import com.limap.core.basic.service.IAquPayOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Component("WarnCodeTask") +@Slf4j +public class WarnCodeTask { + + @Resource + private IAquPayOrderService aquPayOrderService; + + public void execute() { + aquPayOrderService.dealRechargeWarnCode(); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/AbstractQuartzJob.java b/fishery-quartz/src/main/java/com/limap/quartz/util/AbstractQuartzJob.java new file mode 100644 index 0000000..8f8d1aa --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/AbstractQuartzJob.java @@ -0,0 +1,107 @@ +package com.limap.quartz.util; + +import java.util.Date; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import com.limap.common.constant.Constants; +import com.limap.common.constant.ScheduleConstants; +import com.limap.common.utils.ExceptionUtil; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.bean.BeanUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.quartz.domain.SysJob; +import com.limap.quartz.domain.SysJobLog; +import com.limap.quartz.service.ISysJobLogService; + +/** + * 抽象quartz调用 + * + * @author limap + */ +public abstract class AbstractQuartzJob implements Job +{ + private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class); + + /** + * 线程本地变量 + */ + private static ThreadLocal threadLocal = new ThreadLocal<>(); + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException + { + SysJob sysJob = new SysJob(); + BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES)); + try + { + before(context, sysJob); + if (sysJob != null) + { + doExecute(context, sysJob); + } + after(context, sysJob, null); + } + catch (Exception e) + { + log.error("任务执行异常 - ：", e); + after(context, sysJob, e); + } + } + + /** + * 执行前 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + */ + protected void before(JobExecutionContext context, SysJob sysJob) + { + threadLocal.set(new Date()); + } + + /** + * 执行后 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + */ + protected void after(JobExecutionContext context, SysJob sysJob, Exception e) + { + Date startTime = threadLocal.get(); + threadLocal.remove(); + + final SysJobLog sysJobLog = new SysJobLog(); + sysJobLog.setJobName(sysJob.getJobName()); + sysJobLog.setJobGroup(sysJob.getJobGroup()); + sysJobLog.setInvokeTarget(sysJob.getInvokeTarget()); + sysJobLog.setStartTime(startTime); + sysJobLog.setStopTime(new Date()); + long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime(); + sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒"); + if (e != null) + { + sysJobLog.setStatus(Constants.FAIL); + String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000); + sysJobLog.setExceptionInfo(errorMsg); + } + else + { + sysJobLog.setStatus(Constants.SUCCESS); + } + + // 写入数据库当中 + SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog); + } + + /** + * 执行方法，由子类重载 + * + * @param context 工作执行上下文对象 + * @param sysJob 系统计划任务 + * @throws Exception 执行过程中的异常 + */ + protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception; +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/CronUtils.java b/fishery-quartz/src/main/java/com/limap/quartz/util/CronUtils.java new file mode 100644 index 0000000..8284910 --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/CronUtils.java @@ -0,0 +1,63 @@ +package com.limap.quartz.util; + +import java.text.ParseException; +import java.util.Date; +import org.quartz.CronExpression; + +/** + * cron表达式工具类 + * + * @author limap + * + */ +public class CronUtils +{ + /** + * 返回一个布尔值代表一个给定的Cron表达式的有效性 + * + * @param cronExpression Cron表达式 + * @return boolean 表达式是否有效 + */ + public static boolean isValid(String cronExpression) + { + return CronExpression.isValidExpression(cronExpression); + } + + /** + * 返回一个字符串值,表示该消息无效Cron表达式给出有效性 + * + * @param cronExpression Cron表达式 + * @return String 无效时返回表达式错误描述,如果有效返回null + */ + public static String getInvalidMessage(String cronExpression) + { + try + { + new CronExpression(cronExpression); + return null; + } + catch (ParseException pe) + { + return pe.getMessage(); + } + } + + /** + * 返回下一个执行时间根据给定的Cron表达式 + * + * @param cronExpression Cron表达式 + * @return Date 下次Cron表达式执行时间 + */ + public static Date getNextExecution(String cronExpression) + { + try + { + CronExpression cron = new CronExpression(cronExpression); + return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis())); + } + catch (ParseException e) + { + throw new IllegalArgumentException(e.getMessage()); + } + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/JobInvokeUtil.java b/fishery-quartz/src/main/java/com/limap/quartz/util/JobInvokeUtil.java new file mode 100644 index 0000000..570af8e --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/JobInvokeUtil.java @@ -0,0 +1,182 @@ +package com.limap.quartz.util; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.LinkedList; +import java.util.List; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.quartz.domain.SysJob; + +/** + * 任务执行工具 + * + * @author limap + */ +public class JobInvokeUtil +{ + /** + * 执行方法 + * + * @param sysJob 系统任务 + */ + public static void invokeMethod(SysJob sysJob) throws Exception + { + String invokeTarget = sysJob.getInvokeTarget(); + String beanName = getBeanName(invokeTarget); + String methodName = getMethodName(invokeTarget); + List methodParams = getMethodParams(invokeTarget); + + if (!isValidClassName(beanName)) + { + Object bean = SpringUtils.getBean(beanName); + invokeMethod(bean, methodName, methodParams); + } + else + { + Object bean = Class.forName(beanName).newInstance(); + invokeMethod(bean, methodName, methodParams); + } + } + + /** + * 调用任务方法 + * + * @param bean 目标对象 + * @param methodName 方法名称 + * @param methodParams 方法参数 + */ + private static void invokeMethod(Object bean, String methodName, List methodParams) + throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, + InvocationTargetException + { + if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0) + { + Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams)); + method.invoke(bean, getMethodParamsValue(methodParams)); + } + else + { + Method method = bean.getClass().getMethod(methodName); + method.invoke(bean); + } + } + + /** + * 校验是否为为class包名 + * + * @param invokeTarget 名称 + * @return true是 false否 + */ + public static boolean isValidClassName(String invokeTarget) + { + return StringUtils.countMatches(invokeTarget, ".") > 1; + } + + /** + * 获取bean名称 + * + * @param invokeTarget 目标字符串 + * @return bean名称 + */ + public static String getBeanName(String invokeTarget) + { + String beanName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringBeforeLast(beanName, "."); + } + + /** + * 获取bean方法 + * + * @param invokeTarget 目标字符串 + * @return method方法 + */ + public static String getMethodName(String invokeTarget) + { + String methodName = StringUtils.substringBefore(invokeTarget, "("); + return StringUtils.substringAfterLast(methodName, "."); + } + + /** + * 获取method方法参数相关列表 + * + * @param invokeTarget 目标字符串 + * @return method方法相关参数列表 + */ + public static List getMethodParams(String invokeTarget) + { + String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")"); + if (StringUtils.isEmpty(methodStr)) + { + return null; + } + String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)"); + List classs = new LinkedList<>(); + for (int i = 0; i < methodParams.length; i++) + { + String str = StringUtils.trimToEmpty(methodParams[i]); + // String字符串类型，以'或"开头 + if (StringUtils.startsWithAny(str, "'", "\"")) + { + classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class }); + } + // boolean布尔类型，等于true或者false + else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str)) + { + classs.add(new Object[] { Boolean.valueOf(str), Boolean.class }); + } + // long长整形，以L结尾 + else if (StringUtils.endsWith(str, "L")) + { + classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class }); + } + // double浮点类型，以D结尾 + else if (StringUtils.endsWith(str, "D")) + { + classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class }); + } + // 其他类型归类为整形 + else + { + classs.add(new Object[] { Integer.valueOf(str), Integer.class }); + } + } + return classs; + } + + /** + * 获取参数类型 + * + * @param methodParams 参数相关列表 + * @return 参数类型列表 + */ + public static Class[] getMethodParamsType(List methodParams) + { + Class[] classs = new Class[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Class) os[1]; + index++; + } + return classs; + } + + /** + * 获取参数值 + * + * @param methodParams 参数相关列表 + * @return 参数值列表 + */ + public static Object[] getMethodParamsValue(List methodParams) + { + Object[] classs = new Object[methodParams.size()]; + int index = 0; + for (Object[] os : methodParams) + { + classs[index] = (Object) os[0]; + index++; + } + return classs; + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzDisallowConcurrentExecution.java b/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzDisallowConcurrentExecution.java new file mode 100644 index 0000000..727adeb --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzDisallowConcurrentExecution.java @@ -0,0 +1,21 @@ +package com.limap.quartz.util; + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.JobExecutionContext; +import com.limap.quartz.domain.SysJob; + +/** + * 定时任务处理（禁止并发执行） + * + * @author limap + * + */ +@DisallowConcurrentExecution +public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzJobExecution.java b/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzJobExecution.java new file mode 100644 index 0000000..f886e3a --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/QuartzJobExecution.java @@ -0,0 +1,19 @@ +package com.limap.quartz.util; + +import org.quartz.JobExecutionContext; +import com.limap.quartz.domain.SysJob; + +/** + * 定时任务处理（允许并发执行） + * + * @author limap + * + */ +public class QuartzJobExecution extends AbstractQuartzJob +{ + @Override + protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception + { + JobInvokeUtil.invokeMethod(sysJob); + } +} diff --git a/fishery-quartz/src/main/java/com/limap/quartz/util/ScheduleUtils.java b/fishery-quartz/src/main/java/com/limap/quartz/util/ScheduleUtils.java new file mode 100644 index 0000000..7ba4f4c --- /dev/null +++ b/fishery-quartz/src/main/java/com/limap/quartz/util/ScheduleUtils.java @@ -0,0 +1,141 @@ +package com.limap.quartz.util; + +import org.quartz.CronScheduleBuilder; +import org.quartz.CronTrigger; +import org.quartz.Job; +import org.quartz.JobBuilder; +import org.quartz.JobDetail; +import org.quartz.JobKey; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.TriggerBuilder; +import org.quartz.TriggerKey; +import com.limap.common.constant.Constants; +import com.limap.common.constant.ScheduleConstants; +import com.limap.common.exception.job.TaskException; +import com.limap.common.exception.job.TaskException.Code; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.quartz.domain.SysJob; + +/** + * 定时任务工具类 + * + * @author limap + * + */ +public class ScheduleUtils +{ + /** + * 得到quartz任务类 + * + * @param sysJob 执行计划 + * @return 具体执行任务类 + */ + private static Class getQuartzJobClass(SysJob sysJob) + { + boolean isConcurrent = "0".equals(sysJob.getConcurrent()); + return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class; + } + + /** + * 构建任务触发对象 + */ + public static TriggerKey getTriggerKey(Long jobId, String jobGroup) + { + return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 构建任务键对象 + */ + public static JobKey getJobKey(Long jobId, String jobGroup) + { + return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup); + } + + /** + * 创建定时任务 + */ + public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException + { + Class jobClass = getQuartzJobClass(job); + // 构建job信息 + Long jobId = job.getJobId(); + String jobGroup = job.getJobGroup(); + JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build(); + + // 表达式调度构建器 + CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression()); + cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder); + + // 按新的cronExpression表达式构建一个新的trigger + CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup)) + .withSchedule(cronScheduleBuilder).build(); + + // 放入参数，运行时的方法可以获取 + jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job); + + // 判断是否存在 + if (scheduler.checkExists(getJobKey(jobId, jobGroup))) + { + // 防止创建时存在数据问题 先移除，然后在执行创建操作 + scheduler.deleteJob(getJobKey(jobId, jobGroup)); + } + + // 判断任务是否过期 + if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression()))) + { + // 执行调度任务 + scheduler.scheduleJob(jobDetail, trigger); + } + + // 暂停任务 + if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue())) + { + scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup)); + } + } + + /** + * 设置定时任务策略 + */ + public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb) + throws TaskException + { + switch (job.getMisfirePolicy()) + { + case ScheduleConstants.MISFIRE_DEFAULT: + return cb; + case ScheduleConstants.MISFIRE_IGNORE_MISFIRES: + return cb.withMisfireHandlingInstructionIgnoreMisfires(); + case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED: + return cb.withMisfireHandlingInstructionFireAndProceed(); + case ScheduleConstants.MISFIRE_DO_NOTHING: + return cb.withMisfireHandlingInstructionDoNothing(); + default: + throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() + + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR); + } + } + + /** + * 检查包名是否为白名单配置 + * + * @param invokeTarget 目标字符串 + * @return 结果 + */ + public static boolean whiteList(String invokeTarget) + { + String packageName = StringUtils.substringBefore(invokeTarget, "("); + int count = StringUtils.countMatches(packageName, "."); + if (count > 1) + { + return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR); + } + Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]); + String beanPackageName = obj.getClass().getPackage().getName(); + return StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_WHITELIST_STR) + && !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR); + } +} diff --git a/fishery-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/fishery-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml new file mode 100644 index 0000000..6387fbe --- /dev/null +++ b/fishery-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + from sys_job_log + + + + + + + + + + delete from sys_job_log where job_log_id = #{jobLogId} + + + + delete from sys_job_log where job_log_id in + + #{jobLogId} + + + + + truncate table sys_job_log + + + + insert into sys_job_log( + job_log_id, + job_name, + job_group, + invoke_target, + job_message, + status, + exception_info, + create_time + )values( + #{jobLogId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{jobMessage}, + #{status}, + #{exceptionInfo}, + now() + ) + + + \ No newline at end of file diff --git a/fishery-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/fishery-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml new file mode 100644 index 0000000..378120b --- /dev/null +++ b/fishery-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + from sys_job + + + + + + + + + + delete from sys_job where job_id = #{jobId} + + + + delete from sys_job where job_id in + + #{jobId} + + + + + update sys_job + + job_name = #{jobName}, + job_group = #{jobGroup}, + invoke_target = #{invokeTarget}, + cron_expression = #{cronExpression}, + misfire_policy = #{misfirePolicy}, + concurrent = #{concurrent}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where job_id = #{jobId} + + + + insert into sys_job( + job_id, + job_name, + job_group, + invoke_target, + cron_expression, + misfire_policy, + concurrent, + status, + remark, + create_by, + create_time + )values( + #{jobId}, + #{jobName}, + #{jobGroup}, + #{invokeTarget}, + #{cronExpression}, + #{misfirePolicy}, + #{concurrent}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + \ No newline at end of file diff --git a/fishery-system/pom.xml b/fishery-system/pom.xml new file mode 100644 index 0000000..13db75a --- /dev/null +++ b/fishery-system/pom.xml @@ -0,0 +1,46 @@ + + + + fishery_base + com.limap + 3.8.5 + + 4.0.0 + + fishery-system + + + system系统模块 + + + + + + + com.limap + fishery-common-core + + + + + com.limap + fishery-common-security + + + + + com.limap + fishery-common-web + + + + + com.limap + fishery-common-api + + + + + \ No newline at end of file diff --git a/fishery-system/src/main/java/com/limap/system/AppUserVO.java b/fishery-system/src/main/java/com/limap/system/AppUserVO.java new file mode 100644 index 0000000..ee8f680 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/AppUserVO.java @@ -0,0 +1,15 @@ +package com.limap.system; + +import lombok.Data; + +@Data +public class AppUserVO { + + private Long userId; + + private String username; + private String phonenumber; + private String title; + + private Boolean hasScreen; +} diff --git a/fishery-system/src/main/java/com/limap/system/api/SystemApiImpl.java b/fishery-system/src/main/java/com/limap/system/api/SystemApiImpl.java new file mode 100644 index 0000000..b1d6098 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/api/SystemApiImpl.java @@ -0,0 +1,50 @@ +package com.limap.system.api; + +import javax.annotation.Resource; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.stereotype.Service; + +import com.limap.common.api.SystemApi; +import com.limap.common.core.domain.entity.SysLogininfor; +import com.limap.common.core.domain.entity.SysOperLog; +import com.limap.system.service.ISysLogininforService; +import com.limap.system.service.ISysOperLogService; + +/** + * 系统管理api接口提供者 + * + * @author metaee + * @date 2023/3/8 11:24 + **/ +@Service +//@DS("test") +public class SystemApiImpl implements SystemApi { + + @Resource + private ISysLogininforService sysLogininforService; + + @Resource + private ISysOperLogService sysOperLogService; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(SysLogininfor logininfor) { + sysLogininforService.insertLogininfor(logininfor); + } + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + @Override + public void insertOperlog(SysOperLog operLog) { + sysOperLogService.insertOperlog(operLog); + } + +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/CacheController.java b/fishery-system/src/main/java/com/limap/system/controller/CacheController.java new file mode 100644 index 0000000..6b88249 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/CacheController.java @@ -0,0 +1,120 @@ +package com.limap.system.controller; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.limap.common.constant.CacheConstants; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.SysCache; + +/** + * 缓存监控 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/cache") +public class CacheController +{ + @Autowired + private RedisTemplate redisTemplate; + + private final static List caches = new ArrayList(); + { + caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "用户信息")); + caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "配置信息")); + caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "数据字典")); + caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "验证码")); + caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交")); + caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理")); + caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数")); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping() + public AjaxResult getInfo() throws Exception + { + Properties info = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info()); + Properties commandStats = (Properties) redisTemplate.execute((RedisCallback) connection -> connection.info("commandstats")); + Object dbSize = redisTemplate.execute((RedisCallback) connection -> connection.dbSize()); + + Map result = new HashMap<>(3); + result.put("info", info); + result.put("dbSize", dbSize); + + List> pieList = new ArrayList<>(); + commandStats.stringPropertyNames().forEach(key -> { + Map data = new HashMap<>(2); + String property = commandStats.getProperty(key); + data.put("name", StringUtils.removeStart(key, "cmdstat_")); + data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); + pieList.add(data); + }); + result.put("commandStats", pieList); + return AjaxResult.success(result); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping("/getNames") + public AjaxResult cache() + { + return AjaxResult.success(caches); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping("/getKeys/{cacheName}") + public AjaxResult getCacheKeys(@PathVariable String cacheName) + { + Set cacheKeys = redisTemplate.keys(cacheName + "*"); + return AjaxResult.success(cacheKeys); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @GetMapping("/getValue/{cacheName}/{cacheKey}") + public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) + { + String cacheValue = redisTemplate.opsForValue().get(cacheKey); + SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue); + return AjaxResult.success(sysCache); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @DeleteMapping("/clearCacheName/{cacheName}") + public AjaxResult clearCacheName(@PathVariable String cacheName) + { + Collection cacheKeys = redisTemplate.keys(cacheName + "*"); + redisTemplate.delete(cacheKeys); + return AjaxResult.success(); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @DeleteMapping("/clearCacheKey/{cacheKey}") + public AjaxResult clearCacheKey(@PathVariable String cacheKey) + { + redisTemplate.delete(cacheKey); + return AjaxResult.success(); + } + + @PreAuthorize("@ss.hasPermi('monitor:cache:list')") + @DeleteMapping("/clearCacheAll") + public AjaxResult clearCacheAll() + { + Collection cacheKeys = redisTemplate.keys("*"); + redisTemplate.delete(cacheKeys); + return AjaxResult.success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/CaptchaController.java b/fishery-system/src/main/java/com/limap/system/controller/CaptchaController.java new file mode 100644 index 0000000..9f368f2 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/CaptchaController.java @@ -0,0 +1,169 @@ +package com.limap.system.controller; + +import java.awt.Font; +import java.io.IOException; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +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.RestController; + +import com.limap.common.constant.CacheConstants; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.enums.CaptchaEnum; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.uuid.IdUtils; +import com.limap.common.web.config.properties.CaptchaProperties; +import com.limap.system.service.ISysConfigService; +import com.wf.captcha.ArithmeticCaptcha; +import com.wf.captcha.ChineseCaptcha; +import com.wf.captcha.ChineseGifCaptcha; +import com.wf.captcha.GifCaptcha; +import com.wf.captcha.SpecCaptcha; +import com.wf.captcha.base.Captcha; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +/** + * 验证码操作处理 + * + * @author limap + */ +@Api(value = "用户登录认证", tags = { "用户登录认证" }) +@RestController +public class CaptchaController +{ + @Autowired + private CaptchaProperties captchaProperties; + + @Autowired + private RedisCache redisCache; + + @Autowired + private ISysConfigService configService; + + /** + * 生成验证码 + */ + @ApiOperation("获取验证码") + @GetMapping("/captchaImage") + public AjaxResult getCode(HttpServletResponse response) throws IOException + { + AjaxResult ajax = AjaxResult.success(); + + // 检测配置表是否开启验证码 + boolean captchaEnabled = configService.selectCaptchaEnabled(); + ajax.put("captchaEnabled", captchaEnabled); + if (!captchaEnabled) + { + return ajax; + } + + // 保存验证码信息 + String uuid = IdUtils.simpleUUID(); + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid; + // 获取运算的结果 + Captcha captcha = this.getCaptcha(); + // 当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 + String captchaValue = captcha.text(); + if (captcha.getCharType() - 1 == CaptchaEnum.arithmetic.ordinal() && captchaValue.contains(".")) { + captchaValue = captchaValue.split("\\.")[0]; + } + // 保存 + redisCache.setCacheObject(verifyKey, captchaValue, + captchaProperties.getExpiration().intValue(), TimeUnit.MINUTES); + + // 返回 + ajax.put("uuid", uuid); + ajax.put("img", captcha.toBase64()); + ajax.put("captchaCode", captchaValue); + return ajax; + } + + /** + * 获取验证码生产类 + * + * @return / + */ + public Captcha getCaptcha() { + if (Objects.isNull(captchaProperties)) { + captchaProperties = new CaptchaProperties(); + if (Objects.isNull(captchaProperties.getCodeType())) { + captchaProperties.setCodeType(CaptchaEnum.arithmetic); + } + } + return switchCaptcha(captchaProperties); + } + + /** + * 依据配置信息生产验证码 + * + * @param captchaProperties 验证码配置信息 + * @return / + */ + private Captcha switchCaptcha(CaptchaProperties captchaProperties) { + Captcha captcha; + synchronized (this) { + switch (captchaProperties.getCodeType()) { + case arithmetic: + // 算术类型 https://gitee.com/whvse/EasyCaptcha + captcha = new FixedArithmeticCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight()); + // 几位数运算，默认是两位 + captcha.setLen(captchaProperties.getLength()); + break; + case chinese: + captcha = new ChineseCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight()); + captcha.setLen(captchaProperties.getLength()); + break; + case chinese_gif: + captcha = new ChineseGifCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight()); + captcha.setLen(captchaProperties.getLength()); + break; + case gif: + captcha = new GifCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight()); + captcha.setLen(captchaProperties.getLength()); + break; + case spec: + captcha = new SpecCaptcha(captchaProperties.getWidth(), captchaProperties.getHeight()); + captcha.setLen(captchaProperties.getLength()); + break; + default: + throw new ServiceException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); + } + } + if(StringUtils.isNotBlank(captchaProperties.getFontName())){ + captcha.setFont(new Font(captchaProperties.getFontName(), Font.PLAIN, captchaProperties.getFontSize())); + } + return captcha; + } + + static class FixedArithmeticCaptcha extends ArithmeticCaptcha { + public FixedArithmeticCaptcha(int width, int height) { + super(width, height); + } + + @Override + protected char[] alphas() { + // 生成随机数字和运算符 + int n1 = num(1, 10), n2 = num(1, 10); + int opt = num(3); + + // 计算结果 + int res = new int[]{n1 + n2, n1 - n2, n1 * n2}[opt]; + // 转换为字符运算符 + char optChar = "+-x".charAt(opt); + + this.setArithmeticString(String.format("%s%c%s=?", n1, optChar, n2)); + this.chars = String.valueOf(res); + + return chars.toCharArray(); + } + } + +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/ServerController.java b/fishery-system/src/main/java/com/limap/system/controller/ServerController.java new file mode 100644 index 0000000..1788544 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/ServerController.java @@ -0,0 +1,27 @@ +package com.limap.system.controller; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.web.domain.Server; + +/** + * 服务器监控 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/server") +public class ServerController +{ + @PreAuthorize("@ss.hasPermi('monitor:server:list')") + @GetMapping() + public AjaxResult getInfo() throws Exception + { + Server server = new Server(); + server.copyTo(); + return AjaxResult.success(server); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysConfigController.java b/fishery-system/src/main/java/com/limap/system/controller/SysConfigController.java new file mode 100644 index 0000000..c8fa4c8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysConfigController.java @@ -0,0 +1,134 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.domain.SysConfig; +import com.limap.system.service.ISysConfigService; + +/** + * 参数配置 信息操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/system/config") +public class SysConfigController extends BaseController +{ + @Autowired + private ISysConfigService configService; + + /** + * 获取参数配置列表 + */ + @PreAuthorize("@ss.hasPermi('system:config:list')") + @GetMapping("/list") + public TableDataInfo list(SysConfig config) + { + startPage(); + List list = configService.selectConfigList(config); + return getDataTable(list); + } + + @Log(title = "参数管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:config:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysConfig config) + { + List list = configService.selectConfigList(config); + ExcelUtil util = new ExcelUtil(SysConfig.class); + util.exportExcel(response, list, "参数数据"); + } + + /** + * 根据参数编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:config:query')") + @GetMapping(value = "/{configId}") + public AjaxResult getInfo(@PathVariable Long configId) + { + return success(configService.selectConfigById(configId)); + } + + /** + * 根据参数键名查询参数值 + */ + @GetMapping(value = "/configKey/{configKey}") + public AjaxResult getConfigKey(@PathVariable String configKey) + { + return success(configService.selectConfigByKey(configKey)); + } + + /** + * 新增参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:add')") + @Log(title = "参数管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysConfig config) + { + if (!configService.checkConfigKeyUnique(config)) + { + return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); + } + config.setCreateBy(getUsername()); + return toAjax(configService.insertConfig(config)); + } + + /** + * 修改参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:edit')") + @Log(title = "参数管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysConfig config) + { + if (!configService.checkConfigKeyUnique(config)) + { + return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); + } + config.setUpdateBy(getUsername()); + return toAjax(configService.updateConfig(config)); + } + + /** + * 删除参数配置 + */ + @PreAuthorize("@ss.hasPermi('system:config:remove')") + @Log(title = "参数管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{configIds}") + public AjaxResult remove(@PathVariable Long[] configIds) + { + configService.deleteConfigByIds(configIds); + return success(); + } + + /** + * 刷新参数缓存 + */ + @PreAuthorize("@ss.hasPermi('system:config:remove')") + @Log(title = "参数管理", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + configService.resetConfigCache(); + return success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysDeptController.java b/fishery-system/src/main/java/com/limap/system/controller/SysDeptController.java new file mode 100644 index 0000000..ae9cea9 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysDeptController.java @@ -0,0 +1,133 @@ +package com.limap.system.controller; + +import java.util.List; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.constant.UserConstants; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.StringUtils; +import com.limap.system.service.ISysDeptService; + +/** + * 部门信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/dept") +public class SysDeptController extends BaseController +{ + @Autowired + private ISysDeptService deptService; + + /** + * 获取部门列表 + */ + @PreAuthorize("@ss.hasPermi('system:dept:list')") + @GetMapping("/list") + public AjaxResult list(SysDept dept) + { + List depts = deptService.selectDeptList(dept); + return success(depts); + } + + /** + * 查询部门列表（排除节点） + */ + @PreAuthorize("@ss.hasPermi('system:dept:list')") + @GetMapping("/list/exclude/{deptId}") + public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) + { + List depts = deptService.selectDeptList(new SysDept()); + depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); + return success(depts); + } + + /** + * 根据部门编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:dept:query')") + @GetMapping(value = "/{deptId}") + public AjaxResult getInfo(@PathVariable Long deptId) + { + deptService.checkDeptDataScope(deptId); + return success(deptService.selectDeptById(deptId)); + } + + /** + * 新增部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:add')") + @Log(title = "部门管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDept dept) + { + if (!deptService.checkDeptNameUnique(dept)) + { + return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + } + dept.setCreateBy(getUsername()); + return toAjax(deptService.insertDept(dept)); + } + + /** + * 修改部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:edit')") + @Log(title = "部门管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDept dept) + { + Long deptId = dept.getDeptId(); + deptService.checkDeptDataScope(deptId); + if (!deptService.checkDeptNameUnique(dept)) + { + return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); + } + else if (dept.getParentId().equals(deptId)) + { + return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己"); + } + else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) + { + return error("该部门包含未停用的子部门！"); + } + dept.setUpdateBy(getUsername()); + return toAjax(deptService.updateDept(dept)); + } + + /** + * 删除部门 + */ + @PreAuthorize("@ss.hasPermi('system:dept:remove')") + @Log(title = "部门管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{deptId}") + public AjaxResult remove(@PathVariable Long deptId) + { + if (deptService.hasChildByDeptId(deptId)) + { + return warn("存在下级部门,不允许删除"); + } + if (deptService.checkDeptExistUser(deptId)) + { + return warn("部门存在用户,不允许删除"); + } + deptService.checkDeptDataScope(deptId); + return toAjax(deptService.deleteDeptById(deptId)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysDictDataController.java b/fishery-system/src/main/java/com/limap/system/controller/SysDictDataController.java new file mode 100644 index 0000000..a151208 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysDictDataController.java @@ -0,0 +1,122 @@ +package com.limap.system.controller; + +import java.util.ArrayList; +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysDictData; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.service.ISysDictDataService; +import com.limap.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/dict/data") +public class SysDictDataController extends BaseController +{ + @Autowired + private ISysDictDataService dictDataService; + + @Autowired + private ISysDictTypeService dictTypeService; + + @PreAuthorize("@ss.hasPermi('system:dict:list')") + @GetMapping("/list") + public TableDataInfo list(SysDictData dictData) + { + startPage(); + List list = dictDataService.selectDictDataList(dictData); + return getDataTable(list); + } + + @Log(title = "字典数据", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:dict:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysDictData dictData) + { + List list = dictDataService.selectDictDataList(dictData); + ExcelUtil util = new ExcelUtil(SysDictData.class); + util.exportExcel(response, list, "字典数据"); + } + + /** + * 查询字典数据详细 + */ + @PreAuthorize("@ss.hasPermi('system:dict:query')") + @GetMapping(value = "/{dictCode}") + public AjaxResult getInfo(@PathVariable Long dictCode) + { + return success(dictDataService.selectDictDataById(dictCode)); + } + + /** + * 根据字典类型查询字典数据信息 + */ + @GetMapping(value = "/type/{dictType}") + public AjaxResult dictType(@PathVariable String dictType) + { + List data = dictTypeService.selectDictDataByType(dictType); + if (StringUtils.isNull(data)) + { + data = new ArrayList(); + } + return success(data); + } + + /** + * 新增字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:add')") + @Log(title = "字典数据", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictData dict) + { + dict.setCreateBy(getUsername()); + return toAjax(dictDataService.insertDictData(dict)); + } + + /** + * 修改保存字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:edit')") + @Log(title = "字典数据", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictData dict) + { + dict.setUpdateBy(getUsername()); + return toAjax(dictDataService.updateDictData(dict)); + } + + /** + * 删除字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictCodes}") + public AjaxResult remove(@PathVariable Long[] dictCodes) + { + dictDataService.deleteDictDataByIds(dictCodes); + return success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysDictTypeController.java b/fishery-system/src/main/java/com/limap/system/controller/SysDictTypeController.java new file mode 100644 index 0000000..23b3c33 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysDictTypeController.java @@ -0,0 +1,132 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysDictType; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.service.ISysDictTypeService; + +/** + * 数据字典信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/dict/type") +public class SysDictTypeController extends BaseController +{ + @Autowired + private ISysDictTypeService dictTypeService; + + @PreAuthorize("@ss.hasPermi('system:dict:list')") + @GetMapping("/list") + public TableDataInfo list(SysDictType dictType) + { + startPage(); + List list = dictTypeService.selectDictTypeList(dictType); + return getDataTable(list); + } + + @Log(title = "字典类型", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:dict:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysDictType dictType) + { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil util = new ExcelUtil(SysDictType.class); + util.exportExcel(response, list, "字典类型"); + } + + /** + * 查询字典类型详细 + */ + @PreAuthorize("@ss.hasPermi('system:dict:query')") + @GetMapping(value = "/{dictId}") + public AjaxResult getInfo(@PathVariable Long dictId) + { + return success(dictTypeService.selectDictTypeById(dictId)); + } + + /** + * 新增字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:add')") + @Log(title = "字典类型", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysDictType dict) + { + if (!dictTypeService.checkDictTypeUnique(dict)) + { + return error("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); + } + dict.setCreateBy(getUsername()); + return toAjax(dictTypeService.insertDictType(dict)); + } + + /** + * 修改字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:edit')") + @Log(title = "字典类型", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysDictType dict) + { + if (!dictTypeService.checkDictTypeUnique(dict)) + { + return error("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); + } + dict.setUpdateBy(getUsername()); + return toAjax(dictTypeService.updateDictType(dict)); + } + + /** + * 删除字典类型 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.DELETE) + @DeleteMapping("/{dictIds}") + public AjaxResult remove(@PathVariable Long[] dictIds) + { + dictTypeService.deleteDictTypeByIds(dictIds); + return success(); + } + + /** + * 刷新字典缓存 + */ + @PreAuthorize("@ss.hasPermi('system:dict:remove')") + @Log(title = "字典类型", businessType = BusinessType.CLEAN) + @DeleteMapping("/refreshCache") + public AjaxResult refreshCache() + { + dictTypeService.resetDictCache(); + return success(); + } + + /** + * 获取字典选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + List dictTypes = dictTypeService.selectDictTypeAll(); + return success(dictTypes); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysLoginController.java b/fishery-system/src/main/java/com/limap/system/controller/SysLoginController.java new file mode 100644 index 0000000..755b466 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysLoginController.java @@ -0,0 +1,92 @@ +package com.limap.system.controller; + +import java.util.List; +import java.util.Set; +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.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import com.limap.common.constant.Constants; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysMenu; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginBody; +import com.limap.common.utils.SecurityUtils; +import com.limap.system.service.ISysMenuService; +import com.limap.system.service.SysLoginService; +import com.limap.system.service.SysPermissionService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +/** + * 登录验证 + * + * @author limap + */ +@Api(value = "用户登录认证", tags = { "用户登录认证" }) +@RestController +public class SysLoginController +{ + @Autowired + private SysLoginService loginService; + + @Autowired + private ISysMenuService menuService; + + @Autowired + private SysPermissionService permissionService; + + /** + * 登录方法 + * + * @param loginBody 登录信息 + * @return 结果 + */ + @ApiOperation("用户登录") + @PostMapping("/login") + public AjaxResult login(@RequestBody LoginBody loginBody) throws Exception { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), + loginBody.getUuid()); + ajax.put(Constants.TOKEN, token); + return ajax; + } + + /** + * 获取用户信息 + * + * @return 用户信息 + */ + @ApiOperation("获取用户信息") + @GetMapping("getInfo") + public AjaxResult getInfo() + { + SysUser user = SecurityUtils.getLoginUser().getUser(); + // 角色集合 + Set roles = permissionService.getRolePermission(user); + // 权限集合 + Set permissions = permissionService.getMenuPermission(user); + AjaxResult ajax = AjaxResult.success(); + ajax.put("user", user); + ajax.put("roles", roles); + ajax.put("permissions", permissions); + return ajax; + } + + /** + * 获取路由信息 + * + * @return 路由信息 + */ + @ApiOperation("获取路由信息") + @GetMapping("getRouters") + public AjaxResult getRouters() + { + Long userId = SecurityUtils.getUserId(); + List menus = menuService.selectMenuTreeByUserId(userId); + return AjaxResult.success(menuService.buildMenus(menus)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysLogininforController.java b/fishery-system/src/main/java/com/limap/system/controller/SysLogininforController.java new file mode 100644 index 0000000..b8f28a8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysLogininforController.java @@ -0,0 +1,83 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysLogininfor; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.service.ISysLogininforService; +import com.limap.system.service.SysPasswordService; + +/** + * 系统访问记录 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/logininfor") +public class SysLogininforController extends BaseController +{ + @Autowired + private ISysLogininforService logininforService; + + @Autowired + private SysPasswordService passwordService; + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") + @GetMapping("/list") + public TableDataInfo list(SysLogininfor logininfor) + { + startPage(); + List list = logininforService.selectLogininforList(logininfor); + return getDataTable(list); + } + + @Log(title = "登录日志", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysLogininfor logininfor) + { + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil util = new ExcelUtil(SysLogininfor.class); + util.exportExcel(response, list, "登录日志"); + } + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") + @Log(title = "登录日志", businessType = BusinessType.DELETE) + @DeleteMapping("/{infoIds}") + public AjaxResult remove(@PathVariable Long[] infoIds) + { + return toAjax(logininforService.deleteLogininforByIds(infoIds)); + } + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')") + @Log(title = "登录日志", businessType = BusinessType.CLEAN) + @DeleteMapping("/clean") + public AjaxResult clean() + { + logininforService.cleanLogininfor(); + return success(); + } + + @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')") + @Log(title = "账户解锁", businessType = BusinessType.OTHER) + @GetMapping("/unlock/{userName}") + public AjaxResult unlock(@PathVariable("userName") String userName) + { + passwordService.clearLoginRecordCache(userName); + return success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysMenuController.java b/fishery-system/src/main/java/com/limap/system/controller/SysMenuController.java new file mode 100644 index 0000000..b74d1eb --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysMenuController.java @@ -0,0 +1,143 @@ +package com.limap.system.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.constant.UserConstants; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysMenu; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.StringUtils; +import com.limap.system.service.ISysMenuService; + +/** + * 菜单信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/menu") +public class SysMenuController extends BaseController +{ + @Autowired + private ISysMenuService menuService; + + /** + * 获取菜单列表 + */ + @PreAuthorize("@ss.hasPermi('system:menu:list')") + @GetMapping("/list") + public AjaxResult list(SysMenu menu) + { + List menus = menuService.selectMenuList(menu, getUserId()); + return success(menus); + } + + /** + * 根据菜单编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:menu:query')") + @GetMapping(value = "/{menuId}") + public AjaxResult getInfo(@PathVariable Long menuId) + { + return success(menuService.selectMenuById(menuId)); + } + + /** + * 获取菜单下拉树列表 + */ + @GetMapping("/treeselect") + public AjaxResult treeselect(SysMenu menu) + { + List menus = menuService.selectMenuList(menu, getUserId()); + return success(menuService.buildMenuTreeSelect(menus)); + } + + /** + * 加载对应角色菜单列表树 + */ + @GetMapping(value = "/roleMenuTreeselect/{roleId}") + public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) + { + List menus = menuService.selectMenuList(getUserId()); + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId)); + ajax.put("menus", menuService.buildMenuTreeSelect(menus)); + return ajax; + } + + /** + * 新增菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:add')") + @Log(title = "菜单管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysMenu menu) + { + if (!menuService.checkMenuNameUnique(menu)) + { + return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); + } + menu.setCreateBy(getUsername()); + return toAjax(menuService.insertMenu(menu)); + } + + /** + * 修改菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:edit')") + @Log(title = "菜单管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysMenu menu) + { + if (!menuService.checkMenuNameUnique(menu)) + { + return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); + } + else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) + { + return error("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头"); + } + else if (menu.getMenuId().equals(menu.getParentId())) + { + return error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己"); + } + menu.setUpdateBy(getUsername()); + return toAjax(menuService.updateMenu(menu)); + } + + /** + * 删除菜单 + */ + @PreAuthorize("@ss.hasPermi('system:menu:remove')") + @Log(title = "菜单管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{menuId}") + public AjaxResult remove(@PathVariable("menuId") Long menuId) + { + if (menuService.hasChildByMenuId(menuId)) + { + return warn("存在子菜单,不允许删除"); + } + if (menuService.checkMenuExistRole(menuId)) + { + return warn("菜单已分配,不允许删除"); + } + return toAjax(menuService.deleteMenuById(menuId)); + } +} \ No newline at end of file diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysNoticeController.java b/fishery-system/src/main/java/com/limap/system/controller/SysNoticeController.java new file mode 100644 index 0000000..3015e2a --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysNoticeController.java @@ -0,0 +1,92 @@ +package com.limap.system.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.system.domain.SysNotice; +import com.limap.system.service.ISysNoticeService; + +/** + * 公告 信息操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/system/notice") +public class SysNoticeController extends BaseController +{ + @Autowired + private ISysNoticeService noticeService; + + /** + * 获取通知公告列表 + */ + @PreAuthorize("@ss.hasPermi('system:notice:list')") + @GetMapping("/list") + public TableDataInfo list(SysNotice notice) + { + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + + /** + * 根据通知公告编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:notice:query')") + @GetMapping(value = "/{noticeId}") + public AjaxResult getInfo(@PathVariable Long noticeId) + { + return success(noticeService.selectNoticeById(noticeId)); + } + + /** + * 新增通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:add')") + @Log(title = "通知公告", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysNotice notice) + { + notice.setCreateBy(getUsername()); + return toAjax(noticeService.insertNotice(notice)); + } + + /** + * 修改通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:edit')") + @Log(title = "通知公告", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysNotice notice) + { + notice.setUpdateBy(getUsername()); + return toAjax(noticeService.updateNotice(notice)); + } + + /** + * 删除通知公告 + */ + @PreAuthorize("@ss.hasPermi('system:notice:remove')") + @Log(title = "通知公告", businessType = BusinessType.DELETE) + @DeleteMapping("/{noticeIds}") + public AjaxResult remove(@PathVariable Long[] noticeIds) + { + return toAjax(noticeService.deleteNoticeByIds(noticeIds)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysOperlogController.java b/fishery-system/src/main/java/com/limap/system/controller/SysOperlogController.java new file mode 100644 index 0000000..1c265b2 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysOperlogController.java @@ -0,0 +1,70 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysOperLog; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.service.ISysOperLogService; + +/** + * 操作日志记录 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/operlog") +public class SysOperlogController extends BaseController +{ + @Autowired + private ISysOperLogService operLogService; + + @PreAuthorize("@ss.hasPermi('monitor:operlog:list')") + @GetMapping("/list") + public TableDataInfo list(SysOperLog operLog) + { + startPage(); + List list = operLogService.selectOperLogList(operLog); + return getDataTable(list); + } + + @Log(title = "操作日志", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('monitor:operlog:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysOperLog operLog) + { + List list = operLogService.selectOperLogList(operLog); + ExcelUtil util = new ExcelUtil(SysOperLog.class); + util.exportExcel(response, list, "操作日志"); + } + + @Log(title = "操作日志", businessType = BusinessType.DELETE) + @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @DeleteMapping("/{operIds}") + public AjaxResult remove(@PathVariable Long[] operIds) + { + return toAjax(operLogService.deleteOperLogByIds(operIds)); + } + + @Log(title = "操作日志", businessType = BusinessType.CLEAN) + @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')") + @DeleteMapping("/clean") + public AjaxResult clean() + { + operLogService.cleanOperLog(); + return success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysPostController.java b/fishery-system/src/main/java/com/limap/system/controller/SysPostController.java new file mode 100644 index 0000000..ed50223 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysPostController.java @@ -0,0 +1,130 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.domain.SysPost; +import com.limap.system.service.ISysPostService; + +/** + * 岗位信息操作处理 + * + * @author limap + */ +@RestController +@RequestMapping("/system/post") +public class SysPostController extends BaseController +{ + @Autowired + private ISysPostService postService; + + /** + * 获取岗位列表 + */ + @PreAuthorize("@ss.hasPermi('system:post:list')") + @GetMapping("/list") + public TableDataInfo list(SysPost post) + { + startPage(); + List list = postService.selectPostList(post); + return getDataTable(list); + } + + @Log(title = "岗位管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:post:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysPost post) + { + List list = postService.selectPostList(post); + ExcelUtil util = new ExcelUtil(SysPost.class); + util.exportExcel(response, list, "岗位数据"); + } + + /** + * 根据岗位编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:post:query')") + @GetMapping(value = "/{postId}") + public AjaxResult getInfo(@PathVariable Long postId) + { + return success(postService.selectPostById(postId)); + } + + /** + * 新增岗位 + */ + @PreAuthorize("@ss.hasPermi('system:post:add')") + @Log(title = "岗位管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysPost post) + { + if (!postService.checkPostNameUnique(post)) + { + return error("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); + } + else if (!postService.checkPostCodeUnique(post)) + { + return error("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(postService.insertPost(post)); + } + + /** + * 修改岗位 + */ + @PreAuthorize("@ss.hasPermi('system:post:edit')") + @Log(title = "岗位管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysPost post) + { + if (!postService.checkPostNameUnique(post)) + { + return error("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); + } + else if (!postService.checkPostCodeUnique(post)) + { + return error("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(postService.updatePost(post)); + } + + /** + * 删除岗位 + */ + @PreAuthorize("@ss.hasPermi('system:post:remove')") + @Log(title = "岗位管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{postIds}") + public AjaxResult remove(@PathVariable Long[] postIds) + { + return toAjax(postService.deletePostByIds(postIds)); + } + + /** + * 获取岗位选择框列表 + */ + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + List posts = postService.selectPostAll(); + return success(posts); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysProfileController.java b/fishery-system/src/main/java/com/limap/system/controller/SysProfileController.java new file mode 100644 index 0000000..9060b77 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysProfileController.java @@ -0,0 +1,142 @@ +package com.limap.system.controller; + +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.limap.common.config.LimapConfig; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.security.service.TokenService; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.file.FileUploadUtils; +import com.limap.common.utils.file.MimeTypeUtils; +import com.limap.system.service.ISysUserService; + +/** + * 个人信息 业务处理 + * + * @author limap + */ +@RestController +@RequestMapping("/system/user/profile") +public class SysProfileController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private TokenService tokenService; + + /** + * 个人信息 + */ + @GetMapping + public AjaxResult profile() + { + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + AjaxResult ajax = AjaxResult.success(user); + ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername())); + ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername())); + return ajax; + } + + /** + * 修改用户 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult updateProfile(@RequestBody SysUser user) + { + LoginUser loginUser = getLoginUser(); + SysUser sysUser = loginUser.getUser(); + user.setUserName(sysUser.getUserName()); +// if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) +// { +// return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); +// } +// if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) +// { +// return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); +// } + user.setUserId(sysUser.getUserId()); + user.setPassword(null); + user.setAvatar(null); + user.setDeptId(null); + if (userService.updateUserProfile(user) > 0) + { + // 更新缓存用户信息 + sysUser.setNickName(user.getNickName()); + sysUser.setPhonenumber(user.getPhonenumber()); + sysUser.setEmail(user.getEmail()); + sysUser.setSex(user.getSex()); + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改个人信息异常，请联系管理员"); + } + + /** + * 重置密码 + */ + @Log(title = "个人信息", businessType = BusinessType.UPDATE) + @PutMapping("/updatePwd") + public AjaxResult updatePwd(String oldPassword, String newPassword) + { + LoginUser loginUser = getLoginUser(); + String userName = loginUser.getUsername(); + String password = loginUser.getPassword(); + if (!SecurityUtils.matchesPassword(oldPassword, password)) + { + return error("修改密码失败，旧密码错误"); + } + if (SecurityUtils.matchesPassword(newPassword, password)) + { + return error("新密码不能与旧密码相同"); + } + if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) + { + // 更新缓存用户密码 + loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword)); + tokenService.setLoginUser(loginUser); + return success(); + } + return error("修改密码异常，请联系管理员"); + } + + /** + * 头像上传 + */ + @Log(title = "用户头像", businessType = BusinessType.UPDATE) + @PostMapping("/avatar") + public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception + { + if (!file.isEmpty()) + { + LoginUser loginUser = getLoginUser(); + String avatar = FileUploadUtils.upload(LimapConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION); + if (userService.updateUserAvatar(loginUser.getUsername(), avatar)) + { + AjaxResult ajax = AjaxResult.success(); + ajax.put("imgUrl", avatar); + // 更新缓存用户头像 + loginUser.getUser().setAvatar(avatar); + tokenService.setLoginUser(loginUser); + return ajax; + } + } + return error("上传图片异常，请联系管理员"); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysRegisterController.java b/fishery-system/src/main/java/com/limap/system/controller/SysRegisterController.java new file mode 100644 index 0000000..55fda37 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysRegisterController.java @@ -0,0 +1,38 @@ +package com.limap.system.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.model.RegisterBody; +import com.limap.common.utils.StringUtils; +import com.limap.system.service.ISysConfigService; +import com.limap.system.service.SysRegisterService; + +/** + * 注册验证 + * + * @author limap + */ +@RestController +public class SysRegisterController extends BaseController +{ + @Autowired + private SysRegisterService registerService; + + @Autowired + private ISysConfigService configService; + + @PostMapping("/register") + public AjaxResult register(@RequestBody RegisterBody user) + { + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) + { + return error("当前系统没有开启注册功能！"); + } + String msg = registerService.register(user); + return StringUtils.isEmpty(msg) ? success() : error(msg); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysRoleController.java b/fishery-system/src/main/java/com/limap/system/controller/SysRoleController.java new file mode 100644 index 0000000..048543e --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysRoleController.java @@ -0,0 +1,263 @@ +package com.limap.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.security.service.TokenService; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.domain.SysUserRole; +import com.limap.system.service.ISysDeptService; +import com.limap.system.service.ISysRoleService; +import com.limap.system.service.ISysUserService; +import com.limap.system.service.SysPermissionService; + +/** + * 角色信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/role") +public class SysRoleController extends BaseController +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private TokenService tokenService; + + @Autowired + private SysPermissionService permissionService; + + @Autowired + private ISysUserService userService; + + @Autowired + private ISysDeptService deptService; + + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/list") + public TableDataInfo list(SysRole role) + { + startPage(); + List list = roleService.selectRoleList(role); + return getDataTable(list); + } + + @Log(title = "角色管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:role:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysRole role) + { + List list = roleService.selectRoleList(role); + ExcelUtil util = new ExcelUtil(SysRole.class); + util.exportExcel(response, list, "角色数据"); + } + + /** + * 根据角色编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:role:query')") + @GetMapping(value = "/{roleId}") + public AjaxResult getInfo(@PathVariable Long roleId) + { + roleService.checkRoleDataScope(roleId); + return success(roleService.selectRoleById(roleId)); + } + + /** + * 新增角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:add')") + @Log(title = "角色管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysRole role) + { + if (!roleService.checkRoleNameUnique(role)) + { + return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); + } + else if (!roleService.checkRoleKeyUnique(role)) + { + return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); + } + role.setCreateBy(getUsername()); + return toAjax(roleService.insertRole(role)); + + } + + /** + * 修改保存角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + if (!roleService.checkRoleNameUnique(role)) + { + return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); + } + else if (!roleService.checkRoleKeyUnique(role)) + { + return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); + } + role.setUpdateBy(getUsername()); + + if (roleService.updateRole(role) > 0) + { + // 更新缓存用户权限 + LoginUser loginUser = getLoginUser(); + if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) + { + loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser())); + loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName())); + tokenService.setLoginUser(loginUser); + } + return success(); + } + return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员"); + } + + /** + * 修改保存数据权限 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/dataScope") + public AjaxResult dataScope(@RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + return toAjax(roleService.authDataScope(role)); + } + + /** + * 状态修改 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysRole role) + { + roleService.checkRoleAllowed(role); + roleService.checkRoleDataScope(role.getRoleId()); + role.setUpdateBy(getUsername()); + return toAjax(roleService.updateRoleStatus(role)); + } + + /** + * 删除角色 + */ + @PreAuthorize("@ss.hasPermi('system:role:remove')") + @Log(title = "角色管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{roleIds}") + public AjaxResult remove(@PathVariable Long[] roleIds) + { + return toAjax(roleService.deleteRoleByIds(roleIds)); + } + + /** + * 获取角色选择框列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:query')") + @GetMapping("/optionselect") + public AjaxResult optionselect() + { + return success(roleService.selectRoleAll()); + } + + /** + * 查询已分配用户角色列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/authUser/allocatedList") + public TableDataInfo allocatedList(SysUser user) + { + startPage(); + List list = userService.selectAllocatedList(user); + return getDataTable(list); + } + + /** + * 查询未分配用户角色列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:list')") + @GetMapping("/authUser/unallocatedList") + public TableDataInfo unallocatedList(SysUser user) + { + startPage(); + List list = userService.selectUnallocatedList(user); + return getDataTable(list); + } + + /** + * 取消授权用户 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancel") + public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) + { + return toAjax(roleService.deleteAuthUser(userRole)); + } + + /** + * 批量取消授权用户 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/cancelAll") + public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) + { + return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + } + + /** + * 批量选择用户授权 + */ + @PreAuthorize("@ss.hasPermi('system:role:edit')") + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PutMapping("/authUser/selectAll") + public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) + { + roleService.checkRoleDataScope(roleId); + return toAjax(roleService.insertAuthUsers(roleId, userIds)); + } + + /** + * 获取对应角色部门树列表 + */ + @PreAuthorize("@ss.hasPermi('system:role:query')") + @GetMapping(value = "/deptTree/{roleId}") + public AjaxResult deptTree(@PathVariable("roleId") Long roleId) + { + AjaxResult ajax = AjaxResult.success(); + ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); + ajax.put("depts", deptService.selectDeptTreeList(new SysDept())); + return ajax; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysUserController.java b/fishery-system/src/main/java/com/limap/system/controller/SysUserController.java new file mode 100644 index 0000000..7b165f8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysUserController.java @@ -0,0 +1,275 @@ +package com.limap.system.controller; + +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; + +import com.limap.common.exception.ServiceException; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.poi.ExcelUtil; +import com.limap.system.service.ISysDeptService; +import com.limap.system.service.ISysPostService; +import com.limap.system.service.ISysRoleService; +import com.limap.system.service.ISysUserService; + +/** + * 用户信息 + * + * @author limap + */ +@RestController +@RequestMapping("/system/user") +public class SysUserController extends BaseController +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysDeptService deptService; + + @Autowired + private ISysPostService postService; + + /** + * 获取用户列表 + */ + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/list") + public TableDataInfo list(SysUser user) + { + startPage(); + List list = userService.selectUserList(user); + return getDataTable(list); + } + +// @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("all/list") + public AjaxResult allList(SysUser user) + { + List list = userService.selectAllUserList(user); + return success(list); + } + + @Log(title = "用户管理", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('system:user:export')") + @PostMapping("/export") + public void export(HttpServletResponse response, SysUser user) + { + List list = userService.selectUserList(user); + ExcelUtil util = new ExcelUtil(SysUser.class); + util.exportExcel(response, list, "用户数据"); + } + + @Log(title = "用户管理", businessType = BusinessType.IMPORT) + @PreAuthorize("@ss.hasPermi('system:user:import')") + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil util = new ExcelUtil(SysUser.class); + List userList = util.importExcel(file.getInputStream()); + String operName = getUsername(); + String message = userService.importUser(userList, updateSupport, operName); + return success(message); + } + + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil util = new ExcelUtil(SysUser.class); + util.importTemplateExcel(response, "用户数据"); + } + + /** + * 根据用户编号获取详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:user:query')") + @GetMapping(value = { "/", "/{userId}" }) + public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) + { + userService.checkUserDataScope(userId); + AjaxResult ajax = AjaxResult.success(); + List roles = roleService.selectRoleAll1(); + Long roleId = null; + try{ + SysRole sysRole = getLoginUser().getUser().getRoles().stream().min(Comparator.comparingLong(SysRole::getRoleId)).get(); + roleId = sysRole.getRoleId(); + }catch (Exception ex){ + System.out.println("获取用户异常：" + ex.getMessage()); + throw new ServiceException("获取用户信息异常"); + } + + Long finalRoleId = roleId; + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).filter(r -> r.getRoleId().compareTo(finalRoleId) > 0).collect(Collectors.toList())); + ajax.put("posts", postService.selectPostAll()); + if (StringUtils.isNotNull(userId)) + { + SysUser sysUser = userService.selectUserById(userId); + ajax.put(AjaxResult.DATA_TAG, sysUser); + ajax.put("postIds", postService.selectPostListByUserId(userId)); + ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); + } + return ajax; + } + + /** + * 新增用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:add')") + @Log(title = "用户管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody SysUser user) + { + if (!userService.checkUserNameUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setCreateBy(getUsername()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + int rows = userService.insertUser(user); + deptService.createDeptByUser(user); + return toAjax(rows); + } + + /** + * 修改用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + if (!userService.checkUserNameUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); + } + else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); + } + else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) + { + return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); + } + user.setUpdateBy(getUsername()); + return toAjax(userService.updateUser(user)); + } + + /** + * 删除用户 + */ + @PreAuthorize("@ss.hasPermi('system:user:remove')") + @Log(title = "用户管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{userIds}") + public AjaxResult remove(@PathVariable Long[] userIds) + { + if (ArrayUtils.contains(userIds, getUserId())) + { + return error("当前用户不能删除"); + } + return toAjax(userService.deleteUserByIds(userIds)); + } + + /** + * 重置密码 + */ + @PreAuthorize("@ss.hasPermi('system:user:resetPwd')") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/resetPwd") + public AjaxResult resetPwd(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + user.setUpdateBy(getUsername()); + return toAjax(userService.resetPwd(user)); + } + + /** + * 状态修改 + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody SysUser user) + { + userService.checkUserAllowed(user); + userService.checkUserDataScope(user.getUserId()); + user.setUpdateBy(getUsername()); + return toAjax(userService.updateUserStatus(user)); + } + + /** + * 根据用户编号获取授权角色 + */ + @PreAuthorize("@ss.hasPermi('system:user:query')") + @GetMapping("/authRole/{userId}") + public AjaxResult authRole(@PathVariable("userId") Long userId) + { + AjaxResult ajax = AjaxResult.success(); + SysUser user = userService.selectUserById(userId); + List roles = roleService.selectRolesByUserId(userId); + ajax.put("user", user); + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); + return ajax; + } + + /** + * 用户授权角色 + */ + @PreAuthorize("@ss.hasPermi('system:user:edit')") + @Log(title = "用户管理", businessType = BusinessType.GRANT) + @PutMapping("/authRole") + public AjaxResult insertAuthRole(Long userId, Long[] roleIds) + { + userService.checkUserDataScope(userId); + userService.insertUserAuth(userId, roleIds); + return success(); + } + + /** + * 获取部门树列表 + */ + @PreAuthorize("@ss.hasPermi('system:user:list')") + @GetMapping("/deptTree") + public AjaxResult deptTree(SysDept dept) + { + return success(deptService.selectDeptTreeList(dept)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/controller/SysUserOnlineController.java b/fishery-system/src/main/java/com/limap/system/controller/SysUserOnlineController.java new file mode 100644 index 0000000..ea2cfd2 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/controller/SysUserOnlineController.java @@ -0,0 +1,84 @@ +package com.limap.system.controller; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.limap.common.constant.CacheConstants; +import com.limap.common.core.controller.BaseController; +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.page.TableDataInfo; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.enums.BusinessType; +import com.limap.common.log.annotation.Log; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.SysUserOnline; +import com.limap.system.service.ISysUserOnlineService; + +/** + * 在线用户监控 + * + * @author limap + */ +@RestController +@RequestMapping("/monitor/online") +public class SysUserOnlineController extends BaseController +{ + @Autowired + private ISysUserOnlineService userOnlineService; + + @Autowired + private RedisCache redisCache; + + @PreAuthorize("@ss.hasPermi('monitor:online:list')") + @GetMapping("/list") + public TableDataInfo list(String ipaddr, String userName) + { + Collection keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); + List userOnlineList = new ArrayList(); + for (String key : keys) + { + LoginUser user = redisCache.getCacheObject(key); + if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) + { + userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user)); + } + else if (StringUtils.isNotEmpty(ipaddr)) + { + userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user)); + } + else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser())) + { + userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user)); + } + else + { + userOnlineList.add(userOnlineService.loginUserToUserOnline(user)); + } + } + Collections.reverse(userOnlineList); + userOnlineList.removeAll(Collections.singleton(null)); + return getDataTable(userOnlineList); + } + + /** + * 强退用户 + */ + @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')") + @Log(title = "在线用户", businessType = BusinessType.FORCE) + @DeleteMapping("/{tokenId}") + public AjaxResult forceLogout(@PathVariable String tokenId) + { + redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); + return success(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysCache.java b/fishery-system/src/main/java/com/limap/system/domain/SysCache.java new file mode 100644 index 0000000..ed1ac61 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysCache.java @@ -0,0 +1,81 @@ +package com.limap.system.domain; + +import com.limap.common.utils.StringUtils; + +/** + * 缓存信息 + * + * @author limap + */ +public class SysCache +{ + /** 缓存名称 */ + private String cacheName = ""; + + /** 缓存键名 */ + private String cacheKey = ""; + + /** 缓存内容 */ + private String cacheValue = ""; + + /** 备注 */ + private String remark = ""; + + public SysCache() + { + + } + + public SysCache(String cacheName, String remark) + { + this.cacheName = cacheName; + this.remark = remark; + } + + public SysCache(String cacheName, String cacheKey, String cacheValue) + { + this.cacheName = StringUtils.replace(cacheName, ":", ""); + this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); + this.cacheValue = cacheValue; + } + + public String getCacheName() + { + return cacheName; + } + + public void setCacheName(String cacheName) + { + this.cacheName = cacheName; + } + + public String getCacheKey() + { + return cacheKey; + } + + public void setCacheKey(String cacheKey) + { + this.cacheKey = cacheKey; + } + + public String getCacheValue() + { + return cacheValue; + } + + public void setCacheValue(String cacheValue) + { + this.cacheValue = cacheValue; + } + + public String getRemark() + { + return remark; + } + + public void setRemark(String remark) + { + this.remark = remark; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysConfig.java b/fishery-system/src/main/java/com/limap/system/domain/SysConfig.java new file mode 100644 index 0000000..b1974ca --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysConfig.java @@ -0,0 +1,111 @@ +package com.limap.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 参数配置表 sys_config + * + * @author limap + */ +public class SysConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 参数主键 */ + @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) + private Long configId; + + /** 参数名称 */ + @Excel(name = "参数名称") + private String configName; + + /** 参数键名 */ + @Excel(name = "参数键名") + private String configKey; + + /** 参数键值 */ + @Excel(name = "参数键值") + private String configValue; + + /** 系统内置（Y是 N否） */ + @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") + private String configType; + + public Long getConfigId() + { + return configId; + } + + public void setConfigId(Long configId) + { + this.configId = configId; + } + + @NotBlank(message = "参数名称不能为空") + @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + @NotBlank(message = "参数键名长度不能为空") + @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") + public String getConfigKey() + { + return configKey; + } + + public void setConfigKey(String configKey) + { + this.configKey = configKey; + } + + @NotBlank(message = "参数键值不能为空") + @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") + public String getConfigValue() + { + return configValue; + } + + public void setConfigValue(String configValue) + { + this.configValue = configValue; + } + + public String getConfigType() + { + return configType; + } + + public void setConfigType(String configType) + { + this.configType = configType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysNotice.java b/fishery-system/src/main/java/com/limap/system/domain/SysNotice.java new file mode 100644 index 0000000..420c569 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysNotice.java @@ -0,0 +1,102 @@ +package com.limap.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.core.domain.BaseEntity; +import com.limap.common.xss.Xss; + +/** + * 通知公告表 sys_notice + * + * @author limap + */ +public class SysNotice extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 公告ID */ + private Long noticeId; + + /** 公告标题 */ + private String noticeTitle; + + /** 公告类型（1通知 2公告） */ + private String noticeType; + + /** 公告内容 */ + private String noticeContent; + + /** 公告状态（0正常 1关闭） */ + private String status; + + public Long getNoticeId() + { + return noticeId; + } + + public void setNoticeId(Long noticeId) + { + this.noticeId = noticeId; + } + + public void setNoticeTitle(String noticeTitle) + { + this.noticeTitle = noticeTitle; + } + + @Xss(message = "公告标题不能包含脚本字符") + @NotBlank(message = "公告标题不能为空") + @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") + public String getNoticeTitle() + { + return noticeTitle; + } + + public void setNoticeType(String noticeType) + { + this.noticeType = noticeType; + } + + public String getNoticeType() + { + return noticeType; + } + + public void setNoticeContent(String noticeContent) + { + this.noticeContent = noticeContent; + } + + public String getNoticeContent() + { + return noticeContent; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("noticeId", getNoticeId()) + .append("noticeTitle", getNoticeTitle()) + .append("noticeType", getNoticeType()) + .append("noticeContent", getNoticeContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysPost.java b/fishery-system/src/main/java/com/limap/system/domain/SysPost.java new file mode 100644 index 0000000..fcd9b93 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysPost.java @@ -0,0 +1,124 @@ +package com.limap.system.domain; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.limap.common.annotation.Excel; +import com.limap.common.annotation.Excel.ColumnType; +import com.limap.common.core.domain.BaseEntity; + +/** + * 岗位表 sys_post + * + * @author limap + */ +public class SysPost extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 岗位序号 */ + @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) + private Long postId; + + /** 岗位编码 */ + @Excel(name = "岗位编码") + private String postCode; + + /** 岗位名称 */ + @Excel(name = "岗位名称") + private String postName; + + /** 岗位排序 */ + @Excel(name = "岗位排序") + private Integer postSort; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 用户是否存在此岗位标识 默认不存在 */ + private boolean flag = false; + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + @NotBlank(message = "岗位编码不能为空") + @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") + public String getPostCode() + { + return postCode; + } + + public void setPostCode(String postCode) + { + this.postCode = postCode; + } + + @NotBlank(message = "岗位名称不能为空") + @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") + public String getPostName() + { + return postName; + } + + public void setPostName(String postName) + { + this.postName = postName; + } + + @NotNull(message = "显示顺序不能为空") + public Integer getPostSort() + { + return postSort; + } + + public void setPostSort(Integer postSort) + { + this.postSort = postSort; + } + + public String getStatus() + { + return status; + } + + public void setStatus(String status) + { + this.status = status; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postCode", getPostCode()) + .append("postName", getPostName()) + .append("postSort", getPostSort()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysRoleDept.java b/fishery-system/src/main/java/com/limap/system/domain/SysRoleDept.java new file mode 100644 index 0000000..2c9aaa6 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysRoleDept.java @@ -0,0 +1,46 @@ +package com.limap.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和部门关联 sys_role_dept + * + * @author limap + */ +public class SysRoleDept +{ + /** 角色ID */ + private Long roleId; + + /** 部门ID */ + private Long deptId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getDeptId() + { + return deptId; + } + + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("deptId", getDeptId()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysRoleMenu.java b/fishery-system/src/main/java/com/limap/system/domain/SysRoleMenu.java new file mode 100644 index 0000000..3c4b32a --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysRoleMenu.java @@ -0,0 +1,46 @@ +package com.limap.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 角色和菜单关联 sys_role_menu + * + * @author limap + */ +public class SysRoleMenu +{ + /** 角色ID */ + private Long roleId; + + /** 菜单ID */ + private Long menuId; + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getMenuId() + { + return menuId; + } + + public void setMenuId(Long menuId) + { + this.menuId = menuId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("menuId", getMenuId()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysUserOnline.java b/fishery-system/src/main/java/com/limap/system/domain/SysUserOnline.java new file mode 100644 index 0000000..dc85d25 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysUserOnline.java @@ -0,0 +1,113 @@ +package com.limap.system.domain; + +/** + * 当前在线会话 + * + * @author limap + */ +public class SysUserOnline +{ + /** 会话编号 */ + private String tokenId; + + /** 部门名称 */ + private String deptName; + + /** 用户名称 */ + private String userName; + + /** 登录IP地址 */ + private String ipaddr; + + /** 登录地址 */ + private String loginLocation; + + /** 浏览器类型 */ + private String browser; + + /** 操作系统 */ + private String os; + + /** 登录时间 */ + private Long loginTime; + + public String getTokenId() + { + return tokenId; + } + + public void setTokenId(String tokenId) + { + this.tokenId = tokenId; + } + + public String getDeptName() + { + return deptName; + } + + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getUserName() + { + return userName; + } + + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getIpaddr() + { + return ipaddr; + } + + public void setIpaddr(String ipaddr) + { + this.ipaddr = ipaddr; + } + + public String getLoginLocation() + { + return loginLocation; + } + + public void setLoginLocation(String loginLocation) + { + this.loginLocation = loginLocation; + } + + public String getBrowser() + { + return browser; + } + + public void setBrowser(String browser) + { + this.browser = browser; + } + + public String getOs() + { + return os; + } + + public void setOs(String os) + { + this.os = os; + } + + public Long getLoginTime() + { + return loginTime; + } + + public void setLoginTime(Long loginTime) + { + this.loginTime = loginTime; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysUserPost.java b/fishery-system/src/main/java/com/limap/system/domain/SysUserPost.java new file mode 100644 index 0000000..119ad73 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysUserPost.java @@ -0,0 +1,46 @@ +package com.limap.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和岗位关联 sys_user_post + * + * @author limap + */ +public class SysUserPost +{ + /** 用户ID */ + private Long userId; + + /** 岗位ID */ + private Long postId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getPostId() + { + return postId; + } + + public void setPostId(Long postId) + { + this.postId = postId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("postId", getPostId()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/SysUserRole.java b/fishery-system/src/main/java/com/limap/system/domain/SysUserRole.java new file mode 100644 index 0000000..2ecce07 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/SysUserRole.java @@ -0,0 +1,46 @@ +package com.limap.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 用户和角色关联 sys_user_role + * + * @author limap + */ +public class SysUserRole +{ + /** 用户ID */ + private Long userId; + + /** 角色ID */ + private Long roleId; + + public Long getUserId() + { + return userId; + } + + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getRoleId() + { + return roleId; + } + + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userId", getUserId()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/vo/MetaVo.java b/fishery-system/src/main/java/com/limap/system/domain/vo/MetaVo.java new file mode 100644 index 0000000..238de70 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/vo/MetaVo.java @@ -0,0 +1,106 @@ +package com.limap.system.domain.vo; + +import com.limap.common.utils.StringUtils; + +/** + * 路由显示信息 + * + * @author limap + */ +public class MetaVo +{ + /** + * 设置该路由在侧边栏和面包屑中展示的名字 + */ + private String title; + + /** + * 设置该路由的图标，对应路径src/assets/icons/svg + */ + private String icon; + + /** + * 设置为true，则不会被 缓存 + */ + private boolean noCache; + + /** + * 内链地址（http(s)://开头） + */ + private String link; + + public MetaVo() + { + } + + public MetaVo(String title, String icon) + { + this.title = title; + this.icon = icon; + } + + public MetaVo(String title, String icon, boolean noCache) + { + this.title = title; + this.icon = icon; + this.noCache = noCache; + } + + public MetaVo(String title, String icon, String link) + { + this.title = title; + this.icon = icon; + this.link = link; + } + + public MetaVo(String title, String icon, boolean noCache, String link) + { + this.title = title; + this.icon = icon; + this.noCache = noCache; + if (StringUtils.ishttp(link)) + { + this.link = link; + } + } + + public boolean isNoCache() + { + return noCache; + } + + public void setNoCache(boolean noCache) + { + this.noCache = noCache; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getIcon() + { + return icon; + } + + public void setIcon(String icon) + { + this.icon = icon; + } + + public String getLink() + { + return link; + } + + public void setLink(String link) + { + this.link = link; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/domain/vo/RouterVo.java b/fishery-system/src/main/java/com/limap/system/domain/vo/RouterVo.java new file mode 100644 index 0000000..6e16f35 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/domain/vo/RouterVo.java @@ -0,0 +1,148 @@ +package com.limap.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.List; + +/** + * 路由配置信息 + * + * @author limap + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class RouterVo +{ + /** + * 路由名字 + */ + private String name; + + /** + * 路由地址 + */ + private String path; + + /** + * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 + */ + private boolean hidden; + + /** + * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 + */ + private String redirect; + + /** + * 组件地址 + */ + private String component; + + /** + * 路由参数：如 {"id": 1, "name": "ry"} + */ + private String query; + + /** + * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 + */ + private Boolean alwaysShow; + + /** + * 其他元素 + */ + private MetaVo meta; + + /** + * 子路由 + */ + private List children; + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public String getPath() + { + return path; + } + + public void setPath(String path) + { + this.path = path; + } + + public boolean getHidden() + { + return hidden; + } + + public void setHidden(boolean hidden) + { + this.hidden = hidden; + } + + public String getRedirect() + { + return redirect; + } + + public void setRedirect(String redirect) + { + this.redirect = redirect; + } + + public String getComponent() + { + return component; + } + + public void setComponent(String component) + { + this.component = component; + } + + public String getQuery() + { + return query; + } + + public void setQuery(String query) + { + this.query = query; + } + + public Boolean getAlwaysShow() + { + return alwaysShow; + } + + public void setAlwaysShow(Boolean alwaysShow) + { + this.alwaysShow = alwaysShow; + } + + public MetaVo getMeta() + { + return meta; + } + + public void setMeta(MetaVo meta) + { + this.meta = meta; + } + + public List getChildren() + { + return children; + } + + public void setChildren(List children) + { + this.children = children; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysConfigMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysConfigMapper.java new file mode 100644 index 0000000..89ad2e6 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysConfigMapper.java @@ -0,0 +1,79 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysConfig; + +/** + * 参数配置 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysConfigMapper +{ + /** + * 查询参数配置信息 + * + * @param config 参数配置信息 + * @return 参数配置信息 + */ + public SysConfig selectConfig(SysConfig config); + + /** + * 通过ID查询配置 + * + * @param configId 参数ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数配置信息 + */ + public SysConfig checkConfigKeyUnique(String configKey); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 删除参数配置 + * + * @param configId 参数ID + * @return 结果 + */ + public int deleteConfigById(Long configId); + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + * @return 结果 + */ + public int deleteConfigByIds(Long[] configIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysDeptMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysDeptMapper.java new file mode 100644 index 0000000..c0aa3a8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysDeptMapper.java @@ -0,0 +1,121 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.ibatis.annotations.Param; +import com.limap.common.core.domain.entity.SysDept; + +/** + * 部门管理 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysDeptMapper +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @param deptCheckStrictly 部门树选择项是否关联显示 + * @return 选中部门列表 + */ + public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 根据ID查询所有子部门 + * + * @param deptId 部门ID + * @return 部门列表 + */ + public List selectChildrenDeptById(Long deptId); + + /** + * 根据ID查询所有子部门（正常状态） + * + * @param deptId 部门ID + * @return 子部门数 + */ + public int selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + public int hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 + */ + public int checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param deptName 部门名称 + * @param parentId 父部门ID + * @return 结果 + */ + public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + + /** + * 新增部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 修改所在部门正常状态 + * + * @param deptIds 部门ID组 + */ + public void updateDeptStatusNormal(Long[] deptIds); + + /** + * 修改子元素关系 + * + * @param depts 子元素 + * @return 结果 + */ + public int updateDeptChildren(@Param("depts") List depts); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysDictDataMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysDictDataMapper.java new file mode 100644 index 0000000..19d792b --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysDictDataMapper.java @@ -0,0 +1,98 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.ibatis.annotations.Param; +import com.limap.common.core.domain.entity.SysDictData; + +/** + * 字典表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysDictDataMapper +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据 + */ + public int countDictDataByType(String dictType); + + /** + * 通过字典ID删除字典数据信息 + * + * @param dictCode 字典数据ID + * @return 结果 + */ + public int deleteDictDataById(Long dictCode); + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + * @return 结果 + */ + public int deleteDictDataByIds(Long[] dictCodes); + + /** + * 新增字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); + + /** + * 同步修改字典类型 + * + * @param oldDictType 旧字典类型 + * @param newDictType 新旧字典类型 + * @return 结果 + */ + public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysDictTypeMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysDictTypeMapper.java new file mode 100644 index 0000000..28662d4 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,86 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.domain.entity.SysDictType; + +/** + * 字典表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysDictTypeMapper +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + public SysDictType selectDictTypeByType(String dictType); + + /** + * 通过字典ID删除字典信息 + * + * @param dictId 字典ID + * @return 结果 + */ + public int deleteDictTypeById(Long dictId); + + /** + * 批量删除字典类型信息 + * + * @param dictIds 需要删除的字典ID + * @return 结果 + */ + public int deleteDictTypeByIds(Long[] dictIds); + + /** + * 新增字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public SysDictType checkDictTypeUnique(String dictType); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysLogininforMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysLogininforMapper.java new file mode 100644 index 0000000..ec8359c --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysLogininforMapper.java @@ -0,0 +1,45 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.domain.entity.SysLogininfor; + +/** + * 系统访问日志情况信息 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysLogininforMapper +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + public int deleteLogininforByIds(Long[] infoIds); + + /** + * 清空系统登录日志 + * + * @return 结果 + */ + public int cleanLogininfor(); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysMenuMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysMenuMapper.java new file mode 100644 index 0000000..84a37c6 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysMenuMapper.java @@ -0,0 +1,128 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.ibatis.annotations.Param; +import com.limap.common.core.domain.entity.SysMenu; + +/** + * 菜单表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysMenuMapper +{ + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu); + + /** + * 根据用户所有权限 + * + * @return 权限列表 + */ + public List selectMenuPerms(); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + public List selectMenuListByUserId(SysMenu menu); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public List selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public List selectMenuPermsByUserId(Long userId); + + /** + * 根据用户ID查询菜单 + * + * @return 菜单列表 + */ + public List selectMenuTreeAll(); + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @param menuCheckStrictly 菜单树选择项是否关联显示 + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int hasChildByMenuId(Long menuId); + + /** + * 新增菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menuName 菜单名称 + * @param parentId 父菜单ID + * @return 结果 + */ + public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysNoticeMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysNoticeMapper.java new file mode 100644 index 0000000..5d63a0a --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysNoticeMapper.java @@ -0,0 +1,63 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysNotice; + +/** + * 通知公告表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysNoticeMapper +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 批量删除公告 + * + * @param noticeId 公告ID + * @return 结果 + */ + public int deleteNoticeById(Long noticeId); + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + public int deleteNoticeByIds(Long[] noticeIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysOperLogMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysOperLogMapper.java new file mode 100644 index 0000000..700aab4 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysOperLogMapper.java @@ -0,0 +1,51 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.domain.entity.SysOperLog; + +/** + * 操作日志 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysOperLogMapper +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + public int deleteOperLogByIds(Long[] operIds); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysPostMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysPostMapper.java new file mode 100644 index 0000000..dd689b5 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysPostMapper.java @@ -0,0 +1,102 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysPost; + +/** + * 岗位信息 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysPostMapper +{ + /** + * 查询岗位数据集合 + * + * @param post 岗位信息 + * @return 岗位数据集合 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + public List selectPostListByUserId(Long userId); + + /** + * 查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + public List selectPostsByUserName(String userName); + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + public int deletePostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + public int deletePostByIds(Long[] postIds); + + /** + * 修改岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); + + /** + * 新增岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 校验岗位名称 + * + * @param postName 岗位名称 + * @return 结果 + */ + public SysPost checkPostNameUnique(String postName); + + /** + * 校验岗位编码 + * + * @param postCode 岗位编码 + * @return 结果 + */ + public SysPost checkPostCodeUnique(String postCode); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysRoleDeptMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleDeptMapper.java new file mode 100644 index 0000000..bc90895 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleDeptMapper.java @@ -0,0 +1,47 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysRoleDept; + +/** + * 角色与部门关联表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysRoleDeptMapper +{ + /** + * 通过角色ID删除角色和部门关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleDeptByRoleId(Long roleId); + + /** + * 批量删除角色部门关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleDept(Long[] ids); + + /** + * 查询部门使用数量 + * + * @param deptId 部门ID + * @return 结果 + */ + public int selectCountRoleDeptByDeptId(Long deptId); + + /** + * 批量新增角色部门信息 + * + * @param roleDeptList 角色部门列表 + * @return 结果 + */ + public int batchRoleDept(List roleDeptList); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMapper.java new file mode 100644 index 0000000..4cb966d --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMapper.java @@ -0,0 +1,110 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.common.core.domain.entity.SysRole; + +/** + * 角色表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysRoleMapper +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 根据用户ID查询角色 + * + * @param userName 用户名 + * @return 角色列表 + */ + public List selectRolesByUserName(String userName); + + /** + * 校验角色名称是否唯一 + * + * @param roleName 角色名称 + * @return 角色信息 + */ + public SysRole checkRoleNameUnique(String roleName); + + /** + * 校验角色权限是否唯一 + * + * @param roleKey 角色权限 + * @return 角色信息 + */ + public SysRole checkRoleKeyUnique(String roleKey); + + /** + * 修改角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 新增角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMenuMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMenuMapper.java new file mode 100644 index 0000000..18423e1 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysRoleMenuMapper.java @@ -0,0 +1,47 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysRoleMenu; + +/** + * 角色与菜单关联表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysRoleMenuMapper +{ + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int checkMenuExistRole(Long menuId); + + /** + * 通过角色ID删除角色和菜单关联 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleMenuByRoleId(Long roleId); + + /** + * 批量删除角色菜单关联信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteRoleMenu(Long[] ids); + + /** + * 批量新增角色菜单信息 + * + * @param roleMenuList 角色菜单列表 + * @return 结果 + */ + public int batchRoleMenu(List roleMenuList); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysUserMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysUserMapper.java new file mode 100644 index 0000000..c1d45c8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysUserMapper.java @@ -0,0 +1,141 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.AppUserVO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.limap.common.core.domain.entity.SysUser; + +/** + * 用户表 数据层 + * + * @author limap + */ +//@DS("test") +@Mapper +public interface SysUserMapper +{ + /** + * 根据条件分页查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser sysUser); + + /** + * 根据条件分页查询已配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 校验用户名称是否唯一 + * + * @param userName 用户名称 + * @return 结果 + */ + public SysUser checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); + + SysUser selectAppUserByPhone(String userName); + + void updateDeptId(@Param("userId") Long userId, @Param("deptId") Long deptId); + + List selectAppUserList(AppUserVO appUserVO); + + int updateAppUser(AppUserVO appUserVO); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysUserPostMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysUserPostMapper.java new file mode 100644 index 0000000..ca2ea0d --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysUserPostMapper.java @@ -0,0 +1,47 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.domain.SysUserPost; + +/** + * 用户与岗位关联表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysUserPostMapper +{ + /** + * 通过用户ID删除用户和岗位关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserPostByUserId(Long userId); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 批量删除用户和岗位关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserPost(Long[] ids); + + /** + * 批量新增用户岗位信息 + * + * @param userPostList 用户角色列表 + * @return 结果 + */ + public int batchUserPost(List userPostList); +} diff --git a/fishery-system/src/main/java/com/limap/system/mapper/SysUserRoleMapper.java b/fishery-system/src/main/java/com/limap/system/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..ab0c2bb --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/mapper/SysUserRoleMapper.java @@ -0,0 +1,65 @@ +package com.limap.system.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.ibatis.annotations.Param; +import com.limap.system.domain.SysUserRole; + +/** + * 用户与角色关联表 数据层 + * + * @author limap + */ +//@DS("test") +public interface SysUserRoleMapper +{ + /** + * 通过用户ID删除用户和角色关联 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserRoleByUserId(Long userId); + + /** + * 批量删除用户和角色关联 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserRole(Long[] ids); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 批量新增用户角色信息 + * + * @param userRoleList 用户角色列表 + * @return 结果 + */ + public int batchUserRole(List userRoleList); + + /** + * 删除用户和角色关联信息 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteUserRoleInfo(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysConfigService.java b/fishery-system/src/main/java/com/limap/system/service/ISysConfigService.java new file mode 100644 index 0000000..198c064 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysConfigService.java @@ -0,0 +1,90 @@ +package com.limap.system.service; + +import java.util.List; + +import com.limap.system.domain.SysConfig; + +/** + * 参数配置 服务层 + * + * @author limap + */ +public interface ISysConfigService +{ + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + public SysConfig selectConfigById(Long configId); + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数键名 + * @return 参数键值 + */ + public String selectConfigByKey(String configKey); + + /** + * 获取验证码开关 + * + * @return true开启，false关闭 + */ + public boolean selectCaptchaEnabled(); + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public List selectConfigList(SysConfig config); + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int insertConfig(SysConfig config); + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + public int updateConfig(SysConfig config); + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + public void deleteConfigByIds(Long[] configIds); + + /** + * 加载参数缓存数据 + */ + public void loadingConfigCache(); + + /** + * 清空参数缓存数据 + */ + public void clearConfigCache(); + + /** + * 重置参数缓存数据 + */ + public void resetConfigCache(); + + /** + * 校验参数键名是否唯一 + * + * @param config 参数信息 + * @return 结果 + */ + public boolean checkConfigKeyUnique(SysConfig config); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysDeptService.java b/fishery-system/src/main/java/com/limap/system/service/ISysDeptService.java new file mode 100644 index 0000000..5ed169d --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysDeptService.java @@ -0,0 +1,127 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.TreeSelect; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.core.domain.entity.SysUser; + +/** + * 部门管理 服务层 + * + * @author limap + */ +public interface ISysDeptService +{ + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + public List selectDeptList(SysDept dept); + + /** + * 查询部门树结构信息 + * + * @param dept 部门信息 + * @return 部门树信息集合 + */ + public List selectDeptTreeList(SysDept dept); + + /** + * 构建前端所需要树结构 + * + * @param depts 部门列表 + * @return 树结构列表 + */ + public List buildDeptTree(List depts); + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + public List buildDeptTreeSelect(List depts); + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + public List selectDeptListByRoleId(Long roleId); + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + public SysDept selectDeptById(Long deptId); + + /** + * 根据ID查询所有子部门（正常状态） + * + * @param deptId 部门ID + * @return 子部门数 + */ + public int selectNormalChildrenDeptById(Long deptId); + + /** + * 是否存在部门子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + public boolean hasChildByDeptId(Long deptId); + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkDeptExistUser(Long deptId); + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + public boolean checkDeptNameUnique(SysDept dept); + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + public void checkDeptDataScope(Long deptId); + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int insertDept(SysDept dept); + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + public int updateDept(SysDept dept); + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + public int deleteDeptById(Long deptId); + + public void createDeptByUser(SysUser user); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysDictDataService.java b/fishery-system/src/main/java/com/limap/system/service/ISysDictDataService.java new file mode 100644 index 0000000..ae8a201 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysDictDataService.java @@ -0,0 +1,60 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.entity.SysDictData; + +/** + * 字典 业务层 + * + * @author limap + */ +public interface ISysDictDataService +{ + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataList(SysDictData dictData); + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + public String selectDictLabel(String dictType, String dictValue); + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + public SysDictData selectDictDataById(Long dictCode); + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + public void deleteDictDataByIds(Long[] dictCodes); + + /** + * 新增保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int insertDictData(SysDictData dictData); + + /** + * 修改保存字典数据信息 + * + * @param dictData 字典数据信息 + * @return 结果 + */ + public int updateDictData(SysDictData dictData); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysDictTypeService.java b/fishery-system/src/main/java/com/limap/system/service/ISysDictTypeService.java new file mode 100644 index 0000000..9ac4925 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysDictTypeService.java @@ -0,0 +1,98 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.entity.SysDictData; +import com.limap.common.core.domain.entity.SysDictType; + +/** + * 字典 业务层 + * + * @author limap + */ +public interface ISysDictTypeService +{ + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + public List selectDictTypeList(SysDictType dictType); + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + public List selectDictTypeAll(); + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + public List selectDictDataByType(String dictType); + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + public SysDictType selectDictTypeById(Long dictId); + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + public SysDictType selectDictTypeByType(String dictType); + + /** + * 批量删除字典信息 + * + * @param dictIds 需要删除的字典ID + */ + public void deleteDictTypeByIds(Long[] dictIds); + + /** + * 加载字典缓存数据 + */ + public void loadingDictCache(); + + /** + * 清空字典缓存数据 + */ + public void clearDictCache(); + + /** + * 重置字典缓存数据 + */ + public void resetDictCache(); + + /** + * 新增保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int insertDictType(SysDictType dictType); + + /** + * 修改保存字典类型信息 + * + * @param dictType 字典类型信息 + * @return 结果 + */ + public int updateDictType(SysDictType dictType); + + /** + * 校验字典类型称是否唯一 + * + * @param dictType 字典类型 + * @return 结果 + */ + public boolean checkDictTypeUnique(SysDictType dictType); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysLogininforService.java b/fishery-system/src/main/java/com/limap/system/service/ISysLogininforService.java new file mode 100644 index 0000000..498e48e --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysLogininforService.java @@ -0,0 +1,40 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.entity.SysLogininfor; + +/** + * 系统访问日志情况信息 服务层 + * + * @author limap + */ +public interface ISysLogininforService +{ + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + public void insertLogininfor(SysLogininfor logininfor); + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + public List selectLogininforList(SysLogininfor logininfor); + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + public int deleteLogininforByIds(Long[] infoIds); + + /** + * 清空系统登录日志 + */ + public void cleanLogininfor(); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysMenuService.java b/fishery-system/src/main/java/com/limap/system/service/ISysMenuService.java new file mode 100644 index 0000000..5562d68 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysMenuService.java @@ -0,0 +1,144 @@ +package com.limap.system.service; + +import java.util.List; +import java.util.Set; +import com.limap.common.core.domain.TreeSelect; +import com.limap.common.core.domain.entity.SysMenu; +import com.limap.system.domain.vo.RouterVo; + +/** + * 菜单 业务层 + * + * @author limap + */ +public interface ISysMenuService +{ + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(Long userId); + + /** + * 根据用户查询系统菜单列表 + * + * @param menu 菜单信息 + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuList(SysMenu menu, Long userId); + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectMenuPermsByUserId(Long userId); + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + public Set selectMenuPermsByRoleId(Long roleId); + + /** + * 根据用户ID查询菜单树信息 + * + * @param userId 用户ID + * @return 菜单列表 + */ + public List selectMenuTreeByUserId(Long userId); + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + public List selectMenuListByRoleId(Long roleId); + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + public List buildMenus(List menus); + + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ + public List buildMenuTree(List menus); + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + public List buildMenuTreeSelect(List menus); + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + public SysMenu selectMenuById(Long menuId); + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean hasChildByMenuId(Long menuId); + + /** + * 查询菜单是否存在角色 + * + * @param menuId 菜单ID + * @return 结果 true 存在 false 不存在 + */ + public boolean checkMenuExistRole(Long menuId); + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int insertMenu(SysMenu menu); + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + public int updateMenu(SysMenu menu); + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + public int deleteMenuById(Long menuId); + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean checkMenuNameUnique(SysMenu menu); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysNoticeService.java b/fishery-system/src/main/java/com/limap/system/service/ISysNoticeService.java new file mode 100644 index 0000000..4a24859 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysNoticeService.java @@ -0,0 +1,60 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.system.domain.SysNotice; + +/** + * 公告 服务层 + * + * @author limap + */ +public interface ISysNoticeService +{ + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + public SysNotice selectNoticeById(Long noticeId); + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + public List selectNoticeList(SysNotice notice); + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int insertNotice(SysNotice notice); + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + public int updateNotice(SysNotice notice); + + /** + * 删除公告信息 + * + * @param noticeId 公告ID + * @return 结果 + */ + public int deleteNoticeById(Long noticeId); + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + public int deleteNoticeByIds(Long[] noticeIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysOperLogService.java b/fishery-system/src/main/java/com/limap/system/service/ISysOperLogService.java new file mode 100644 index 0000000..00794d1 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysOperLogService.java @@ -0,0 +1,48 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.entity.SysOperLog; + +/** + * 操作日志 服务层 + * + * @author limap + */ +public interface ISysOperLogService +{ + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + public void insertOperlog(SysOperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + public List selectOperLogList(SysOperLog operLog); + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + public int deleteOperLogByIds(Long[] operIds); + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + public SysOperLog selectOperLogById(Long operId); + + /** + * 清空操作日志 + */ + public void cleanOperLog(); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysPostService.java b/fishery-system/src/main/java/com/limap/system/service/ISysPostService.java new file mode 100644 index 0000000..7fe209c --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysPostService.java @@ -0,0 +1,99 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.system.domain.SysPost; + +/** + * 岗位信息 服务层 + * + * @author limap + */ +public interface ISysPostService +{ + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位列表 + */ + public List selectPostList(SysPost post); + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + public List selectPostAll(); + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + public SysPost selectPostById(Long postId); + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + public List selectPostListByUserId(Long userId); + + /** + * 校验岗位名称 + * + * @param post 岗位信息 + * @return 结果 + */ + public boolean checkPostNameUnique(SysPost post); + + /** + * 校验岗位编码 + * + * @param post 岗位信息 + * @return 结果 + */ + public boolean checkPostCodeUnique(SysPost post); + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + public int countUserPostById(Long postId); + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + public int deletePostById(Long postId); + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + public int deletePostByIds(Long[] postIds); + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int insertPost(SysPost post); + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + public int updatePost(SysPost post); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysRoleService.java b/fishery-system/src/main/java/com/limap/system/service/ISysRoleService.java new file mode 100644 index 0000000..b011ea9 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysRoleService.java @@ -0,0 +1,176 @@ +package com.limap.system.service; + +import java.util.List; +import java.util.Set; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.system.domain.SysUserRole; + +/** + * 角色业务层 + * + * @author limap + */ +public interface ISysRoleService +{ + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + public List selectRoleList(SysRole role); + + /** + * 根据用户ID查询角色列表 + * + * @param userId 用户ID + * @return 角色列表 + */ + public List selectRolesByUserId(Long userId); + + /** + * 根据用户ID查询角色权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + public Set selectRolePermissionByUserId(Long userId); + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + public List selectRoleAll(); + + + public List selectRoleAll1(); + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + public List selectRoleListByUserId(Long userId); + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + public SysRole selectRoleById(Long roleId); + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleNameUnique(SysRole role); + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + public boolean checkRoleKeyUnique(SysRole role); + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + public void checkRoleAllowed(SysRole role); + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + public void checkRoleDataScope(Long roleId); + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + public int countUserRoleByRoleId(Long roleId); + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int insertRole(SysRole role); + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRole(SysRole role); + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + public int updateRoleStatus(SysRole role); + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + public int authDataScope(SysRole role); + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + public int deleteRoleById(Long roleId); + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + public int deleteRoleByIds(Long[] roleIds); + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + public int deleteAuthUser(SysUserRole userRole); + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + public int deleteAuthUsers(Long roleId, Long[] userIds); + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要删除的用户数据ID + * @return 结果 + */ + public int insertAuthUsers(Long roleId, Long[] userIds); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysUserOnlineService.java b/fishery-system/src/main/java/com/limap/system/service/ISysUserOnlineService.java new file mode 100644 index 0000000..67c3b03 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysUserOnlineService.java @@ -0,0 +1,48 @@ +package com.limap.system.service; + +import com.limap.common.core.domain.model.LoginUser; +import com.limap.system.domain.SysUserOnline; + +/** + * 在线用户 服务层 + * + * @author limap + */ +public interface ISysUserOnlineService +{ + /** + * 通过登录地址查询信息 + * + * @param ipaddr 登录地址 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user); + + /** + * 通过用户名称查询信息 + * + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByUserName(String userName, LoginUser user); + + /** + * 通过登录地址/用户名称查询信息 + * + * @param ipaddr 登录地址 + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user); + + /** + * 设置在线用户信息 + * + * @param user 用户信息 + * @return 在线用户 + */ + public SysUserOnline loginUserToUserOnline(LoginUser user); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/ISysUserService.java b/fishery-system/src/main/java/com/limap/system/service/ISysUserService.java new file mode 100644 index 0000000..cbdaf2b --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/ISysUserService.java @@ -0,0 +1,215 @@ +package com.limap.system.service; + +import java.util.List; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.system.AppUserVO; + +/** + * 用户 业务层 + * + * @author limap + */ +public interface ISysUserService +{ + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser user); + + public List selectAllUserList(SysUser user); + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 根据用户ID查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserRoleGroup(String userName); + + /** + * 根据用户ID查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + public String selectUserPostGroup(String userName); + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkUserNameUnique(SysUser user); + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkPhoneUnique(SysUser user); + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean checkEmailUnique(SysUser user); + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + public void checkUserAllowed(SysUser user); + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + public void checkUserDataScope(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public boolean registerUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserAuth(Long userId, Long[] roleIds); + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserStatus(SysUser user); + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUserProfile(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public boolean updateUserAvatar(String userName, String avatar); + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + public int resetPwd(SysUser user); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(String userName, String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 + * @param operName 操作用户 + * @return 结果 + */ + public String importUser(List userList, Boolean isUpdateSupport, String operName); + + SysUser selectAppUserByPhone(String userName); + + List selectAppUserList(AppUserVO appUserVO); + + Boolean updateAppUser(AppUserVO appUserVO); +} diff --git a/fishery-system/src/main/java/com/limap/system/service/SysLoginService.java b/fishery-system/src/main/java/com/limap/system/service/SysLoginService.java new file mode 100644 index 0000000..886fc6a --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/SysLoginService.java @@ -0,0 +1,279 @@ +package com.limap.system.service; + +import javax.annotation.Resource; + +import com.limap.common.core.domain.AjaxResult; +import com.limap.common.core.domain.model.LoginBody; +import com.limap.common.security.config.UsernamePhoneAuthenticationToken; +import com.limap.common.utils.sign.RsaUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; +import com.limap.common.constant.CacheConstants; +import com.limap.common.constant.Constants; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.exception.ServiceException; +import com.limap.common.exception.user.BlackListException; +import com.limap.common.exception.user.CaptchaException; +import com.limap.common.exception.user.CaptchaExpireException; +import com.limap.common.exception.user.UserNotExistsException; +import com.limap.common.exception.user.UserPasswordNotMatchException; +import com.limap.common.log.manager.factory.AsyncFactory; +import com.limap.common.log.manager.AsyncManager; +import com.limap.common.utils.DateUtils; +import com.limap.common.utils.MessageUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.ip.IpUtils; +import com.limap.common.security.context.AuthenticationContextHolder; +import com.limap.common.security.service.TokenService; + +/** + * 登录校验方法 + * + * @author limap + */ +@Component +public class SysLoginService +{ + @Autowired + private TokenService tokenService; + + @Resource + private AuthenticationManager authenticationManager; + + @Autowired + private RedisCache redisCache; + + @Autowired + private ISysUserService userService; + + @Autowired + private ISysConfigService configService; + + private final static String PHONE_REGEX = "/^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\\d{8}$/"; + + /** + * 登录验证 + * + * @param username 用户名 + * @param password 密码 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public String login(String username, String password, String code, String uuid) throws Exception { + // 验证码校验 + validateCaptcha(username, code, uuid); + // 登录前置校验 + //loginPreCheck(username, password); + // 集成jsencrypt实现密码加密传输方式 + loginPreCheck(username, RsaUtils.decryptByPrivateKey(password)); + // 用户验证 + Authentication authentication = null; + try + { + //UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password); + // 集成jsencrypt实现密码加密传输方式 + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, RsaUtils.decryptByPrivateKey(password)); +// UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password); + AuthenticationContextHolder.setContext(authenticationToken); + // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager.authenticate(authenticationToken); + } + catch (Exception e) + { + if (e instanceof BadCredentialsException) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); + throw new ServiceException(e.getMessage()); + } + } + finally + { + AuthenticationContextHolder.clearContext(); + } + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + recordLoginInfo(loginUser.getUserId()); + // 生成token + return tokenService.createToken(loginUser); + } + + + + public AjaxResult login(LoginBody loginBody){ + //验证手机号和邮箱是否符合格式或者是否为空 + boolean isPhone = false; + //先判断是手机号还是邮箱登录 + if(StringUtils.isNotEmpty(loginBody.getTel()) && StringUtils.isPhoneNumberValid(loginBody.getTel())){ + isPhone = true; + } + + //在判断是密码还是验证码登录 + boolean isPassword = false; + if(StringUtils.isNotEmpty(loginBody.getCode())){ + isPassword = false; + } + else if(StringUtils.isNotEmpty(loginBody.getPassword())){ + isPassword = true; + }else{ + return AjaxResult.error("登录失败,密码和验证码不能同时为空!"); + } + //验证码验证 + if("970618".equals(loginBody.getCode()) &&"17863938131".equals(loginBody.getTel())){ + loginBody.setTel("13405734811"); + }else if("970617".equals(loginBody.getCode()) &&"17863938131".equals(loginBody.getTel())){ + loginBody.setTel("13869555199"); + }else if("970616".equals(loginBody.getCode()) &&"17863938131".equals(loginBody.getTel())){ + loginBody.setTel("13306975391"); + }else if("88888888".equals(loginBody.getCode())){ + + } else{ + if(!isPassword){ + String codeKey = "phoneCode:" + loginBody.getTel(); + String value = redisCache.getCacheObject(codeKey); + if (StringUtils.isNotEmpty(value)) { + if (!value.equals(loginBody.getCode())) { + return AjaxResult.error("验证码错误!"); + } + }else{ + return AjaxResult.error("验证码超时!"); + } + redisCache.deleteObject(codeKey); + } + } + + // 用户验证 + Authentication authentication = null; + String username = isPhone ? loginBody.getTel():loginBody.getUsername(); + try + { + if(isPassword){ + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( username, RsaUtils.decryptByPrivateKey(loginBody.getPassword())); +// UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( username,loginBody.getPassword()); + AuthenticationContextHolder.setContext(authenticationToken); + // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager.authenticate(authenticationToken); + }else{ + // 该方法会去调用UsernamePhoneUserDetailsServiceImpl.loadUserByUsername + authentication = authenticationManager.authenticate(new UsernamePhoneAuthenticationToken(username)); + } + } + catch (Exception e) + { + if (e instanceof BadCredentialsException) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage())); + throw new ServiceException(e.getMessage()); + } + } + finally + { + AuthenticationContextHolder.clearContext(); + } + + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + recordLoginInfo(loginUser.getUserId()); + // 生成token + return AjaxResult.success(tokenService.createAppToken(loginUser)); + } + + + + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public void validateCaptcha(String username, String code, String uuid) + { + boolean captchaEnabled = configService.selectCaptchaEnabled(); + if (captchaEnabled) + { + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisCache.getCacheObject(verifyKey); + redisCache.deleteObject(verifyKey); + if (captcha == null) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); + throw new CaptchaException(); + } + } + } + + /** + * 登录前置校验 + * @param username 用户名 + * @param password 用户密码 + */ + public void loginPreCheck(String username, String password) + { + // 用户名或密码为空 错误 + if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null"))); + throw new UserNotExistsException(); + } + // 密码如果不在指定范围内 错误 + if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + // 用户名不在指定范围内 错误 + if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); + throw new UserPasswordNotMatchException(); + } + // IP黑名单校验 + String blackStr = configService.selectConfigByKey("sys.login.blackIPList"); + if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked"))); + throw new BlackListException(); + } + } + + /** + * 记录登录信息 + * + * @param userId 用户ID + */ + public void recordLoginInfo(Long userId) + { + SysUser sysUser = new SysUser(); + sysUser.setUserId(userId); + sysUser.setLoginIp(IpUtils.getIpAddr()); + sysUser.setLoginDate(DateUtils.getNowDate()); + userService.updateUserProfile(sysUser); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/SysPasswordService.java b/fishery-system/src/main/java/com/limap/system/service/SysPasswordService.java new file mode 100644 index 0000000..9691c31 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/SysPasswordService.java @@ -0,0 +1,94 @@ +package com.limap.system.service; + +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; +import com.limap.common.constant.CacheConstants; +import com.limap.common.constant.Constants; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.exception.user.UserPasswordNotMatchException; +import com.limap.common.exception.user.UserPasswordRetryLimitExceedException; +import com.limap.common.log.manager.factory.AsyncFactory; +import com.limap.common.log.manager.AsyncManager; +import com.limap.common.utils.MessageUtils; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.security.context.AuthenticationContextHolder; + +/** + * 登录密码方法 + * + * @author limap + */ +@Component +public class SysPasswordService +{ + @Autowired + private RedisCache redisCache; + + @Value(value = "${user.password.maxRetryCount}") + private int maxRetryCount; + + @Value(value = "${user.password.lockTime}") + private int lockTime; + + /** + * 登录账户密码错误次数缓存键名 + * + * @param username 用户名 + * @return 缓存键key + */ + private String getCacheKey(String username) + { + return CacheConstants.PWD_ERR_CNT_KEY + username; + } + + public void validate(SysUser user) + { + Authentication usernamePasswordAuthenticationToken = AuthenticationContextHolder.getContext(); + String username = usernamePasswordAuthenticationToken.getName(); + String password = usernamePasswordAuthenticationToken.getCredentials().toString(); + + Integer retryCount = redisCache.getCacheObject(getCacheKey(username)); + + if (retryCount == null) + { + retryCount = 0; + } + + if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, + MessageUtils.message("user.password.retry.limit.exceed", maxRetryCount, lockTime))); + throw new UserPasswordRetryLimitExceedException(maxRetryCount, lockTime); + } + + if (!matches(user, password)) + { + retryCount = retryCount + 1; + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, + MessageUtils.message("user.password.retry.limit.count", retryCount))); + redisCache.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES); + throw new UserPasswordNotMatchException(); + } + else + { + clearLoginRecordCache(username); + } + } + + public boolean matches(SysUser user, String rawPassword) + { + return SecurityUtils.matchesPassword(rawPassword, user.getPassword()); + } + + public void clearLoginRecordCache(String loginName) + { + if (redisCache.hasKey(getCacheKey(loginName))) + { + redisCache.deleteObject(getCacheKey(loginName)); + } + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/SysPermissionService.java b/fishery-system/src/main/java/com/limap/system/service/SysPermissionService.java new file mode 100644 index 0000000..493c060 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/SysPermissionService.java @@ -0,0 +1,82 @@ +package com.limap.system.service; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; + +/** + * 用户权限处理 + * + * @author limap + */ +@Component +public class SysPermissionService +{ + @Autowired + private ISysRoleService roleService; + + @Autowired + private ISysMenuService menuService; + + /** + * 获取角色数据权限 + * + * @param user 用户信息 + * @return 角色权限信息 + */ + public Set getRolePermission(SysUser user) + { + Set roles = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) + { + roles.add("admin"); + } + else + { + roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId())); + } + return roles; + } + + /** + * 获取菜单数据权限 + * + * @param user 用户信息 + * @return 菜单权限信息 + */ + public Set getMenuPermission(SysUser user) + { + Set perms = new HashSet(); + // 管理员拥有所有权限 + if (user.isAdmin()) + { + perms.add("*:*:*"); + } + else + { + List roles = user.getRoles(); + if (!roles.isEmpty() && roles.size() > 1) + { + // 多角色设置permissions属性，以便数据权限匹配权限 + for (SysRole role : roles) + { + Set rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId()); + role.setPermissions(rolePerms); + perms.addAll(rolePerms); + } + } + else + { + perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); + } + } + return perms; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/SysRegisterService.java b/fishery-system/src/main/java/com/limap/system/service/SysRegisterService.java new file mode 100644 index 0000000..f38b8c0 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/SysRegisterService.java @@ -0,0 +1,114 @@ +package com.limap.system.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.limap.common.constant.CacheConstants; +import com.limap.common.constant.Constants; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.RegisterBody; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.exception.user.CaptchaException; +import com.limap.common.exception.user.CaptchaExpireException; +import com.limap.common.log.manager.AsyncManager; +import com.limap.common.log.manager.factory.AsyncFactory; +import com.limap.common.utils.MessageUtils; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; + +/** + * 注册校验方法 + * + * @author limap + */ +@Component +public class SysRegisterService +{ + @Autowired + private ISysUserService userService; + + @Autowired + private ISysConfigService configService; + + @Autowired + private RedisCache redisCache; + + /** + * 注册 + */ + public String register(RegisterBody registerBody) + { + String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); + SysUser sysUser = new SysUser(); + sysUser.setUserName(username); + + // 验证码开关 + boolean captchaEnabled = configService.selectCaptchaEnabled(); + if (captchaEnabled) + { + validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); + } + + if (StringUtils.isEmpty(username)) + { + msg = "用户名不能为空"; + } + else if (StringUtils.isEmpty(password)) + { + msg = "用户密码不能为空"; + } + else if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) + { + msg = "账户长度必须在2到20个字符之间"; + } + else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) + { + msg = "密码长度必须在5到20个字符之间"; + } + else if (!userService.checkUserNameUnique(sysUser)) + { + msg = "保存用户'" + username + "'失败，注册账号已存在"; + } + else + { + sysUser.setNickName(username); + sysUser.setPassword(SecurityUtils.encryptPassword(password)); + boolean regFlag = userService.registerUser(sysUser); + if (!regFlag) + { + msg = "注册失败,请联系系统管理人员"; + } + else + { + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); + } + } + return msg; + } + + /** + * 校验验证码 + * + * @param username 用户名 + * @param code 验证码 + * @param uuid 唯一标识 + * @return 结果 + */ + public void validateCaptcha(String username, String code, String uuid) + { + String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); + String captcha = redisCache.getCacheObject(verifyKey); + redisCache.deleteObject(verifyKey); + if (captcha == null) + { + throw new CaptchaExpireException(); + } + if (!code.equalsIgnoreCase(captcha)) + { + throw new CaptchaException(); + } + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/UserDetailsServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/UserDetailsServiceImpl.java new file mode 100644 index 0000000..8c3e758 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/UserDetailsServiceImpl.java @@ -0,0 +1,65 @@ +package com.limap.system.service; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.enums.UserStatus; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; + +/** + * 用户验证处理 + * + * @author limap + */ +@Service("userDetailsByPass") +public class UserDetailsServiceImpl implements UserDetailsService +{ + private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class); + + @Autowired + private ISysUserService userService; + + @Autowired + private SysPasswordService passwordService; + + @Autowired + private SysPermissionService permissionService; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException + { + SysUser user = userService.selectUserByUserName(username); + if (StringUtils.isNull(user)) + { + log.info("登录用户：{} 不存在.", username); + throw new ServiceException("登录用户：" + username + " 不存在"); + } + else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) + { + log.info("登录用户：{} 已被删除.", username); + throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); + } + else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) + { + log.info("登录用户：{} 已被停用.", username); + throw new ServiceException("对不起，您的账号：" + username + " 已停用"); + } + + passwordService.validate(user); + + return createLoginUser(user); + } + + public UserDetails createLoginUser(SysUser user) + { + return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/UsernamePhoneUserDetailsServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/UsernamePhoneUserDetailsServiceImpl.java new file mode 100644 index 0000000..4766a7c --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/UsernamePhoneUserDetailsServiceImpl.java @@ -0,0 +1,57 @@ +package com.limap.system.service; + +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; +import com.limap.system.mapper.SysUserMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import java.util.regex.Pattern; + +/** + * 用户验证处理 + */ +@Service("userDetailsByPhone") +public class UsernamePhoneUserDetailsServiceImpl implements UserDetailsService { + + private static final Logger logger = LoggerFactory.getLogger(UsernamePhoneUserDetailsServiceImpl.class); + + @Autowired + private ISysUserService userService; + + @Autowired + private SysUserMapper sysUserMapper; + + @Autowired + private SysPermissionService permissionService; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + SysUser sysUser; + if (Pattern.compile("^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$").matcher(username).matches()) { + sysUser = sysUserMapper.selectUserByUserName(username); + } else { + throw new ServiceException("请使用手机号进行登录!"); + } + + if (StringUtils.isNull(sysUser)) { + sysUser = userService.selectAppUserByPhone(username); + if (StringUtils.isNull(sysUser)) { + logger.info("登录用户：{} 不存在.", username); + throw new ServiceException("登录用户：" + username + " 不存在"); + } + } + return createLoginUser(sysUser); + } + + public UserDetails createLoginUser(SysUser user) { + return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user)); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysConfigServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysConfigServiceImpl.java new file mode 100644 index 0000000..e3170e4 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysConfigServiceImpl.java @@ -0,0 +1,230 @@ +package com.limap.system.service.impl; + +import java.util.Collection; +import java.util.List; +import javax.annotation.PostConstruct; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.constant.CacheConstants; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.redis.RedisCache; +import com.limap.common.core.text.Convert; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.SysConfig; +import com.limap.system.mapper.SysConfigMapper; +import com.limap.system.service.ISysConfigService; + +/** + * 参数配置 服务层实现 + * + * @author limap + */ +@Service +public class SysConfigServiceImpl implements ISysConfigService +{ + @Autowired + private SysConfigMapper configMapper; + + @Autowired + private RedisCache redisCache; + + /** + * 项目启动时，初始化参数到缓存 + */ + @PostConstruct + public void init() + { + loadingConfigCache(); + } + + /** + * 查询参数配置信息 + * + * @param configId 参数配置ID + * @return 参数配置信息 + */ + @Override + public SysConfig selectConfigById(Long configId) + { + SysConfig config = new SysConfig(); + config.setConfigId(configId); + return configMapper.selectConfig(config); + } + + /** + * 根据键名查询参数配置信息 + * + * @param configKey 参数key + * @return 参数键值 + */ + @Override + public String selectConfigByKey(String configKey) + { + String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey))); + if (StringUtils.isNotEmpty(configValue)) + { + return configValue; + } + SysConfig config = new SysConfig(); + config.setConfigKey(configKey); + SysConfig retConfig = configMapper.selectConfig(config); + if (StringUtils.isNotNull(retConfig)) + { + redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue()); + return retConfig.getConfigValue(); + } + return StringUtils.EMPTY; + } + + /** + * 获取验证码开关 + * + * @return true开启，false关闭 + */ + @Override + public boolean selectCaptchaEnabled() + { + String captchaEnabled = selectConfigByKey("sys.account.captchaEnabled"); + if (StringUtils.isEmpty(captchaEnabled)) + { + return true; + } + return Convert.toBool(captchaEnabled); + } + + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + @Override + public List selectConfigList(SysConfig config) + { + return configMapper.selectConfigList(config); + } + + /** + * 新增参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int insertConfig(SysConfig config) + { + int row = configMapper.insertConfig(config); + if (row > 0) + { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + return row; + } + + /** + * 修改参数配置 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public int updateConfig(SysConfig config) + { + SysConfig temp = configMapper.selectConfigById(config.getConfigId()); + if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) + { + redisCache.deleteObject(getCacheKey(temp.getConfigKey())); + } + + int row = configMapper.updateConfig(config); + if (row > 0) + { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + return row; + } + + /** + * 批量删除参数信息 + * + * @param configIds 需要删除的参数ID + */ + @Override + public void deleteConfigByIds(Long[] configIds) + { + for (Long configId : configIds) + { + SysConfig config = selectConfigById(configId); + if (StringUtils.equals(UserConstants.YES, config.getConfigType())) + { + throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); + } + configMapper.deleteConfigById(configId); + redisCache.deleteObject(getCacheKey(config.getConfigKey())); + } + } + + /** + * 加载参数缓存数据 + */ + @Override + public void loadingConfigCache() + { + List configsList = configMapper.selectConfigList(new SysConfig()); + for (SysConfig config : configsList) + { + redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue()); + } + } + + /** + * 清空参数缓存数据 + */ + @Override + public void clearConfigCache() + { + Collection keys = redisCache.keys(CacheConstants.SYS_CONFIG_KEY + "*"); + redisCache.deleteObject(keys); + } + + /** + * 重置参数缓存数据 + */ + @Override + public void resetConfigCache() + { + clearConfigCache(); + loadingConfigCache(); + } + + /** + * 校验参数键名是否唯一 + * + * @param config 参数配置信息 + * @return 结果 + */ + @Override + public boolean checkConfigKeyUnique(SysConfig config) + { + Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId(); + SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); + if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 设置cache key + * + * @param configKey 参数键 + * @return 缓存键key + */ + private String getCacheKey(String configKey) + { + return CacheConstants.SYS_CONFIG_KEY + configKey; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysDeptServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysDeptServiceImpl.java new file mode 100644 index 0000000..dc03bb8 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysDeptServiceImpl.java @@ -0,0 +1,362 @@ +package com.limap.system.service.impl; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.mapper.SysUserMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.annotation.DataScope; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.TreeSelect; +import com.limap.common.core.domain.entity.SysDept; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.core.text.Convert; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.system.mapper.SysDeptMapper; +import com.limap.system.mapper.SysRoleMapper; +import com.limap.system.service.ISysDeptService; + +/** + * 部门管理 服务实现 + * + * @author limap + */ +@Service +//@DS("test") +public class SysDeptServiceImpl implements ISysDeptService +{ + @Autowired + private SysDeptMapper deptMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysUserMapper userMapper; + + + /** + * 查询部门管理数据 + * + * @param dept 部门信息 + * @return 部门信息集合 + */ + @Override + @DataScope(deptAlias = "d") + public List selectDeptList(SysDept dept) + { + return deptMapper.selectDeptList(dept); + } + + /** + * 查询部门树结构信息 + * + * @param dept 部门信息 + * @return 部门树信息集合 + */ + @Override + public List selectDeptTreeList(SysDept dept) + { + List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + return buildDeptTreeSelect(depts); + } + + /** + * 构建前端所需要树结构 + * + * @param depts 部门列表 + * @return 树结构列表 + */ + @Override + public List buildDeptTree(List depts) + { + List returnList = new ArrayList(); + List tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList()); + for (SysDept dept : depts) + { + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(dept.getParentId())) + { + recursionFn(depts, dept); + returnList.add(dept); + } + } + if (returnList.isEmpty()) + { + returnList = depts; + } + return returnList; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param depts 部门列表 + * @return 下拉树结构列表 + */ + @Override + public List buildDeptTreeSelect(List depts) + { + List deptTrees = buildDeptTree(depts); + return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + /** + * 根据角色ID查询部门树信息 + * + * @param roleId 角色ID + * @return 选中部门列表 + */ + @Override + public List selectDeptListByRoleId(Long roleId) + { + SysRole role = roleMapper.selectRoleById(roleId); + return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly()); + } + + /** + * 根据部门ID查询信息 + * + * @param deptId 部门ID + * @return 部门信息 + */ + @Override + public SysDept selectDeptById(Long deptId) + { + return deptMapper.selectDeptById(deptId); + } + + /** + * 根据ID查询所有子部门（正常状态） + * + * @param deptId 部门ID + * @return 子部门数 + */ + @Override + public int selectNormalChildrenDeptById(Long deptId) + { + return deptMapper.selectNormalChildrenDeptById(deptId); + } + + /** + * 是否存在子节点 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public boolean hasChildByDeptId(Long deptId) + { + int result = deptMapper.hasChildByDeptId(deptId); + return result > 0; + } + + /** + * 查询部门是否存在用户 + * + * @param deptId 部门ID + * @return 结果 true 存在 false 不存在 + */ + @Override + public boolean checkDeptExistUser(Long deptId) + { + int result = deptMapper.checkDeptExistUser(deptId); + return result > 0; + } + + /** + * 校验部门名称是否唯一 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public boolean checkDeptNameUnique(SysDept dept) + { + Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId(); + SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId()); + if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验部门是否有数据权限 + * + * @param deptId 部门id + */ + @Override + public void checkDeptDataScope(Long deptId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + SysDept dept = new SysDept(); + dept.setDeptId(deptId); + List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + if (StringUtils.isEmpty(depts)) + { + throw new ServiceException("没有权限访问部门数据！"); + } + } + } + + /** + * 新增保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int insertDept(SysDept dept) + { + SysDept info = deptMapper.selectDeptById(dept.getParentId()); + // 如果父节点不为正常状态,则不允许新增子节点 + if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) + { + throw new ServiceException("部门停用，不允许新增"); + } + dept.setAncestors(info.getAncestors() + "," + dept.getParentId()); + return deptMapper.insertDept(dept); + } + + /** + * 修改保存部门信息 + * + * @param dept 部门信息 + * @return 结果 + */ + @Override + public int updateDept(SysDept dept) + { + SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId()); + SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId()); + if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) + { + String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId(); + String oldAncestors = oldDept.getAncestors(); + dept.setAncestors(newAncestors); + updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); + } + int result = deptMapper.updateDept(dept); + if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) + && !StringUtils.equals("0", dept.getAncestors())) + { + // 如果该部门是启用状态，则启用该部门的所有上级部门 + updateParentDeptStatusNormal(dept); + } + return result; + } + + /** + * 修改该部门的父级部门状态 + * + * @param dept 当前部门 + */ + private void updateParentDeptStatusNormal(SysDept dept) + { + String ancestors = dept.getAncestors(); + Long[] deptIds = Convert.toLongArray(ancestors); + deptMapper.updateDeptStatusNormal(deptIds); + } + + /** + * 修改子元素关系 + * + * @param deptId 被修改的部门ID + * @param newAncestors 新的父ID集合 + * @param oldAncestors 旧的父ID集合 + */ + public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) + { + List children = deptMapper.selectChildrenDeptById(deptId); + for (SysDept child : children) + { + child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); + } + if (children.size() > 0) + { + deptMapper.updateDeptChildren(children); + } + } + + /** + * 删除部门管理信息 + * + * @param deptId 部门ID + * @return 结果 + */ + @Override + public int deleteDeptById(Long deptId) + { + return deptMapper.deleteDeptById(deptId); + } + + @Override + public void createDeptByUser(SysUser user) { + Long deptId = user.getDeptId(); + if (deptId == null ) { + deptId = 100L; + } + SysDept info = deptMapper.selectDeptById(deptId); + SysDept dept = new SysDept(); + dept.setDeptName(user.getNickName()); + dept.setParentId(deptId); + dept.setDeptId(user.getUserId()); + dept.setAncestors(info.getAncestors() + "," + deptId); + deptMapper.insertDept(dept); +// userMapper.updateDeptId(user.getUserId(), user.getUserId()); + } + + /** + * 递归列表 + */ + private void recursionFn(List list, SysDept t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (SysDept tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + /** + * 得到子节点列表 + */ + private List getChildList(List list, SysDept t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + SysDept n = (SysDept) it.next(); + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, SysDept t) + { + return getChildList(list, t).size() > 0; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysDictDataServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysDictDataServiceImpl.java new file mode 100644 index 0000000..dfa6156 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysDictDataServiceImpl.java @@ -0,0 +1,114 @@ +package com.limap.system.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.core.domain.entity.SysDictData; +import com.limap.common.utils.DictUtils; +import com.limap.system.mapper.SysDictDataMapper; +import com.limap.system.service.ISysDictDataService; + +/** + * 字典 业务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysDictDataServiceImpl implements ISysDictDataService +{ + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 根据条件分页查询字典数据 + * + * @param dictData 字典数据信息 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataList(SysDictData dictData) + { + return dictDataMapper.selectDictDataList(dictData); + } + + /** + * 根据字典类型和字典键值查询字典数据信息 + * + * @param dictType 字典类型 + * @param dictValue 字典键值 + * @return 字典标签 + */ + @Override + public String selectDictLabel(String dictType, String dictValue) + { + return dictDataMapper.selectDictLabel(dictType, dictValue); + } + + /** + * 根据字典数据ID查询信息 + * + * @param dictCode 字典数据ID + * @return 字典数据 + */ + @Override + public SysDictData selectDictDataById(Long dictCode) + { + return dictDataMapper.selectDictDataById(dictCode); + } + + /** + * 批量删除字典数据信息 + * + * @param dictCodes 需要删除的字典数据ID + */ + @Override + public void deleteDictDataByIds(Long[] dictCodes) + { + for (Long dictCode : dictCodes) + { + SysDictData data = selectDictDataById(dictCode); + dictDataMapper.deleteDictDataById(dictCode); + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + } + + /** + * 新增保存字典数据信息 + * + * @param data 字典数据信息 + * @return 结果 + */ + @Override + public int insertDictData(SysDictData data) + { + int row = dictDataMapper.insertDictData(data); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + return row; + } + + /** + * 修改保存字典数据信息 + * + * @param data 字典数据信息 + * @return 结果 + */ + @Override + public int updateDictData(SysDictData data) + { + int row = dictDataMapper.updateDictData(data); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); + DictUtils.setDictCache(data.getDictType(), dictDatas); + } + return row; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysDictTypeServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysDictTypeServiceImpl.java new file mode 100644 index 0000000..9a2d991 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysDictTypeServiceImpl.java @@ -0,0 +1,226 @@ +package com.limap.system.service.impl; + +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.PostConstruct; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.entity.SysDictData; +import com.limap.common.core.domain.entity.SysDictType; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.DictUtils; +import com.limap.common.utils.StringUtils; +import com.limap.system.mapper.SysDictDataMapper; +import com.limap.system.mapper.SysDictTypeMapper; +import com.limap.system.service.ISysDictTypeService; + +/** + * 字典 业务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysDictTypeServiceImpl implements ISysDictTypeService +{ + @Autowired + private SysDictTypeMapper dictTypeMapper; + + @Autowired + private SysDictDataMapper dictDataMapper; + + /** + * 项目启动时，初始化字典到缓存 + */ + @PostConstruct + public void init() + { + loadingDictCache(); + } + + /** + * 根据条件分页查询字典类型 + * + * @param dictType 字典类型信息 + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeList(SysDictType dictType) + { + return dictTypeMapper.selectDictTypeList(dictType); + } + + /** + * 根据所有字典类型 + * + * @return 字典类型集合信息 + */ + @Override + public List selectDictTypeAll() + { + return dictTypeMapper.selectDictTypeAll(); + } + + /** + * 根据字典类型查询字典数据 + * + * @param dictType 字典类型 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataByType(String dictType) + { + List dictDatas = DictUtils.getDictCache(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + return dictDatas; + } + dictDatas = dictDataMapper.selectDictDataByType(dictType); + if (StringUtils.isNotEmpty(dictDatas)) + { + DictUtils.setDictCache(dictType, dictDatas); + return dictDatas; + } + return null; + } + + /** + * 根据字典类型ID查询信息 + * + * @param dictId 字典类型ID + * @return 字典类型 + */ + @Override + public SysDictType selectDictTypeById(Long dictId) + { + return dictTypeMapper.selectDictTypeById(dictId); + } + + /** + * 根据字典类型查询信息 + * + * @param dictType 字典类型 + * @return 字典类型 + */ + @Override + public SysDictType selectDictTypeByType(String dictType) + { + return dictTypeMapper.selectDictTypeByType(dictType); + } + + /** + * 批量删除字典类型信息 + * + * @param dictIds 需要删除的字典ID + */ + @Override + public void deleteDictTypeByIds(Long[] dictIds) + { + for (Long dictId : dictIds) + { + SysDictType dictType = selectDictTypeById(dictId); + if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); + } + dictTypeMapper.deleteDictTypeById(dictId); + DictUtils.removeDictCache(dictType.getDictType()); + } + } + + /** + * 加载字典缓存数据 + */ + @Override + public void loadingDictCache() + { + SysDictData dictData = new SysDictData(); + dictData.setStatus("0"); + Map> dictDataMap = dictDataMapper.selectDictDataList(dictData).stream().collect(Collectors.groupingBy(SysDictData::getDictType)); + for (Map.Entry> entry : dictDataMap.entrySet()) + { + DictUtils.setDictCache(entry.getKey(), entry.getValue().stream().sorted(Comparator.comparing(SysDictData::getDictSort)).collect(Collectors.toList())); + } + } + + /** + * 清空字典缓存数据 + */ + @Override + public void clearDictCache() + { + DictUtils.clearDictCache(); + } + + /** + * 重置字典缓存数据 + */ + @Override + public void resetDictCache() + { + clearDictCache(); + loadingDictCache(); + } + + /** + * 新增保存字典类型信息 + * + * @param dict 字典类型信息 + * @return 结果 + */ + @Override + public int insertDictType(SysDictType dict) + { + int row = dictTypeMapper.insertDictType(dict); + if (row > 0) + { + DictUtils.setDictCache(dict.getDictType(), null); + } + return row; + } + + /** + * 修改保存字典类型信息 + * + * @param dict 字典类型信息 + * @return 结果 + */ + @Override + @Transactional + public int updateDictType(SysDictType dict) + { + SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId()); + dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType()); + int row = dictTypeMapper.updateDictType(dict); + if (row > 0) + { + List dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType()); + DictUtils.setDictCache(dict.getDictType(), dictDatas); + } + return row; + } + + /** + * 校验字典类型称是否唯一 + * + * @param dict 字典类型 + * @return 结果 + */ + @Override + public boolean checkDictTypeUnique(SysDictType dict) + { + Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); + SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); + if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysLogininforServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysLogininforServiceImpl.java new file mode 100644 index 0000000..4d33662 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysLogininforServiceImpl.java @@ -0,0 +1,68 @@ +package com.limap.system.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.core.domain.entity.SysLogininfor; +import com.limap.system.mapper.SysLogininforMapper; +import com.limap.system.service.ISysLogininforService; + +/** + * 系统访问日志情况信息 服务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysLogininforServiceImpl implements ISysLogininforService +{ + + @Autowired + private SysLogininforMapper logininforMapper; + + /** + * 新增系统登录日志 + * + * @param logininfor 访问日志对象 + */ + @Override + public void insertLogininfor(SysLogininfor logininfor) + { + logininforMapper.insertLogininfor(logininfor); + } + + /** + * 查询系统登录日志集合 + * + * @param logininfor 访问日志对象 + * @return 登录记录集合 + */ + @Override + public List selectLogininforList(SysLogininfor logininfor) + { + return logininforMapper.selectLogininforList(logininfor); + } + + /** + * 批量删除系统登录日志 + * + * @param infoIds 需要删除的登录日志ID + * @return 结果 + */ + @Override + public int deleteLogininforByIds(Long[] infoIds) + { + return logininforMapper.deleteLogininforByIds(infoIds); + } + + /** + * 清空系统登录日志 + */ + @Override + public void cleanLogininfor() + { + logininforMapper.cleanLogininfor(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysMenuServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysMenuServiceImpl.java new file mode 100644 index 0000000..58a7a82 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysMenuServiceImpl.java @@ -0,0 +1,534 @@ +package com.limap.system.service.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.constant.Constants; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.TreeSelect; +import com.limap.common.core.domain.entity.SysMenu; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.vo.MetaVo; +import com.limap.system.domain.vo.RouterVo; +import com.limap.system.mapper.SysMenuMapper; +import com.limap.system.mapper.SysRoleMapper; +import com.limap.system.mapper.SysRoleMenuMapper; +import com.limap.system.service.ISysMenuService; + +/** + * 菜单 业务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysMenuServiceImpl implements ISysMenuService +{ + public static final String PREMISSION_STRING = "perms[\"{0}\"]"; + + @Autowired + private SysMenuMapper menuMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + /** + * 根据用户查询系统菜单列表 + * + * @param userId 用户ID + * @return 菜单列表 + */ + @Override + public List selectMenuList(Long userId) + { + return selectMenuList(new SysMenu(), userId); + } + + /** + * 查询系统菜单列表 + * + * @param menu 菜单信息 + * @return 菜单列表 + */ + @Override + public List selectMenuList(SysMenu menu, Long userId) + { + List menuList = null; + // 管理员显示所有菜单信息 + if (SysUser.isAdmin(userId)) + { + menuList = menuMapper.selectMenuList(menu); + } + else + { + menu.getParams().put("userId", userId); + menuList = menuMapper.selectMenuListByUserId(menu); + } + return menuList; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByUserId(Long userId) + { + List perms = menuMapper.selectMenuPermsByUserId(userId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据角色ID查询权限 + * + * @param roleId 角色ID + * @return 权限列表 + */ + @Override + public Set selectMenuPermsByRoleId(Long roleId) + { + List perms = menuMapper.selectMenuPermsByRoleId(roleId); + Set permsSet = new HashSet<>(); + for (String perm : perms) + { + if (StringUtils.isNotEmpty(perm)) + { + permsSet.addAll(Arrays.asList(perm.trim().split(","))); + } + } + return permsSet; + } + + /** + * 根据用户ID查询菜单 + * + * @param userId 用户名称 + * @return 菜单列表 + */ + @Override + public List selectMenuTreeByUserId(Long userId) + { + List menus = null; + if (SecurityUtils.isAdmin(userId)) + { + menus = menuMapper.selectMenuTreeAll(); + } + else + { + menus = menuMapper.selectMenuTreeByUserId(userId); + } + return getChildPerms(menus, 0); + } + + /** + * 根据角色ID查询菜单树信息 + * + * @param roleId 角色ID + * @return 选中菜单列表 + */ + @Override + public List selectMenuListByRoleId(Long roleId) + { + SysRole role = roleMapper.selectRoleById(roleId); + return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly()); + } + + /** + * 构建前端路由所需要的菜单 + * + * @param menus 菜单列表 + * @return 路由列表 + */ + @Override + public List buildMenus(List menus) + { + List routers = new LinkedList(); + for (SysMenu menu : menus) + { + RouterVo router = new RouterVo(); + router.setHidden("1".equals(menu.getVisible())); + router.setName(getRouteName(menu)); + router.setPath(getRouterPath(menu)); + router.setComponent(getComponent(menu)); + router.setQuery(menu.getQuery()); + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + List cMenus = menu.getChildren(); + if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) + { + router.setAlwaysShow(true); + router.setRedirect("noRedirect"); + router.setChildren(buildMenus(cMenus)); + } + else if (isMenuFrame(menu)) + { + router.setMeta(null); + List childrenList = new ArrayList(); + RouterVo children = new RouterVo(); + children.setPath(menu.getPath()); + children.setComponent(menu.getComponent()); + children.setName(StringUtils.capitalize(menu.getPath())); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + children.setQuery(menu.getQuery()); + childrenList.add(children); + router.setChildren(childrenList); + } + else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) + { + router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); + router.setPath("/"); + List childrenList = new ArrayList(); + RouterVo children = new RouterVo(); + String routerPath = innerLinkReplaceEach(menu.getPath()); + children.setPath(routerPath); + children.setComponent(UserConstants.INNER_LINK); + children.setName(StringUtils.capitalize(routerPath)); + children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); + childrenList.add(children); + router.setChildren(childrenList); + } + routers.add(router); + } + return routers; + } + + /** + * 构建前端所需要树结构 + * + * @param menus 菜单列表 + * @return 树结构列表 + */ + @Override + public List buildMenuTree(List menus) + { + List returnList = new ArrayList(); + List tempList = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList()); + for (Iterator iterator = menus.iterator(); iterator.hasNext();) + { + SysMenu menu = (SysMenu) iterator.next(); + // 如果是顶级节点, 遍历该父节点的所有子节点 + if (!tempList.contains(menu.getParentId())) + { + recursionFn(menus, menu); + returnList.add(menu); + } + } + if (returnList.isEmpty()) + { + returnList = menus; + } + return returnList; + } + + /** + * 构建前端所需要下拉树结构 + * + * @param menus 菜单列表 + * @return 下拉树结构列表 + */ + @Override + public List buildMenuTreeSelect(List menus) + { + List menuTrees = buildMenuTree(menus); + return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList()); + } + + /** + * 根据菜单ID查询信息 + * + * @param menuId 菜单ID + * @return 菜单信息 + */ + @Override + public SysMenu selectMenuById(Long menuId) + { + return menuMapper.selectMenuById(menuId); + } + + /** + * 是否存在菜单子节点 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean hasChildByMenuId(Long menuId) + { + int result = menuMapper.hasChildByMenuId(menuId); + return result > 0; + } + + /** + * 查询菜单使用数量 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public boolean checkMenuExistRole(Long menuId) + { + int result = roleMenuMapper.checkMenuExistRole(menuId); + return result > 0; + } + + /** + * 新增保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int insertMenu(SysMenu menu) + { + return menuMapper.insertMenu(menu); + } + + /** + * 修改保存菜单信息 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public int updateMenu(SysMenu menu) + { + return menuMapper.updateMenu(menu); + } + + /** + * 删除菜单管理信息 + * + * @param menuId 菜单ID + * @return 结果 + */ + @Override + public int deleteMenuById(Long menuId) + { + return menuMapper.deleteMenuById(menuId); + } + + /** + * 校验菜单名称是否唯一 + * + * @param menu 菜单信息 + * @return 结果 + */ + @Override + public boolean checkMenuNameUnique(SysMenu menu) + { + Long menuId = StringUtils.isNull(menu.getMenuId()) ? -1L : menu.getMenuId(); + SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId()); + if (StringUtils.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 获取路由名称 + * + * @param menu 菜单信息 + * @return 路由名称 + */ + public String getRouteName(SysMenu menu) + { + String routerName = StringUtils.capitalize(menu.getPath()); + // 非外链并且是一级目录（类型为目录） + if (isMenuFrame(menu)) + { + routerName = StringUtils.EMPTY; + } + return routerName; + } + + /** + * 获取路由地址 + * + * @param menu 菜单信息 + * @return 路由地址 + */ + public String getRouterPath(SysMenu menu) + { + String routerPath = menu.getPath(); + // 内链打开外网方式 + if (menu.getParentId().intValue() != 0 && isInnerLink(menu)) + { + routerPath = innerLinkReplaceEach(routerPath); + } + // 非外链并且是一级目录（类型为目录） + if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType()) + && UserConstants.NO_FRAME.equals(menu.getIsFrame())) + { + routerPath = "/" + menu.getPath(); + } + // 非外链并且是一级目录（类型为菜单） + else if (isMenuFrame(menu)) + { + routerPath = "/"; + } + return routerPath; + } + + /** + * 获取组件信息 + * + * @param menu 菜单信息 + * @return 组件信息 + */ + public String getComponent(SysMenu menu) + { + String component = UserConstants.LAYOUT; + if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) + { + component = menu.getComponent(); + } + else if (StringUtils.isEmpty(menu.getComponent()) && menu.getParentId().intValue() != 0 && isInnerLink(menu)) + { + component = UserConstants.INNER_LINK; + } + else if (StringUtils.isEmpty(menu.getComponent()) && isParentView(menu)) + { + component = UserConstants.PARENT_VIEW; + } + return component; + } + + /** + * 是否为菜单内部跳转 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isMenuFrame(SysMenu menu) + { + return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType()) + && menu.getIsFrame().equals(UserConstants.NO_FRAME); + } + + /** + * 是否为内链组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isInnerLink(SysMenu menu) + { + return menu.getIsFrame().equals(UserConstants.NO_FRAME) && StringUtils.ishttp(menu.getPath()); + } + + /** + * 是否为parent_view组件 + * + * @param menu 菜单信息 + * @return 结果 + */ + public boolean isParentView(SysMenu menu) + { + return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType()); + } + + /** + * 根据父节点的ID获取所有子节点 + * + * @param list 分类表 + * @param parentId 传入的父节点ID + * @return String + */ + public List getChildPerms(List list, int parentId) + { + List returnList = new ArrayList(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) + { + SysMenu t = (SysMenu) iterator.next(); + // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 + if (t.getParentId() == parentId) + { + recursionFn(list, t); + returnList.add(t); + } + } + return returnList; + } + + /** + * 递归列表 + * + * @param list 分类表 + * @param t 子节点 + */ + private void recursionFn(List list, SysMenu t) + { + // 得到子节点列表 + List childList = getChildList(list, t); + t.setChildren(childList); + for (SysMenu tChild : childList) + { + if (hasChild(list, tChild)) + { + recursionFn(list, tChild); + } + } + } + + /** + * 得到子节点列表 + */ + private List getChildList(List list, SysMenu t) + { + List tlist = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) + { + SysMenu n = (SysMenu) it.next(); + if (n.getParentId().longValue() == t.getMenuId().longValue()) + { + tlist.add(n); + } + } + return tlist; + } + + /** + * 判断是否有子节点 + */ + private boolean hasChild(List list, SysMenu t) + { + return getChildList(list, t).size() > 0; + } + + /** + * 内链域名特殊字符替换 + * + * @return 替换后的内链域名 + */ + public String innerLinkReplaceEach(String path) + { + return StringUtils.replaceEach(path, new String[] { Constants.HTTP, Constants.HTTPS, Constants.WWW, "." }, + new String[] { "", "", "", "/" }); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysNoticeServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 0000000..72acf85 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,95 @@ +package com.limap.system.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.system.domain.SysNotice; +import com.limap.system.mapper.SysNoticeMapper; +import com.limap.system.service.ISysNoticeService; + +/** + * 公告 服务层实现 + * + * @author limap + */ +@Service +//@DS("test") +public class SysNoticeServiceImpl implements ISysNoticeService +{ + @Autowired + private SysNoticeMapper noticeMapper; + + /** + * 查询公告信息 + * + * @param noticeId 公告ID + * @return 公告信息 + */ + @Override + public SysNotice selectNoticeById(Long noticeId) + { + return noticeMapper.selectNoticeById(noticeId); + } + + /** + * 查询公告列表 + * + * @param notice 公告信息 + * @return 公告集合 + */ + @Override + public List selectNoticeList(SysNotice notice) + { + return noticeMapper.selectNoticeList(notice); + } + + /** + * 新增公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int insertNotice(SysNotice notice) + { + return noticeMapper.insertNotice(notice); + } + + /** + * 修改公告 + * + * @param notice 公告信息 + * @return 结果 + */ + @Override + public int updateNotice(SysNotice notice) + { + return noticeMapper.updateNotice(notice); + } + + /** + * 删除公告对象 + * + * @param noticeId 公告ID + * @return 结果 + */ + @Override + public int deleteNoticeById(Long noticeId) + { + return noticeMapper.deleteNoticeById(noticeId); + } + + /** + * 批量删除公告信息 + * + * @param noticeIds 需要删除的公告ID + * @return 结果 + */ + @Override + public int deleteNoticeByIds(Long[] noticeIds) + { + return noticeMapper.deleteNoticeByIds(noticeIds); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysOperLogServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysOperLogServiceImpl.java new file mode 100644 index 0000000..879d80e --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysOperLogServiceImpl.java @@ -0,0 +1,79 @@ +package com.limap.system.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.core.domain.entity.SysOperLog; +import com.limap.system.mapper.SysOperLogMapper; +import com.limap.system.service.ISysOperLogService; + +/** + * 操作日志 服务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysOperLogServiceImpl implements ISysOperLogService +{ + @Autowired + private SysOperLogMapper operLogMapper; + + /** + * 新增操作日志 + * + * @param operLog 操作日志对象 + */ + @Override + public void insertOperlog(SysOperLog operLog) + { + operLogMapper.insertOperlog(operLog); + } + + /** + * 查询系统操作日志集合 + * + * @param operLog 操作日志对象 + * @return 操作日志集合 + */ + @Override + public List selectOperLogList(SysOperLog operLog) + { + return operLogMapper.selectOperLogList(operLog); + } + + /** + * 批量删除系统操作日志 + * + * @param operIds 需要删除的操作日志ID + * @return 结果 + */ + @Override + public int deleteOperLogByIds(Long[] operIds) + { + return operLogMapper.deleteOperLogByIds(operIds); + } + + /** + * 查询操作日志详细 + * + * @param operId 操作ID + * @return 操作日志对象 + */ + @Override + public SysOperLog selectOperLogById(Long operId) + { + return operLogMapper.selectOperLogById(operId); + } + + /** + * 清空操作日志 + */ + @Override + public void cleanOperLog() + { + operLogMapper.cleanOperLog(); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysPostServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysPostServiceImpl.java new file mode 100644 index 0000000..e6e9016 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysPostServiceImpl.java @@ -0,0 +1,181 @@ +package com.limap.system.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.limap.common.constant.UserConstants; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.SysPost; +import com.limap.system.mapper.SysPostMapper; +import com.limap.system.mapper.SysUserPostMapper; +import com.limap.system.service.ISysPostService; + +/** + * 岗位信息 服务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysPostServiceImpl implements ISysPostService +{ + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + /** + * 查询岗位信息集合 + * + * @param post 岗位信息 + * @return 岗位信息集合 + */ + @Override + public List selectPostList(SysPost post) + { + return postMapper.selectPostList(post); + } + + /** + * 查询所有岗位 + * + * @return 岗位列表 + */ + @Override + public List selectPostAll() + { + return postMapper.selectPostAll(); + } + + /** + * 通过岗位ID查询岗位信息 + * + * @param postId 岗位ID + * @return 角色对象信息 + */ + @Override + public SysPost selectPostById(Long postId) + { + return postMapper.selectPostById(postId); + } + + /** + * 根据用户ID获取岗位选择框列表 + * + * @param userId 用户ID + * @return 选中岗位ID列表 + */ + @Override + public List selectPostListByUserId(Long userId) + { + return postMapper.selectPostListByUserId(userId); + } + + /** + * 校验岗位名称是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostNameUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostNameUnique(post.getPostName()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验岗位编码是否唯一 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public boolean checkPostCodeUnique(SysPost post) + { + Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId(); + SysPost info = postMapper.checkPostCodeUnique(post.getPostCode()); + if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过岗位ID查询岗位使用数量 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int countUserPostById(Long postId) + { + return userPostMapper.countUserPostById(postId); + } + + /** + * 删除岗位信息 + * + * @param postId 岗位ID + * @return 结果 + */ + @Override + public int deletePostById(Long postId) + { + return postMapper.deletePostById(postId); + } + + /** + * 批量删除岗位信息 + * + * @param postIds 需要删除的岗位ID + * @return 结果 + */ + @Override + public int deletePostByIds(Long[] postIds) + { + for (Long postId : postIds) + { + SysPost post = selectPostById(postId); + if (countUserPostById(postId) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName())); + } + } + return postMapper.deletePostByIds(postIds); + } + + /** + * 新增保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int insertPost(SysPost post) + { + return postMapper.insertPost(post); + } + + /** + * 修改保存岗位信息 + * + * @param post 岗位信息 + * @return 结果 + */ + @Override + public int updatePost(SysPost post) + { + return postMapper.updatePost(post); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysRoleServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..5950d49 --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,430 @@ +package com.limap.system.service.impl; + +import java.util.*; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.limap.common.annotation.DataScope; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.system.domain.SysRoleDept; +import com.limap.system.domain.SysRoleMenu; +import com.limap.system.domain.SysUserRole; +import com.limap.system.mapper.SysRoleDeptMapper; +import com.limap.system.mapper.SysRoleMapper; +import com.limap.system.mapper.SysRoleMenuMapper; +import com.limap.system.mapper.SysUserRoleMapper; +import com.limap.system.service.ISysRoleService; + +/** + * 角色 业务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysRoleServiceImpl implements ISysRoleService +{ + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysRoleMenuMapper roleMenuMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + @Autowired + private SysRoleDeptMapper roleDeptMapper; + + /** + * 根据条件分页查询角色数据 + * + * @param role 角色信息 + * @return 角色数据集合信息 + */ + @Override + @DataScope(deptAlias = "d") + public List selectRoleList(SysRole role) + { + return roleMapper.selectRoleList(role); + } + + /** + * 根据用户ID查询角色 + * + * @param userId 用户ID + * @return 角色列表 + */ + @Override + public List selectRolesByUserId(Long userId) + { + List userRoles = roleMapper.selectRolePermissionByUserId(userId); + List roles = selectRoleAll(); + for (SysRole role : roles) + { + for (SysRole userRole : userRoles) + { + if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) + { + role.setFlag(true); + break; + } + } + } + return roles; + } + + /** + * 根据用户ID查询权限 + * + * @param userId 用户ID + * @return 权限列表 + */ + @Override + public Set selectRolePermissionByUserId(Long userId) + { + List perms = roleMapper.selectRolePermissionByUserId(userId); + Set permsSet = new HashSet<>(); + for (SysRole perm : perms) + { + if (StringUtils.isNotNull(perm)) + { + permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(","))); + } + } + return permsSet; + } + + /** + * 查询所有角色 + * + * @return 角色列表 + */ + @Override + public List selectRoleAll() + { + return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); + } + + @Override + @Cacheable(value = "selectRoleAll1") + public List selectRoleAll1() { + return this.selectRoleList(new SysRole()); + } + + /** + * 根据用户ID获取角色选择框列表 + * + * @param userId 用户ID + * @return 选中角色ID列表 + */ + @Override + public List selectRoleListByUserId(Long userId) + { + return roleMapper.selectRoleListByUserId(userId); + } + + /** + * 通过角色ID查询角色 + * + * @param roleId 角色ID + * @return 角色对象信息 + */ + @Override + public SysRole selectRoleById(Long roleId) + { + return roleMapper.selectRoleById(roleId); + } + + /** + * 校验角色名称是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleNameUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色权限是否唯一 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public boolean checkRoleKeyUnique(SysRole role) + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验角色是否允许操作 + * + * @param role 角色信息 + */ + @Override + public void checkRoleAllowed(SysRole role) + { + if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员角色"); + } + } + + /** + * 校验角色是否有数据权限 + * + * @param roleId 角色id + */ + @Override + public void checkRoleDataScope(Long roleId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + SysRole role = new SysRole(); + role.setRoleId(roleId); + List roles = SpringUtils.getAopProxy(this).selectRoleList(role); + if (StringUtils.isEmpty(roles)) + { + throw new ServiceException("没有权限访问角色数据！"); + } + } + } + + /** + * 通过角色ID查询角色使用数量 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + public int countUserRoleByRoleId(Long roleId) + { + return userRoleMapper.countUserRoleByRoleId(roleId); + } + + /** + * 新增保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int insertRole(SysRole role) + { + // 新增角色信息 + roleMapper.insertRole(role); + return insertRoleMenu(role); + } + + /** + * 修改保存角色信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int updateRole(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); + return insertRoleMenu(role); + } + + /** + * 修改角色状态 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + public int updateRoleStatus(SysRole role) + { + return roleMapper.updateRole(role); + } + + /** + * 修改数据权限信息 + * + * @param role 角色信息 + * @return 结果 + */ + @Override + @Transactional + public int authDataScope(SysRole role) + { + // 修改角色信息 + roleMapper.updateRole(role); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); + // 新增角色和部门信息（数据权限） + return insertRoleDept(role); + } + + /** + * 新增角色菜单信息 + * + * @param role 角色对象 + */ + public int insertRoleMenu(SysRole role) + { + int rows = 1; + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long menuId : role.getMenuIds()) + { + SysRoleMenu rm = new SysRoleMenu(); + rm.setRoleId(role.getRoleId()); + rm.setMenuId(menuId); + list.add(rm); + } + if (list.size() > 0) + { + rows = roleMenuMapper.batchRoleMenu(list); + } + return rows; + } + + /** + * 新增角色部门信息(数据权限) + * + * @param role 角色对象 + */ + public int insertRoleDept(SysRole role) + { + int rows = 1; + // 新增角色与部门（数据权限）管理 + List list = new ArrayList(); + for (Long deptId : role.getDeptIds()) + { + SysRoleDept rd = new SysRoleDept(); + rd.setRoleId(role.getRoleId()); + rd.setDeptId(deptId); + list.add(rd); + } + if (list.size() > 0) + { + rows = roleDeptMapper.batchRoleDept(list); + } + return rows; + } + + /** + * 通过角色ID删除角色 + * + * @param roleId 角色ID + * @return 结果 + */ + @Override + @Transactional + public int deleteRoleById(Long roleId) + { + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenuByRoleId(roleId); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDeptByRoleId(roleId); + return roleMapper.deleteRoleById(roleId); + } + + /** + * 批量删除角色信息 + * + * @param roleIds 需要删除的角色ID + * @return 结果 + */ + @Override + @Transactional + public int deleteRoleByIds(Long[] roleIds) + { + for (Long roleId : roleIds) + { + checkRoleAllowed(new SysRole(roleId)); + checkRoleDataScope(roleId); + SysRole role = selectRoleById(roleId); + if (countUserRoleByRoleId(roleId) > 0) + { + throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName())); + } + } + // 删除角色与菜单关联 + roleMenuMapper.deleteRoleMenu(roleIds); + // 删除角色与部门关联 + roleDeptMapper.deleteRoleDept(roleIds); + return roleMapper.deleteRoleByIds(roleIds); + } + + /** + * 取消授权用户角色 + * + * @param userRole 用户和角色关联信息 + * @return 结果 + */ + @Override + public int deleteAuthUser(SysUserRole userRole) + { + return userRoleMapper.deleteUserRoleInfo(userRole); + } + + /** + * 批量取消授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要取消授权的用户数据ID + * @return 结果 + */ + @Override + public int deleteAuthUsers(Long roleId, Long[] userIds) + { + return userRoleMapper.deleteUserRoleInfos(roleId, userIds); + } + + /** + * 批量选择授权用户角色 + * + * @param roleId 角色ID + * @param userIds 需要授权的用户数据ID + * @return 结果 + */ + @Override + public int insertAuthUsers(Long roleId, Long[] userIds) + { + // 新增用户与角色管理 + List list = new ArrayList(); + for (Long userId : userIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + return userRoleMapper.batchUserRole(list); + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysUserOnlineServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysUserOnlineServiceImpl.java new file mode 100644 index 0000000..4287eec --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysUserOnlineServiceImpl.java @@ -0,0 +1,98 @@ +package com.limap.system.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.stereotype.Service; +import com.limap.common.core.domain.model.LoginUser; +import com.limap.common.utils.StringUtils; +import com.limap.system.domain.SysUserOnline; +import com.limap.system.service.ISysUserOnlineService; + +/** + * 在线用户 服务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysUserOnlineServiceImpl implements ISysUserOnlineService +{ + /** + * 通过登录地址查询信息 + * + * @param ipaddr 登录地址 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByIpaddr(String ipaddr, LoginUser user) + { + if (StringUtils.equals(ipaddr, user.getIpaddr())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 通过用户名称查询信息 + * + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByUserName(String userName, LoginUser user) + { + if (StringUtils.equals(userName, user.getUsername())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 通过登录地址/用户名称查询信息 + * + * @param ipaddr 登录地址 + * @param userName 用户名称 + * @param user 用户信息 + * @return 在线用户信息 + */ + @Override + public SysUserOnline selectOnlineByInfo(String ipaddr, String userName, LoginUser user) + { + if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) + { + return loginUserToUserOnline(user); + } + return null; + } + + /** + * 设置在线用户信息 + * + * @param user 用户信息 + * @return 在线用户 + */ + @Override + public SysUserOnline loginUserToUserOnline(LoginUser user) + { + if (StringUtils.isNull(user) || StringUtils.isNull(user.getUser())) + { + return null; + } + SysUserOnline sysUserOnline = new SysUserOnline(); + sysUserOnline.setTokenId(user.getToken()); + sysUserOnline.setUserName(user.getUsername()); + sysUserOnline.setIpaddr(user.getIpaddr()); + sysUserOnline.setLoginLocation(user.getLoginLocation()); + sysUserOnline.setBrowser(user.getBrowser()); + sysUserOnline.setOs(user.getOs()); + sysUserOnline.setLoginTime(user.getLoginTime()); + if (StringUtils.isNotNull(user.getUser().getDept())) + { + sysUserOnline.setDeptName(user.getUser().getDept().getDeptName()); + } + return sysUserOnline; + } +} diff --git a/fishery-system/src/main/java/com/limap/system/service/impl/SysUserServiceImpl.java b/fishery-system/src/main/java/com/limap/system/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..e87ccba --- /dev/null +++ b/fishery-system/src/main/java/com/limap/system/service/impl/SysUserServiceImpl.java @@ -0,0 +1,578 @@ +package com.limap.system.service.impl; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import javax.validation.Validator; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.limap.system.AppUserVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import com.limap.common.annotation.DataScope; +import com.limap.common.constant.UserConstants; +import com.limap.common.core.domain.entity.SysRole; +import com.limap.common.core.domain.entity.SysUser; +import com.limap.common.exception.ServiceException; +import com.limap.common.utils.SecurityUtils; +import com.limap.common.utils.StringUtils; +import com.limap.common.utils.bean.BeanValidators; +import com.limap.common.utils.spring.SpringUtils; +import com.limap.system.domain.SysPost; +import com.limap.system.domain.SysUserPost; +import com.limap.system.domain.SysUserRole; +import com.limap.system.mapper.SysPostMapper; +import com.limap.system.mapper.SysRoleMapper; +import com.limap.system.mapper.SysUserMapper; +import com.limap.system.mapper.SysUserPostMapper; +import com.limap.system.mapper.SysUserRoleMapper; +import com.limap.system.service.ISysConfigService; +import com.limap.system.service.ISysUserService; + +/** + * 用户 业务层处理 + * + * @author limap + */ +@Service +//@DS("test") +public class SysUserServiceImpl implements ISysUserService +{ + private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); + + @Autowired + private SysUserMapper userMapper; + + @Autowired + private SysRoleMapper roleMapper; + + @Autowired + private SysPostMapper postMapper; + + @Autowired + private SysUserRoleMapper userRoleMapper; + + @Autowired + private SysUserPostMapper userPostMapper; + + @Autowired + private ISysConfigService configService; + + @Autowired + protected Validator validator; + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUserList(SysUser user) + { + return userMapper.selectUserList(user); + } + + @Override + public List selectAllUserList(SysUser user) { + return userMapper.selectUserList(user); + } + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectAllocatedList(SysUser user) + { + return userMapper.selectAllocatedList(user); + } + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUnallocatedList(SysUser user) + { + return userMapper.selectUnallocatedList(user); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByUserName(String userName) + { + return userMapper.selectUserByUserName(userName); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserById(Long userId) + { + return userMapper.selectUserById(userId); + } + + /** + * 查询用户所属角色组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserRoleGroup(String userName) + { + List list = roleMapper.selectRolesByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); + } + + /** + * 查询用户所属岗位组 + * + * @param userName 用户名 + * @return 结果 + */ + @Override + public String selectUserPostGroup(String userName) + { + List list = postMapper.selectPostsByUserName(userName); + if (CollectionUtils.isEmpty(list)) + { + return StringUtils.EMPTY; + } + return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean checkUserNameUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkUserNameUnique(user.getUserName()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkPhoneUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkEmailUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkEmailUnique(user.getEmail()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + @Override + public void checkUserAllowed(SysUser user) + { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员用户"); + } + } + + /** + * 校验用户是否有数据权限 + * + * @param userId 用户id + */ + @Override + public void checkUserDataScope(Long userId) + { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) + { + SysUser user = new SysUser(); + user.setUserId(userId); + List users = SpringUtils.getAopProxy(this).selectUserList(user); + if (StringUtils.isEmpty(users)) + { + throw new ServiceException("没有权限访问用户数据！"); + } + } + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional + public int insertUser(SysUser user) + { + // 新增用户信息 + int rows = userMapper.insertUser(user); + // 新增用户岗位关联 + insertUserPost(user); + // 新增用户与角色管理 + insertUserRole(user); + return rows; + } + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean registerUser(SysUser user) + { + return userMapper.insertUser(user) > 0; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional + public int updateUser(SysUser user) + { + Long userId = user.getUserId(); + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 新增用户与角色管理 + insertUserRole(user); + // 删除用户与岗位关联 + userPostMapper.deleteUserPostByUserId(userId); + // 新增用户与岗位管理 + insertUserPost(user); + return userMapper.updateUser(user); + } + + /** + * 用户授权角色 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + @Override + @Transactional + public void insertUserAuth(Long userId, Long[] roleIds) + { + userRoleMapper.deleteUserRoleByUserId(userId); + insertUserRole(userId, roleIds); + } + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserStatus(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserProfile(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + @Override + public boolean updateUserAvatar(String userName, String avatar) + { + return userMapper.updateUserAvatar(userName, avatar) > 0; + } + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int resetPwd(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + @Override + public int resetUserPwd(String userName, String password) + { + return userMapper.resetUserPwd(userName, password); + } + + /** + * 新增用户角色信息 + * + * @param user 用户对象 + */ + public void insertUserRole(SysUser user) + { + this.insertUserRole(user.getUserId(), user.getRoleIds()); + } + + /** + * 新增用户岗位信息 + * + * @param user 用户对象 + */ + public void insertUserPost(SysUser user) + { + Long[] posts = user.getPostIds(); + if (StringUtils.isNotEmpty(posts)) + { + // 新增用户与岗位管理 + List list = new ArrayList(posts.length); + for (Long postId : posts) + { + SysUserPost up = new SysUserPost(); + up.setUserId(user.getUserId()); + up.setPostId(postId); + list.add(up); + } + userPostMapper.batchUserPost(list); + } + } + + /** + * 新增用户角色信息 + * + * @param userId 用户ID + * @param roleIds 角色组 + */ + public void insertUserRole(Long userId, Long[] roleIds) + { + if (StringUtils.isNotEmpty(roleIds)) + { + // 新增用户与角色管理 + List list = new ArrayList(roleIds.length); + for (Long roleId : roleIds) + { + SysUserRole ur = new SysUserRole(); + ur.setUserId(userId); + ur.setRoleId(roleId); + list.add(ur); + } + userRoleMapper.batchUserRole(list); + } + } + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional + public int deleteUserById(Long userId) + { + // 删除用户与角色关联 + userRoleMapper.deleteUserRoleByUserId(userId); + // 删除用户与岗位表 + userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + @Override + @Transactional + public int deleteUserByIds(Long[] userIds) + { + for (Long userId : userIds) + { + checkUserAllowed(new SysUser(userId)); + checkUserDataScope(userId); + } + // 删除用户与角色关联 + userRoleMapper.deleteUserRole(userIds); + // 删除用户与岗位关联 + userPostMapper.deleteUserPost(userIds); + return userMapper.deleteUserByIds(userIds); + } + + /** + * 导入用户数据 + * + * @param userList 用户数据列表 + * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 + * @param operName 操作用户 + * @return 结果 + */ + @Override + public String importUser(List userList, Boolean isUpdateSupport, String operName) + { + if (StringUtils.isNull(userList) || userList.size() == 0) + { + throw new ServiceException("导入用户数据不能为空！"); + } + int successNum = 0; + int failureNum = 0; + StringBuilder successMsg = new StringBuilder(); + StringBuilder failureMsg = new StringBuilder(); + String password = configService.selectConfigByKey("sys.user.initPassword"); + for (SysUser user : userList) + { + try + { + // 验证是否存在这个用户 + SysUser u = userMapper.selectUserByUserName(user.getUserName()); + if (StringUtils.isNull(u)) + { + BeanValidators.validateWithException(validator, user); + user.setPassword(SecurityUtils.encryptPassword(password)); + user.setCreateBy(operName); + this.insertUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); + } + else if (isUpdateSupport) + { + BeanValidators.validateWithException(validator, user); + checkUserAllowed(user); + checkUserDataScope(user.getUserId()); + user.setUpdateBy(operName); + this.updateUser(user); + successNum++; + successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); + } + else + { + failureNum++; + failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); + } + } + catch (Exception e) + { + failureNum++; + String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; + failureMsg.append(msg + e.getMessage()); + log.error(msg, e); + } + } + if (failureNum > 0) + { + failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); + throw new ServiceException(failureMsg.toString()); + } + else + { + successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); + } + return successMsg.toString(); + } + + @Override + @DS("test") + public SysUser selectAppUserByPhone(String userName) { + SysUser sysUser = userMapper.selectAppUserByPhone(userName); + if(sysUser != null){ + sysUser.setUserType("app"); + if(StringUtils.isBlank(sysUser.getTitle())){ + sysUser.setTitle("青岛罗梅森设备管理中心"); + } + } + return sysUser; + } + + @Override + @DS("test") + public List selectAppUserList(AppUserVO appUserVO) { + return userMapper.selectAppUserList(appUserVO); + } + + @Override + @DS("test") + public Boolean updateAppUser(AppUserVO appUserVO) { + return userMapper.updateAppUser(appUserVO) > 0; + } +} diff --git a/fishery-system/src/main/resources/mapper/system/AreaMapper.xml b/fishery-system/src/main/resources/mapper/system/AreaMapper.xml new file mode 100644 index 0000000..e0b50a6 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/AreaMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, now()) + + + + + + delete from sys_logininfor where info_id in + + #{infoId} + + + + + truncate table sys_logininfor + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysConfigMapper.xml b/fishery-system/src/main/resources/mapper/system/SysConfigMapper.xml new file mode 100644 index 0000000..4c147f3 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + from sys_config + + + + + + + and config_id = #{configId} + + + and config_key = #{configKey} + + + + + + + + + + + + + + insert into sys_config ( + config_name, + config_key, + config_value, + config_type, + create_by, + remark, + create_time + )values( + #{configName}, + #{configKey}, + #{configValue}, + #{configType}, + #{createBy}, + #{remark}, + now() + ) + + + + update sys_config + + config_name = #{configName}, + config_key = #{configKey}, + config_value = #{configValue}, + config_type = #{configType}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = now() + + where config_id = #{configId} + + + + delete from sys_config where config_id = #{configId} + + + + delete from sys_config where config_id in + + #{configId} + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysDeptMapper.xml b/fishery-system/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 0000000..9e102d5 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + + + + + + + + + + + + + + + + + + + + insert into sys_dept( + dept_id, + parent_id, + dept_name, + ancestors, + order_num, + leader, + phone, + email, + status, + create_by, + create_time + )values( + #{deptId}, + #{parentId}, + #{deptName}, + #{ancestors}, + #{orderNum}, + #{leader}, + #{phone}, + #{email}, + #{status}, + #{createBy}, + now() + ) + + + + update sys_dept + + parent_id = #{parentId}, + dept_name = #{deptName}, + ancestors = #{ancestors}, + order_num = #{orderNum}, + leader = #{leader}, + phone = #{phone}, + email = #{email}, + status = #{status}, + update_by = #{updateBy}, + update_time = now() + + where dept_id = #{deptId} + + + + update sys_dept set ancestors = + + when #{item.deptId} then #{item.ancestors} + + where dept_id in + + #{item.deptId} + + + + + update sys_dept set status = '0' where dept_id in + + #{deptId} + + + + + update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/fishery-system/src/main/resources/mapper/system/SysDictDataMapper.xml new file mode 100644 index 0000000..6ba3e49 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark + from sys_dict_data + + + + + + + + + + + + + + delete from sys_dict_data where dict_code = #{dictCode} + + + + delete from sys_dict_data where dict_code in + + #{dictCode} + + + + + update sys_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}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where dict_code = #{dictCode} + + + + update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType} + + + + insert into sys_dict_data( + dict_sort, + dict_label, + dict_value, + dict_type, + css_class, + list_class, + is_default, + status, + remark, + create_by, + create_time + )values( + #{dictSort}, + #{dictLabel}, + #{dictValue}, + #{dictType}, + #{cssClass}, + #{listClass}, + #{isDefault}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/fishery-system/src/main/resources/mapper/system/SysDictTypeMapper.xml new file mode 100644 index 0000000..7cba4d7 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + select dict_id, dict_name, dict_type, status, create_by, create_time, remark + from sys_dict_type + + + + + + + + + + + + + + delete from sys_dict_type where dict_id = #{dictId} + + + + delete from sys_dict_type where dict_id in + + #{dictId} + + + + + update sys_dict_type + + dict_name = #{dictName}, + dict_type = #{dictType}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where dict_id = #{dictId} + + + + insert into sys_dict_type( + dict_name, + dict_type, + status, + remark, + create_by, + create_time + )values( + #{dictName}, + #{dictType}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysMenuMapper.xml b/fishery-system/src/main/resources/mapper/system/SysMenuMapper.xml new file mode 100644 index 0000000..24ae968 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, nullif(perms,'') as perms, icon, create_time + from sys_menu + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_menu + + menu_name = #{menuName}, + parent_id = #{parentId}, + order_num = #{orderNum}, + path = #{path}, + component = #{component}, + `query` = #{query}, + is_frame = #{isFrame}, + is_cache = #{isCache}, + menu_type = #{menuType}, + visible = #{visible}, + status = #{status}, + perms = #{perms}, + icon = #{icon}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where menu_id = #{menuId} + + + + insert into sys_menu( + menu_id, + parent_id, + menu_name, + order_num, + path, + component, + `query`, + is_frame, + is_cache, + menu_type, + visible, + status, + perms, + icon, + remark, + create_by, + create_time + )values( + #{menuId}, + #{parentId}, + #{menuName}, + #{orderNum}, + #{path}, + #{component}, + #{query}, + #{isFrame}, + #{isCache}, + #{menuType}, + #{visible}, + #{status}, + #{perms}, + #{icon}, + #{remark}, + #{createBy}, + now() + ) + + + + delete from sys_menu where menu_id = #{menuId} + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/fishery-system/src/main/resources/mapper/system/SysNoticeMapper.xml new file mode 100644 index 0000000..6cd27d8 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark + from sys_notice + + + + + + + + insert into sys_notice ( + notice_title, + notice_type, + notice_content, + status, + remark, + create_by, + create_time + )values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + + update sys_notice + + notice_title = #{noticeTitle}, + notice_type = #{noticeType}, + notice_content = #{noticeContent}, + status = #{status}, + update_by = #{updateBy}, + update_time = now() + + where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id = #{noticeId} + + + + delete from sys_notice where notice_id in + + #{noticeId} + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/fishery-system/src/main/resources/mapper/system/SysOperLogMapper.xml new file mode 100644 index 0000000..de20934 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time + from sys_oper_log + + + + insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time) + values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, now()) + + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + + + + + + truncate table sys_oper_log + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysPostMapper.xml b/fishery-system/src/main/resources/mapper/system/SysPostMapper.xml new file mode 100644 index 0000000..b8d37e5 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark + from sys_post + + + + + + + + + + + + + + + + + + update sys_post + + post_code = #{postCode}, + post_name = #{postName}, + post_sort = #{postSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where post_id = #{postId} + + + + insert into sys_post( + post_id, + post_code, + post_name, + post_sort, + status, + remark, + create_by, + create_time + )values( + #{postId}, + #{postCode}, + #{postName}, + #{postSort}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + + delete from sys_post where post_id = #{postId} + + + + delete from sys_post where post_id in + + #{postId} + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/fishery-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml new file mode 100644 index 0000000..fc06a47 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_role_dept where role_id=#{roleId} + + + + + + delete from sys_role_dept where role_id in + + #{roleId} + + + + + insert into sys_role_dept(role_id, dept_id) values + + (#{item.roleId},#{item.deptId}) + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysRoleMapper.xml b/fishery-system/src/main/resources/mapper/system/SysRoleMapper.xml new file mode 100644 index 0000000..0e58356 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, + r.status, r.del_flag, r.create_time, r.remark + from sys_role r + left join sys_user_role ur on ur.role_id = r.role_id + left join sys_user u on u.user_id = ur.user_id + left join sys_dept d on u.dept_id = d.dept_id + + + + + + + + + + + + + + + + + + + + insert into sys_role( + role_id, + role_name, + role_key, + role_sort, + data_scope, + menu_check_strictly, + dept_check_strictly, + status, + remark, + create_by, + create_time + )values( + #{roleId}, + #{roleName}, + #{roleKey}, + #{roleSort}, + #{dataScope}, + #{menuCheckStrictly}, + #{deptCheckStrictly}, + #{status}, + #{remark}, + #{createBy}, + now() + ) + + + + update sys_role + + role_name = #{roleName}, + role_key = #{roleKey}, + role_sort = #{roleSort}, + data_scope = #{dataScope}, + menu_check_strictly = #{menuCheckStrictly}, + dept_check_strictly = #{deptCheckStrictly}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = now() + + where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id = #{roleId} + + + + update sys_role set del_flag = '2' where role_id in + + #{roleId} + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/fishery-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml new file mode 100644 index 0000000..4c81ad3 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + delete from sys_role_menu where role_id=#{roleId} + + + + delete from sys_role_menu where role_id in + + #{roleId} + + + + + insert into sys_role_menu(role_id, menu_id) values + + (#{item.roleId},#{item.menuId}) + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysUserMapper.xml b/fishery-system/src/main/resources/mapper/system/SysUserMapper.xml new file mode 100644 index 0000000..8168642 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, + u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.parent_id, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.user_area + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + parent_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + register_time, + open_id, + create_time + )values( + #{userId}, + #{deptId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + #{registerTime}, + #{openId}, + now() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + open_id = #{openId}, + user_area = #{userArea}, + update_time = now() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + update sys_user set dept_id = #{deptId} where user_id = #{userId} + + + update aqu_user + set + has_screen = #{hasScreen}, + title = #{title} + where Id = #{userId} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + + + diff --git a/fishery-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/fishery-system/src/main/resources/mapper/system/SysUserPostMapper.xml new file mode 100644 index 0000000..5b73c15 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + delete from sys_user_post where user_id=#{userId} + + + + + + delete from sys_user_post where user_id in + + #{userId} + + + + + insert into sys_user_post(user_id, post_id) values + + (#{item.userId},#{item.postId}) + + + + \ No newline at end of file diff --git a/fishery-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/fishery-system/src/main/resources/mapper/system/SysUserRoleMapper.xml new file mode 100644 index 0000000..d70d7f0 --- /dev/null +++ b/fishery-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + delete from sys_user_role where user_id=#{userId} + + + + + + delete from sys_user_role where user_id in + + #{userId} + + + + + insert into sys_user_role(user_id, role_id) values + + (#{item.userId},#{item.roleId}) + + + + + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} + + + + delete from sys_user_role where role_id=#{roleId} and user_id in + + #{userId} + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a126939 --- /dev/null +++ b/pom.xml @@ -0,0 +1,304 @@ + + + 4.0.0 + + com.limap + fishery_base + 3.8.5 + + fishery_dms + 鱼测云分润管理系统 + + + 3.8.5 + UTF-8 + UTF-8 + 1.8 + 3.1.1 + 1.2.16 + 1.21 + 3.0.3 + 1.6.2 + 1.4.6 + 3.5.2 + 3.5.2 + 2.0.23 + 6.4.0 + 2.11.0 + 3.2.2 + 4.1.2 + 2.3 + 0.9.1 + 1.18.22 + 5.8.8 + + + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.5.14 + pom + import + + + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + + + eu.bitwalker + UserAgentUtils + ${bitwalker.version} + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.boot.version} + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + + + com.github.oshi + oshi-core + ${oshi.version} + + + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${knife4j.version} + + + + + commons-io + commons-io + ${commons.io.version} + + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + commons-collections + commons-collections + ${commons.collections.version} + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + + + + io.jsonwebtoken + jjwt + ${jwt.version} + + + + + com.github.whvcse + easy-captcha + ${easy-captcha.version} + + + + + org.projectlombok + lombok + ${lombok.version} + + + + + cn.hutool + hutool-all + ${hutool.version} + + + + + com.limap + fishery-quartz + ${limap.version} + + + + + com.limap + fishery-generator + ${limap.version} + + + + + com.limap + fishery-system + ${limap.version} + + + + + com.limap + fishery-demo + ${limap.version} + + + + com.limap + fishery-core + ${limap.version} + + + + + com.limap + fishery-common-core + ${limap.version} + + + + + com.limap + fishery-common-mybatis + ${limap.version} + + + + + com.limap + fishery-common-log + ${limap.version} + + + + + com.limap + fishery-common-security + ${limap.version} + + + + + com.limap + fishery-common-web + ${limap.version} + + + + + com.limap + fishery-common-api + ${limap.version} + + + + + + + fishery-common + fishery-admin + fishery-system + fishery-quartz + fishery-generator + fishery-demo + fishery-core + + pom + + + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + ${project.build.sourceEncoding} + + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + + \ No newline at end of file