From dc8461ceeecb2110590d627e0bff0b791a626743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 16 May 2025 18:38:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B1=A5=E8=81=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/domain/SysLogininfor.java | 51 +++- .../bonus/system/api/domain/SysNotice.java | 49 ++- .../bonus/system/api/domain/SysOperLog.java | 26 +- bonus-auth/pom.xml | 7 + .../java/com/bonus/auth/form/LoginType.java | 5 - .../common/core/utils/file/FileUtils.java | 25 ++ .../common/core/web/domain/TreeEntity.java | 79 ----- .../common/datasource/annotation/Master.java | 8 +- .../common/datasource/annotation/Slave.java | 8 +- bonus-modules/bonus-file/pom.xml | 3 + .../file/service/impl/OssServiceImpl.java | 2 +- .../bonus/file/utils/FileDownloadUtils.java | 4 +- .../java/com/bonus/file/utils/FileUtils.java | 39 --- bonus-modules/bonus-ldlz/pom.xml | 15 +- .../com/bonus/ldlz/BonusLdlzApplication.java | 5 +- .../bonus/ldlz/domain/vo/HandbookIndexVo.java | 3 + .../ldlz/mapper/HandbookIndexMapper.java | 2 +- .../impl/HandbookIndexServiceImpl.java | 9 +- .../{ => ldlz}/web/config/ServerConfig.java | 2 +- .../{ => ldlz}/web/config/SwaggerConfig.java | 0 .../controller/common/CaptchaController.java | 2 +- .../controller/common/CommonController.java | 4 +- .../controller/monitor/CacheController.java | 2 +- .../controller/monitor/ServerController.java | 2 +- .../monitor/SysLogininforController.java | 4 +- .../monitor/SysOperlogController.java | 4 +- .../monitor/SysUserOnlineController.java | 2 +- .../system/SysConfigController.java | 2 +- .../controller/system/SysDeptController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../controller/system/SysIndexController.java | 2 +- .../controller/system/SysLoginController.java | 2 +- .../controller/system/SysMenuController.java | 2 +- .../system/SysNoticeController.java | 5 +- .../controller/system/SysPostController.java | 10 +- .../system/SysProfileController.java | 2 +- .../system/SysRegisterController.java | 2 +- .../controller/system/SysRoleController.java | 4 +- .../controller/system/SysUserController.java | 2 +- .../web/controller/tool/TestController.java | 2 +- .../{ldlz => mapper}/BmProjectMapper.xml | 0 .../{ldlz => mapper}/HandbookIndexMapper.xml | 2 +- .../{ldlz => mapper}/HandbookInfoMapper.xml | 0 .../LdlzLeaveDictDataMapper.xml | 0 .../{ldlz => mapper}/LdlzLeaveLogMapper.xml | 0 .../{ldlz => mapper}/LdlzRecordMapper.xml | 0 .../LdlzRecordOtherMapper.xml | 0 .../LdlzRecordProblemMapper.xml | 14 +- .../{ldlz => mapper}/LdlzUserPostMapper.xml | 0 .../{ldlz => mapper}/PerformLogMapper.xml | 0 .../{ldlz => mapper}/PerformPostSetMapper.xml | 0 .../{ldlz => mapper}/PerformUserSetMapper.xml | 0 .../PerformUserSetSpecialMapper.xml | 0 .../{ldlz => mapper}/ProjectMapper.xml | 0 .../slave/BmProjectSlaveMapper.xml | 8 +- .../bonus/system/BonusSysTemApplication.java | 31 ++ .../bonus/system/domain/SysLogininfor.java | 132 --------- .../com/bonus/system/domain/SysNotice.java | 104 ------- .../com/bonus/system/domain/SysOperLog.java | 278 ------------------ .../java/com/bonus/system/domain/SysPost.java | 124 -------- .../com/bonus/system/domain/SysUserRole.java | 46 --- .../system/mapper/SysLogininforMapper.java | 14 +- .../bonus/system/mapper/SysNoticeMapper.java | 4 +- .../bonus/system/mapper/SysOperLogMapper.java | 14 +- .../bonus/system/mapper/SysPostMapper.java | 27 +- .../system/mapper/SysUserRoleMapper.java | 18 +- .../system/service/ISysLogininforService.java | 11 +- .../system/service/ISysNoticeService.java | 3 +- .../system/service/ISysOperLogService.java | 14 +- .../bonus/system/service/ISysPostService.java | 28 +- .../bonus/system/service/ISysRoleService.java | 3 +- .../impl/SysLogininforServiceImpl.java | 3 +- .../service/impl/SysNoticeServiceImpl.java | 3 +- .../service/impl/SysOperLogServiceImpl.java | 13 +- .../service/impl/SysPostServiceImpl.java | 9 +- .../service/impl/SysRoleServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 6 +- .../src/main/resources/bootstrap-dev.yml | 25 ++ .../src/main/resources/bootstrap.yml | 17 ++ .../src/main/resources/logback.xml | 74 +++++ .../mapper/system/SysLogininforMapper.xml | 8 +- .../resources/mapper/system/SysMenuMapper.xml | 12 +- .../mapper/system/SysNoticeMapper.xml | 12 +- .../mapper/system/SysOperLogMapper.xml | 2 +- .../resources/mapper/system/SysPostMapper.xml | 8 +- .../mapper/system/SysUserRoleMapper.xml | 4 +- bonus-modules/pom.xml | 6 + pom.xml | 2 +- 89 files changed, 520 insertions(+), 964 deletions(-) delete mode 100644 bonus-auth/src/main/java/com/bonus/auth/form/LoginType.java delete mode 100644 bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/TreeEntity.java delete mode 100644 bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUtils.java rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/config/ServerConfig.java (95%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/config/SwaggerConfig.java (100%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/common/CaptchaController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/common/CommonController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/monitor/CacheController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/monitor/ServerController.java (93%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/monitor/SysLogininforController.java (96%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/monitor/SysOperlogController.java (95%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/monitor/SysUserOnlineController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysConfigController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysDeptController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysDictDataController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysDictTypeController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysIndexController.java (94%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysLoginController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysMenuController.java (98%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysNoticeController.java (97%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysPostController.java (95%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysProfileController.java (99%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysRegisterController.java (96%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysRoleController.java (99%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/system/SysUserController.java (99%) rename bonus-modules/bonus-ldlz/src/main/java/com/bonus/{ => ldlz}/web/controller/tool/TestController.java (99%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/BmProjectMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/HandbookIndexMapper.xml (98%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/HandbookInfoMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzLeaveDictDataMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzLeaveLogMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzRecordMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzRecordOtherMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzRecordProblemMapper.xml (95%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/LdlzUserPostMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/PerformLogMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/PerformPostSetMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/PerformUserSetMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/PerformUserSetSpecialMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/ProjectMapper.xml (100%) rename bonus-modules/bonus-ldlz/src/main/resources/{ldlz => mapper}/slave/BmProjectSlaveMapper.xml (96%) create mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSysTemApplication.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysLogininfor.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysNotice.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysOperLog.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysPost.java delete mode 100644 bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysUserRole.java create mode 100644 bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml create mode 100644 bonus-modules/bonus-system/src/main/resources/bootstrap.yml create mode 100644 bonus-modules/bonus-system/src/main/resources/logback.xml diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogininfor.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogininfor.java index 0dd5237..ba39517 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogininfor.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogininfor.java @@ -8,7 +8,7 @@ import com.bonus.common.core.web.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor - * + * * @author bonus */ public class SysLogininfor extends BaseEntity @@ -23,6 +23,8 @@ public class SysLogininfor extends BaseEntity @Excel(name = "用户账号") private String userName; + @Excel(name = "用户名") + private String nickName; /** 状态 0成功 1失败 */ @Excel(name = "状态", readConverterExp = "0=成功,1=失败") private String status; @@ -31,6 +33,18 @@ public class SysLogininfor extends BaseEntity @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; @@ -40,6 +54,7 @@ public class SysLogininfor extends BaseEntity @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date accessTime; + public Long getInfoId() { return infoId; @@ -99,4 +114,36 @@ public class SysLogininfor extends BaseEntity { this.accessTime = accessTime; } -} \ No newline at end of file + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + 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; + } +} diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java index 927dfa1..02d37f2 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Size; /** * 通知公告表 sys_notice - * + * * @author bonus */ public class SysNotice extends BaseEntity @@ -31,6 +31,13 @@ public class SysNotice extends BaseEntity /** 公告状态（0正常 1关闭） */ private String status; + private Long userId; // 登录用户 + + + private String isRead = "0"; // 是否已读 0 未读 1 已读 + private String fileUrls; // 文件地址 + private String showType = "1"; // 1：所有人员可见；2：部分人员可见 + private String receiveUserIds; // 接收人员ID public Long getNoticeId() { @@ -85,6 +92,46 @@ public class SysNotice extends BaseEntity return status; } + public String getIsRead() { + return isRead; + } + + public void setIsRead(String isRead) { + this.isRead = isRead; + } + + public String getFileUrls() { + return fileUrls; + } + + public void setFileUrls(String fileUrls) { + this.fileUrls = fileUrls; + } + + public String getShowType() { + return showType; + } + + public void setShowType(String showType) { + this.showType = showType; + } + + public String getReceiveUserIds() { + return receiveUserIds; + } + + public void setReceiveUserIds(String receiveUserIds) { + this.receiveUserIds = receiveUserIds; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysOperLog.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysOperLog.java index 4c65bb8..ac6e14a 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysOperLog.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysOperLog.java @@ -9,7 +9,7 @@ import org.apache.ibatis.type.Alias; /** * 操作日志记录表 oper_log - * + * * @author bonus */ @Alias("SysOperLog") @@ -21,6 +21,10 @@ public class SysOperLog extends BaseEntity @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) private Long operId; + + @Excel(name = "操作功能") + private String moduleName; + /** 操作模块 */ @Excel(name = "操作模块") private String title; @@ -85,6 +89,26 @@ public class SysOperLog extends BaseEntity @Excel(name = "消耗时间", suffix = "毫秒") private Long costTime; + /** 操作地点 */ + // @Excel(name = "操作地点") + private String operLocation; + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public String getOperLocation() { + return operLocation; + } + + public void setOperLocation(String operLocation) { + this.operLocation = operLocation; + } + public Long getOperId() { return operId; diff --git a/bonus-auth/pom.xml b/bonus-auth/pom.xml index 8b755cb..eec9cd0 100644 --- a/bonus-auth/pom.xml +++ b/bonus-auth/pom.xml @@ -48,6 +48,10 @@ com.bonus bonus-common-security + + com.bonus + bonus-common-redis + com.github.ulisesbocchio @@ -112,6 +116,9 @@ org.springframework.boot spring-boot-maven-plugin + + exec + diff --git a/bonus-auth/src/main/java/com/bonus/auth/form/LoginType.java b/bonus-auth/src/main/java/com/bonus/auth/form/LoginType.java deleted file mode 100644 index d3cfe38..0000000 --- a/bonus-auth/src/main/java/com/bonus/auth/form/LoginType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bonus.auth.form; - -public enum LoginType { - PASSWORD, MOBILE -} diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/FileUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/FileUtils.java index 8118379..b79a9e5 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/FileUtils.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/file/FileUtils.java @@ -1,8 +1,11 @@ package com.bonus.common.core.utils.file; +import com.bonus.common.core.constant.HttpStatus; import com.bonus.common.core.utils.StringUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; @@ -316,4 +319,26 @@ public class FileUtils { // 返回带前缀的 Base64 字符串 return prefix + base64Encoded; } + + public static String setResponseHeaderByUrl(HttpServletResponse response, String url) { + String safeFileName = com.bonus.common.core.utils.file.FileUtils.getName(url); + if (!StringUtils.hasText(safeFileName)) { + response.setStatus(HttpStatus.BAD_REQUEST); + return null; + } + try { + String encodedFileName = URLEncoder.encode(safeFileName, StandardCharsets.UTF_8.toString()); + if (encodedFileName == null) { + response.setStatus(HttpStatus.BAD_REQUEST); + return null; + } + response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + encodedFileName + "\""); + return encodedFileName; + + } catch (UnsupportedEncodingException e) { + response.setStatus(HttpStatus.BAD_REQUEST); + return null; + } + } } diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/TreeEntity.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/TreeEntity.java deleted file mode 100644 index 2e04adf..0000000 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/web/domain/TreeEntity.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.bonus.common.core.web.domain; - -import java.util.ArrayList; -import java.util.List; - -/** - * Tree基类 - * - * @author bonus - */ -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/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Master.java b/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Master.java index c415798..7bc6ff7 100644 --- a/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Master.java +++ b/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Master.java @@ -1,3 +1,4 @@ +/* package com.bonus.common.datasource.annotation; import java.lang.annotation.Documented; @@ -7,11 +8,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.baomidou.dynamic.datasource.annotation.DS; +*/ /** * 主库数据源 - * + * * @author bonus - */ + *//* + @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented @@ -20,3 +23,4 @@ public @interface Master { } +*/ diff --git a/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Slave.java b/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Slave.java index 6a77ad5..404c130 100644 --- a/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Slave.java +++ b/bonus-common/bonus-common-datasource/src/main/java/com/bonus/common/datasource/annotation/Slave.java @@ -1,3 +1,4 @@ +/* package com.bonus.common.datasource.annotation; import java.lang.annotation.Documented; @@ -7,11 +8,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.baomidou.dynamic.datasource.annotation.DS; +*/ /** * 从库数据源 - * + * * @author bonus - */ + *//* + @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented @@ -20,3 +23,4 @@ public @interface Slave { } +*/ diff --git a/bonus-modules/bonus-file/pom.xml b/bonus-modules/bonus-file/pom.xml index 94dcd6a..277b9d6 100644 --- a/bonus-modules/bonus-file/pom.xml +++ b/bonus-modules/bonus-file/pom.xml @@ -119,6 +119,9 @@ org.springframework.boot spring-boot-maven-plugin + + exec + diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java index d7e53eb..3a733c4 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/OssServiceImpl.java @@ -99,7 +99,7 @@ public class OssServiceImpl implements ISysFileService { } OSSObject ossObject = ossObjectR.getData(); - com.bonus.file.utils.FileUtils.setResponseHeaderByUrl(response, urlStr); + FileUtils.setResponseHeaderByUrl(response, urlStr); try (InputStream inputStream = ossObject.getObjectContent(); OutputStream outputStream = response.getOutputStream()) { diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java index 5a7ea9c..85de8a2 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java @@ -48,7 +48,7 @@ public class FileDownloadUtils { HttpURLConnection connection = (HttpURLConnection) urlNew.openConnection(); connection.setRequestMethod("GET"); - com.bonus.file.utils.FileUtils.setResponseHeaderByUrl(response, urlStr); + FileUtils.setResponseHeaderByUrl(response, urlStr); try { int code = connection.getResponseCode(); InputStream inputStream = connection.getInputStream(); @@ -93,7 +93,7 @@ public class FileDownloadUtils { ftpClient.enterLocalPassiveMode(); ftpClient.setFileType(FTP.BINARY_FILE_TYPE); - com.bonus.file.utils.FileUtils.setResponseHeaderByUrl(response, urlStr); + FileUtils.setResponseHeaderByUrl(response, urlStr); try (InputStream inputStream = ftpClient.retrieveFileStream(remoteFilePath); ServletOutputStream outputStream = response.getOutputStream()) { diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUtils.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUtils.java deleted file mode 100644 index 5f39738..0000000 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUtils.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.bonus.file.utils; - -import com.bonus.common.core.constant.HttpStatus; -import com.bonus.common.core.utils.StringUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -public class FileUtils { -/** -* 获取文件名 - */ - public static String setResponseHeaderByUrl(HttpServletResponse response, String url) { - String safeFileName = com.bonus.common.core.utils.file.FileUtils.getName(url); - if (!StringUtils.hasText(safeFileName)) { - response.setStatus(HttpStatus.BAD_REQUEST); - return null; - } - try { - String encodedFileName = URLEncoder.encode(safeFileName, StandardCharsets.UTF_8.toString()); - if (encodedFileName == null) { - response.setStatus(HttpStatus.BAD_REQUEST); - return null; - } - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + encodedFileName + "\""); - return encodedFileName; - - } catch (UnsupportedEncodingException e) { - response.setStatus(HttpStatus.BAD_REQUEST); - return null; - } - } -} diff --git a/bonus-modules/bonus-ldlz/pom.xml b/bonus-modules/bonus-ldlz/pom.xml index 752ed98..1c20a1b 100644 --- a/bonus-modules/bonus-ldlz/pom.xml +++ b/bonus-modules/bonus-ldlz/pom.xml @@ -69,6 +69,10 @@ bonus-common-log + + com.bonus + bonus-common-core + com.google.guava @@ -108,8 +112,17 @@ com.bonus bonus-file ${bonus.version} + compile + + + org.apache.poi + poi-ooxml + + + org.apache.poi + poi + 4.1.2 - ${project.artifactId} diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/BonusLdlzApplication.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/BonusLdlzApplication.java index 1e221e1..49a5ce5 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/BonusLdlzApplication.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/BonusLdlzApplication.java @@ -1,5 +1,6 @@ package com.bonus.ldlz; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -8,7 +9,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; /** * 领导履职模块 - * + * * @author bonus */ /*@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = { @@ -17,9 +18,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; "com.bonus.system.api", "com.bonus.common.datasource.annotation", "com.bonus.common.datascope", + "com.bonus.common.core", })*/ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class}) @EnableDiscoveryClient +@MapperScan("com.bonus.ldlz.mapper") public class BonusLdlzApplication { public static void main(String[] args) diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/domain/vo/HandbookIndexVo.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/domain/vo/HandbookIndexVo.java index 6e1f948..80ac1d6 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/domain/vo/HandbookIndexVo.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/domain/vo/HandbookIndexVo.java @@ -25,4 +25,7 @@ public class HandbookIndexVo { @Excel(name = "问题数") private Long problemNum; + + private String secondContent; + private String firstContent; } diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/mapper/HandbookIndexMapper.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/mapper/HandbookIndexMapper.java index 6764acf..71cb198 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/mapper/HandbookIndexMapper.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/mapper/HandbookIndexMapper.java @@ -62,7 +62,7 @@ public interface HandbookIndexMapper extends BaseMapper ListselectSecondIndexList(HandbookIndexBo bo); - Map selectSecondAndParent(Long id); + HandbookIndexVo selectSecondAndParent(Long id); /** * 关联问题记录查询二级目录 * diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/service/impl/HandbookIndexServiceImpl.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/service/impl/HandbookIndexServiceImpl.java index 97b74cc..6431598 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/service/impl/HandbookIndexServiceImpl.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/service/impl/HandbookIndexServiceImpl.java @@ -195,7 +195,14 @@ public class HandbookIndexServiceImpl extends ServiceImpl selectSecondAndParent(Long id) { - return handbookIndexMapper.selectSecondAndParent(id); + + HandbookIndexVo handbookIndexVo = handbookIndexMapper.selectSecondAndParent(id); + Map res = new HashMap<>(); + res.put("firstName",handbookIndexVo.getFirstName()); + res.put("secondName",handbookIndexVo.getSecondName()); + res.put("secondContent",handbookIndexVo.getSecondContent()); + res.put("firstContent",handbookIndexVo.getFirstContent()); + return res; } /** * 获取二级标题列表(是否存在问题) diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/config/ServerConfig.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/config/ServerConfig.java similarity index 95% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/config/ServerConfig.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/config/ServerConfig.java index 6fbb9ad..89017c6 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/config/ServerConfig.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/config/ServerConfig.java @@ -1,4 +1,4 @@ -package com.bonus.web.config; +package com.bonus.ldlz.web.config; import com.bonus.common.core.utils.ServletUtils; import org.springframework.stereotype.Component; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/config/SwaggerConfig.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/config/SwaggerConfig.java similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/config/SwaggerConfig.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/config/SwaggerConfig.java diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CaptchaController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CaptchaController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CaptchaController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CaptchaController.java index 09d39da..ad08061 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CaptchaController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.common; +package com.bonus.ldlz.web.controller.common; import com.bonus.common.core.constant.CacheConstants; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CommonController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CommonController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CommonController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CommonController.java index ce1ed44..91faf17 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/common/CommonController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/common/CommonController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.common; +package com.bonus.ldlz.web.controller.common; import com.bonus.common.core.constant.Constants; import com.bonus.common.core.utils.StringUtils; @@ -7,7 +7,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.config.LdlzConfig; import com.bonus.file.utils.FileUploadUtils; -import com.bonus.web.config.ServerConfig; +import com.bonus.ldlz.web.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/CacheController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/CacheController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/CacheController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/CacheController.java index 3814d6c..3f81d26 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/CacheController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/CacheController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.monitor; +package com.bonus.ldlz.web.controller.monitor; import com.bonus.common.core.constant.CacheConstants; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/ServerController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/ServerController.java similarity index 93% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/ServerController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/ServerController.java index 96de74e..bf90b33 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/ServerController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/ServerController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.monitor; +package com.bonus.ldlz.web.controller.monitor; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.annotation.RequiresPermissions; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysLogininforController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysLogininforController.java similarity index 96% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysLogininforController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysLogininforController.java index 2c8d299..3511af0 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysLogininforController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.monitor; +package com.bonus.ldlz.web.controller.monitor; import com.bonus.auth.service.SysPasswordService; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -7,7 +7,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.system.domain.SysLogininfor; +import com.bonus.system.api.domain.SysLogininfor; import com.bonus.system.service.ISysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysOperlogController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysOperlogController.java similarity index 95% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysOperlogController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysOperlogController.java index e2af4a2..28aa374 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysOperlogController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.monitor; +package com.bonus.ldlz.web.controller.monitor; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -7,7 +7,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.system.domain.SysOperLog; +import com.bonus.system.api.domain.SysOperLog; import com.bonus.system.service.ISysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysUserOnlineController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysUserOnlineController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysUserOnlineController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysUserOnlineController.java index 12a0de7..a6a8fcf 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/monitor/SysUserOnlineController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/monitor/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.monitor; +package com.bonus.ldlz.web.controller.monitor; import com.bonus.common.core.constant.CacheConstants; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysConfigController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysConfigController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysConfigController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysConfigController.java index 1761c1f..5e9b213 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysConfigController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysConfigController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDeptController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDeptController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDeptController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDeptController.java index 168d392..6954e52 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDeptController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDeptController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.constant.UserConstants; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictDataController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictDataController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictDataController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictDataController.java index 25c3451..8187bec 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictDataController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictTypeController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictTypeController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictTypeController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictTypeController.java index b6b32ee..6575637 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysDictTypeController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysIndexController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysIndexController.java similarity index 94% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysIndexController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysIndexController.java index aa974e6..d13e7b1 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysIndexController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysIndexController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.StringUtils; import com.bonus.config.LdlzConfig; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysLoginController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysLoginController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysLoginController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysLoginController.java index 2b316b0..e690570 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysLoginController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysLoginController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.auth.form.LoginBody; import com.bonus.auth.service.SysLoginService; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysMenuController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysMenuController.java similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysMenuController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysMenuController.java index 9e28048..a7a7956 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysMenuController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysMenuController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.constant.UserConstants; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysNoticeController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysNoticeController.java similarity index 97% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysNoticeController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysNoticeController.java index eaf23c8..a2264df 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysNoticeController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.web.controller.BaseController; @@ -10,7 +10,8 @@ import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.ldlz.domain.SysNoticeViewLog; import com.bonus.ldlz.service.ISysNoticeViewLogService; -import com.bonus.system.domain.SysNotice; + +import com.bonus.system.api.domain.SysNotice; import com.bonus.system.service.ISysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysPostController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysPostController.java similarity index 95% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysPostController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysPostController.java index cb15264..da2234e 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysPostController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysPostController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -8,12 +8,14 @@ import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.system.domain.SysPost; + + +import com.bonus.system.api.domain.SysPost; import com.bonus.system.service.ISysPostService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -26,7 +28,7 @@ import java.util.List; @RequestMapping("/system/post") public class SysPostController extends BaseController { - @Autowired + @Resource private ISysPostService postService; /** diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysProfileController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysProfileController.java similarity index 99% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysProfileController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysProfileController.java index 29a3ae0..bb79882 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysProfileController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysProfileController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRegisterController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRegisterController.java similarity index 96% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRegisterController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRegisterController.java index 9afe896..810199a 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRegisterController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRegisterController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.auth.form.RegisterBody; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRoleController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRoleController.java similarity index 99% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRoleController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRoleController.java index e2a562d..22c1e00 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysRoleController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysRoleController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.bonus.common.core.utils.StringUtils; @@ -11,8 +11,8 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.domain.SysDept; import com.bonus.system.api.domain.SysRole; import com.bonus.system.api.domain.SysUser; +import com.bonus.system.api.domain.SysUserRole; import com.bonus.system.api.model.LoginUser; -import com.bonus.system.domain.SysUserRole; import com.bonus.system.service.ISysDeptService; import com.bonus.system.service.ISysRoleService; import com.bonus.system.service.ISysUserService; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysUserController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysUserController.java similarity index 99% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysUserController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysUserController.java index 91757b4..6d716a2 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/system/SysUserController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.system; +package com.bonus.ldlz.web.controller.system; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/tool/TestController.java b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/tool/TestController.java similarity index 99% rename from bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/tool/TestController.java rename to bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/tool/TestController.java index beb7fe3..c4bb1b1 100644 --- a/bonus-modules/bonus-ldlz/src/main/java/com/bonus/web/controller/tool/TestController.java +++ b/bonus-modules/bonus-ldlz/src/main/java/com/bonus/ldlz/web/controller/tool/TestController.java @@ -1,4 +1,4 @@ -package com.bonus.web.controller.tool; +package com.bonus.ldlz.web.controller.tool; import com.bonus.common.core.domain.R; import com.bonus.common.core.utils.StringUtils; diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/BmProjectMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/BmProjectMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/BmProjectMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/BmProjectMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/HandbookIndexMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/HandbookIndexMapper.xml similarity index 98% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/HandbookIndexMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/HandbookIndexMapper.xml index 22f05e0..307d13e 100644 --- a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/HandbookIndexMapper.xml +++ b/bonus-modules/bonus-ldlz/src/main/resources/mapper/HandbookIndexMapper.xml @@ -109,7 +109,7 @@ order by i1.create_time desc,i1.sort desc + - select rp.* , r.lat,r.lon, r.address,p.`name` as projectName,hi.name as handbookName,hi.type as handbookType, u.nick_name from ldlz_record_problem rp join ldlz_record r on r.id =rp.record_id @@ -78,7 +78,7 @@ - select count(1) as num from ldlz_record_problem rp join ldlz_record r on r.id =rp.record_id @@ -93,7 +93,7 @@ - + update ldlz_record_problem @@ -177,8 +177,8 @@ group by i.name order by num desc - select rp.* , r.lat,r.lon,r.address,p.`name` as projectName,hi.name as handbookName,hi.type as handbookType ,i2.name as firstName,i.name as secondName, u.nick_name diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/LdlzUserPostMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/LdlzUserPostMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/LdlzUserPostMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/LdlzUserPostMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformLogMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformLogMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformLogMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformLogMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformPostSetMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformPostSetMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformPostSetMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformPostSetMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformUserSetMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformUserSetMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformUserSetMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformUserSetMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformUserSetSpecialMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformUserSetSpecialMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/PerformUserSetSpecialMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/PerformUserSetSpecialMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/ProjectMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/ProjectMapper.xml similarity index 100% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/ProjectMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/ProjectMapper.xml diff --git a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/slave/BmProjectSlaveMapper.xml b/bonus-modules/bonus-ldlz/src/main/resources/mapper/slave/BmProjectSlaveMapper.xml similarity index 96% rename from bonus-modules/bonus-ldlz/src/main/resources/ldlz/slave/BmProjectSlaveMapper.xml rename to bonus-modules/bonus-ldlz/src/main/resources/mapper/slave/BmProjectSlaveMapper.xml index 1f7e915..13f97ee 100644 --- a/bonus-modules/bonus-ldlz/src/main/resources/ldlz/slave/BmProjectSlaveMapper.xml +++ b/bonus-modules/bonus-ldlz/src/main/resources/mapper/slave/BmProjectSlaveMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ID, project_id, name, abbreviation, pro_type, voltage_level, power_grid, company_id, registerAddressCode, origin, lon, lat, status, contractSigningDate, contractPrice, start_time, end_time, pro_leader, pro_leader_phone, isInsurance, security_payments, payment_type, payment_file, labourSpecialName, labourSpecialPhone, labourSpecialIdCard, payDate, project_manager, phone, manager_number, approachDate, board_file, fature_tags, bank_account, bank_name, open_bank_type, special_bank_type, pay_way, open_bank_number, account_balance, update_time, is_active from bm_project - and project_id = #{projectId} diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSysTemApplication.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSysTemApplication.java new file mode 100644 index 0000000..a3b26c0 --- /dev/null +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSysTemApplication.java @@ -0,0 +1,31 @@ +package com.bonus.system; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +/** + * 实名制模块 + * + * @author bonus + */ +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class}) +@EnableDiscoveryClient +public class BonusSysTemApplication +{ + public static void main(String[] args) + { + SpringApplication.run(BonusSysTemApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 实名制模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysLogininfor.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysLogininfor.java deleted file mode 100644 index 5553a40..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysLogininfor.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.bonus.system.domain; - -import java.util.Date; - -import com.bonus.common.core.annotation.Excel; -import com.bonus.common.core.web.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 系统访问记录表 sys_logininfor - * - * @author ldlv - */ -@Data -@EqualsAndHashCode(callSuper=false) -public class SysLogininfor extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** ID */ - @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) - private Long infoId; - - /** 用户账号 */ - // @Excel(name = "用户账号") - private String userName; - - @Excel(name = "用户名") - private String nickName; - - /** 登录状态 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/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysNotice.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysNotice.java deleted file mode 100644 index 00d168d..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysNotice.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.bonus.system.domain; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import com.bonus.common.core.web.domain.BaseEntity; -import com.bonus.common.core.xss.Xss; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 通知公告表 sys_notice - * - * @author ldlv - */ -@Data -@EqualsAndHashCode(callSuper=false) -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; - - private Long userId; // 登录用户 - - private String isRead = "0"; // 是否已读 0 未读 1 已读 - - private String fileUrls; // 文件地址 - private String showType = "1"; // 1：所有人员可见；2：部分人员可见 - private String receiveUserIds; // 接收人员ID - - 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/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysOperLog.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysOperLog.java deleted file mode 100644 index 59a4aa5..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysOperLog.java +++ /dev/null @@ -1,278 +0,0 @@ -package com.bonus.system.domain; - -import java.util.Date; - -import com.bonus.common.core.annotation.Excel; -import com.bonus.common.core.web.domain.BaseEntity; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 操作日志记录表 oper_log - * - * @author ldlv - */ -@Data -@EqualsAndHashCode(callSuper=false) -public class SysOperLog extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 日志主键 */ - @Excel(name = "操作序号", cellType = Excel.ColumnType.NUMERIC) - private Long operId; - - /** 操作模块 */ - - @Excel(name = "操作功能") - private String moduleName; - - @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; - private Long operUserId; - - /** 部门名称 */ - // @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/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysPost.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysPost.java deleted file mode 100644 index 9728bd6..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysPost.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.bonus.system.domain; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import com.bonus.common.core.annotation.Excel; -import com.bonus.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 岗位表 sys_post - * - * @author ldlv - */ -public class SysPost extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 岗位序号 */ - @Excel(name = "岗位序号", cellType = Excel.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/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysUserRole.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysUserRole.java deleted file mode 100644 index 9d12758..0000000 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/domain/SysUserRole.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.bonus.system.domain; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 用户和角色关联 sys_user_role - * - * @author ldlv - */ -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/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysLogininforMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysLogininforMapper.java index 32ecca5..0148824 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysLogininforMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysLogininforMapper.java @@ -1,25 +1,27 @@ package com.bonus.system.mapper; +import com.bonus.system.api.domain.SysLogininfor; + import java.util.List; -import com.bonus.system.domain.SysLogininfor; + /** * 系统访问日志情况信息 数据层 - * + * * @author ldlv */ public interface SysLogininforMapper { /** * 新增系统登录日志 - * + * * @param logininfor 访问日志对象 */ public void insertLogininfor(SysLogininfor logininfor); /** * 查询系统登录日志集合 - * + * * @param logininfor 访问日志对象 * @return 登录记录集合 */ @@ -27,7 +29,7 @@ public interface SysLogininforMapper /** * 批量删除系统登录日志 - * + * * @param infoIds 需要删除的登录日志ID * @return 结果 */ @@ -35,7 +37,7 @@ public interface SysLogininforMapper /** * 清空系统登录日志 - * + * * @return 结果 */ public int cleanLogininfor(); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysNoticeMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysNoticeMapper.java index b661e03..16cdfe7 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysNoticeMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysNoticeMapper.java @@ -1,8 +1,10 @@ package com.bonus.system.mapper; +import com.bonus.system.api.domain.SysNotice; + import java.util.List; -import com.bonus.system.domain.SysNotice; + /** * 通知公告表 数据层 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysOperLogMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysOperLogMapper.java index 58b27c9..f12ac44 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysOperLogMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysOperLogMapper.java @@ -1,25 +1,27 @@ package com.bonus.system.mapper; +import com.bonus.system.api.domain.SysOperLog; + import java.util.List; -import com.bonus.system.domain.SysOperLog; + /** * 操作日志 数据层 - * + * * @author ldlv */ public interface SysOperLogMapper { /** * 新增操作日志 - * + * * @param operLog 操作日志对象 */ public void insertOperlog(SysOperLog operLog); /** * 查询系统操作日志集合 - * + * * @param operLog 操作日志对象 * @return 操作日志集合 */ @@ -27,7 +29,7 @@ public interface SysOperLogMapper /** * 批量删除系统操作日志 - * + * * @param operIds 需要删除的操作日志ID * @return 结果 */ @@ -35,7 +37,7 @@ public interface SysOperLogMapper /** * 查询操作日志详细 - * + * * @param operId 操作ID * @return 操作日志对象 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java index 1d85889..7abf324 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysPostMapper.java @@ -1,18 +1,19 @@ package com.bonus.system.mapper; +import com.bonus.system.api.domain.SysPost; + import java.util.List; -import com.bonus.system.domain.SysPost; /** * 岗位信息 数据层 - * + * * @author ldlv */ public interface SysPostMapper { /** * 查询岗位数据集合 - * + * * @param post 岗位信息 * @return 岗位数据集合 */ @@ -20,14 +21,14 @@ public interface SysPostMapper /** * 查询所有岗位 - * + * * @return 岗位列表 */ public List selectPostAll(); /** * 通过岗位ID查询岗位信息 - * + * * @param postId 岗位ID * @return 角色对象信息 */ @@ -35,7 +36,7 @@ public interface SysPostMapper /** * 根据用户ID获取岗位选择框列表 - * + * * @param userId 用户ID * @return 选中岗位ID列表 */ @@ -43,7 +44,7 @@ public interface SysPostMapper /** * 查询用户所属岗位组 - * + * * @param userName 用户名 * @return 结果 */ @@ -51,7 +52,7 @@ public interface SysPostMapper /** * 删除岗位信息 - * + * * @param postId 岗位ID * @return 结果 */ @@ -59,7 +60,7 @@ public interface SysPostMapper /** * 批量删除岗位信息 - * + * * @param postIds 需要删除的岗位ID * @return 结果 */ @@ -67,7 +68,7 @@ public interface SysPostMapper /** * 修改岗位信息 - * + * * @param post 岗位信息 * @return 结果 */ @@ -75,7 +76,7 @@ public interface SysPostMapper /** * 新增岗位信息 - * + * * @param post 岗位信息 * @return 结果 */ @@ -83,7 +84,7 @@ public interface SysPostMapper /** * 校验岗位名称 - * + * * @param postName 岗位名称 * @return 结果 */ @@ -91,7 +92,7 @@ public interface SysPostMapper /** * 校验岗位编码 - * + * * @param postCode 岗位编码 * @return 结果 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserRoleMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserRoleMapper.java index 7f6fc57..2d9b332 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserRoleMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserRoleMapper.java @@ -1,19 +1,21 @@ package com.bonus.system.mapper; import java.util.List; + +import com.bonus.system.api.domain.SysUserRole; import org.apache.ibatis.annotations.Param; -import com.bonus.system.domain.SysUserRole; + /** * 用户与角色关联表 数据层 - * + * * @author ldlv */ public interface SysUserRoleMapper { /** * 通过用户ID删除用户和角色关联 - * + * * @param userId 用户ID * @return 结果 */ @@ -21,7 +23,7 @@ public interface SysUserRoleMapper /** * 批量删除用户和角色关联 - * + * * @param ids 需要删除的数据ID * @return 结果 */ @@ -29,7 +31,7 @@ public interface SysUserRoleMapper /** * 通过角色ID查询角色使用数量 - * + * * @param roleId 角色ID * @return 结果 */ @@ -37,7 +39,7 @@ public interface SysUserRoleMapper /** * 批量新增用户角色信息 - * + * * @param userRoleList 用户角色列表 * @return 结果 */ @@ -45,7 +47,7 @@ public interface SysUserRoleMapper /** * 删除用户和角色关联信息 - * + * * @param userRole 用户和角色关联信息 * @return 结果 */ @@ -53,7 +55,7 @@ public interface SysUserRoleMapper /** * 批量取消授权用户角色 - * + * * @param roleId 角色ID * @param userIds 需要删除的用户数据ID * @return 结果 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysLogininforService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysLogininforService.java index bbc03af..98709f5 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysLogininforService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysLogininforService.java @@ -1,25 +1,26 @@ package com.bonus.system.service; +import com.bonus.system.api.domain.SysLogininfor; + import java.util.List; -import com.bonus.system.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 - * + * * @author ldlv */ public interface ISysLogininforService { /** * 新增系统登录日志 - * + * * @param logininfor 访问日志对象 */ public void insertLogininfor(SysLogininfor logininfor); /** * 查询系统登录日志集合 - * + * * @param logininfor 访问日志对象 * @return 登录记录集合 */ @@ -27,7 +28,7 @@ public interface ISysLogininforService /** * 批量删除系统登录日志 - * + * * @param infoIds 需要删除的登录日志ID * @return 结果 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysNoticeService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysNoticeService.java index d39495d..4e96c1c 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysNoticeService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysNoticeService.java @@ -1,8 +1,9 @@ package com.bonus.system.service; +import com.bonus.system.api.domain.SysNotice; + import java.util.List; -import com.bonus.system.domain.SysNotice; /** * 公告 服务层 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysOperLogService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysOperLogService.java index 989157d..9848193 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysOperLogService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysOperLogService.java @@ -1,25 +1,27 @@ package com.bonus.system.service; +import com.bonus.system.api.domain.SysOperLog; + import java.util.List; -import com.bonus.system.domain.SysOperLog; + /** * 操作日志 服务层 - * + * * @author ldlv */ public interface ISysOperLogService { /** * 新增操作日志 - * + * * @param operLog 操作日志对象 */ public void insertOperlog(SysOperLog operLog); /** * 查询系统操作日志集合 - * + * * @param operLog 操作日志对象 * @return 操作日志集合 */ @@ -27,7 +29,7 @@ public interface ISysOperLogService /** * 批量删除系统操作日志 - * + * * @param operIds 需要删除的操作日志ID * @return 结果 */ @@ -35,7 +37,7 @@ public interface ISysOperLogService /** * 查询操作日志详细 - * + * * @param operId 操作ID * @return 操作日志对象 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysPostService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysPostService.java index abfca1d..1cb58e7 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysPostService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysPostService.java @@ -1,18 +1,20 @@ package com.bonus.system.service; +import com.bonus.system.api.domain.SysPost; + import java.util.List; -import com.bonus.system.domain.SysPost; + /** * 岗位信息 服务层 - * + * * @author ldlv */ public interface ISysPostService { /** * 查询岗位信息集合 - * + * * @param post 岗位信息 * @return 岗位列表 */ @@ -20,14 +22,14 @@ public interface ISysPostService /** * 查询所有岗位 - * + * * @return 岗位列表 */ public List selectPostAll(); /** * 通过岗位ID查询岗位信息 - * + * * @param postId 岗位ID * @return 角色对象信息 */ @@ -35,7 +37,7 @@ public interface ISysPostService /** * 根据用户ID获取岗位选择框列表 - * + * * @param userId 用户ID * @return 选中岗位ID列表 */ @@ -43,7 +45,7 @@ public interface ISysPostService /** * 校验岗位名称 - * + * * @param post 岗位信息 * @return 结果 */ @@ -51,7 +53,7 @@ public interface ISysPostService /** * 校验岗位编码 - * + * * @param post 岗位信息 * @return 结果 */ @@ -59,7 +61,7 @@ public interface ISysPostService /** * 通过岗位ID查询岗位使用数量 - * + * * @param postId 岗位ID * @return 结果 */ @@ -67,7 +69,7 @@ public interface ISysPostService /** * 删除岗位信息 - * + * * @param postId 岗位ID * @return 结果 */ @@ -75,7 +77,7 @@ public interface ISysPostService /** * 批量删除岗位信息 - * + * * @param postIds 需要删除的岗位ID * @return 结果 */ @@ -83,7 +85,7 @@ public interface ISysPostService /** * 新增保存岗位信息 - * + * * @param post 岗位信息 * @return 结果 */ @@ -91,7 +93,7 @@ public interface ISysPostService /** * 修改保存岗位信息 - * + * * @param post 岗位信息 * @return 结果 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java index dcc3104..13d3b2a 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java @@ -2,8 +2,9 @@ package com.bonus.system.service; import java.util.List; import java.util.Set; -import com.bonus.system.domain.SysUserRole; + import com.bonus.system.api.domain.SysRole; +import com.bonus.system.api.domain.SysUserRole; /** * 角色业务层 diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogininforServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogininforServiceImpl.java index b6a2396..2ab4f7e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogininforServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogininforServiceImpl.java @@ -1,9 +1,10 @@ package com.bonus.system.service.impl; import java.util.List; + +import com.bonus.system.api.domain.SysLogininfor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.system.domain.SysLogininfor; import com.bonus.system.mapper.SysLogininforMapper; import com.bonus.system.service.ISysLogininforService; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java index 19daef1..e587862 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysNoticeServiceImpl.java @@ -2,9 +2,10 @@ package com.bonus.system.service.impl; import java.util.List; +import com.bonus.system.api.domain.SysNotice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.system.domain.SysNotice; + import com.bonus.system.mapper.SysNoticeMapper; import com.bonus.system.service.ISysNoticeService; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysOperLogServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysOperLogServiceImpl.java index 3cb6037..42d26b2 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysOperLogServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysOperLogServiceImpl.java @@ -1,15 +1,16 @@ package com.bonus.system.service.impl; import java.util.List; + +import com.bonus.system.api.domain.SysOperLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.system.domain.SysOperLog; import com.bonus.system.mapper.SysOperLogMapper; import com.bonus.system.service.ISysOperLogService; /** * 操作日志 服务层处理 - * + * * @author ldlv */ @Service @@ -20,7 +21,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService /** * 新增操作日志 - * + * * @param operLog 操作日志对象 */ @Override @@ -31,7 +32,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService /** * 查询系统操作日志集合 - * + * * @param operLog 操作日志对象 * @return 操作日志集合 */ @@ -43,7 +44,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService /** * 批量删除系统操作日志 - * + * * @param operIds 需要删除的操作日志ID * @return 结果 */ @@ -55,7 +56,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService /** * 查询操作日志详细 - * + * * @param operId 操作ID * @return 操作日志对象 */ diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java index c7ca6b4..9cee33f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysPostServiceImpl.java @@ -5,13 +5,14 @@ import java.util.List; import com.bonus.common.core.constant.UserConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; +import com.bonus.system.api.domain.SysPost; import org.springframework.stereotype.Service; -import com.bonus.system.domain.SysPost; import com.bonus.system.mapper.SysPostMapper; import com.bonus.system.mapper.SysUserPostMapper; import com.bonus.system.service.ISysPostService; +import javax.annotation.Resource; + /** * 岗位信息 服务层处理 * @@ -20,10 +21,10 @@ import com.bonus.system.service.ISysPostService; @Service public class SysPostServiceImpl implements ISysPostService { - @Autowired + @Resource private SysPostMapper postMapper; - @Autowired + @Resource private SysUserPostMapper userPostMapper; /** diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index 10da85e..536b75f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -14,12 +14,12 @@ import com.bonus.common.datascope.annotation.DataScope; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.system.api.domain.SysRole; import com.bonus.system.api.domain.SysUser; +import com.bonus.system.api.domain.SysUserRole; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.bonus.system.domain.SysRoleDept; import com.bonus.system.domain.SysRoleMenu; -import com.bonus.system.domain.SysUserRole; import com.bonus.system.mapper.SysRoleDeptMapper; import com.bonus.system.mapper.SysRoleMapper; import com.bonus.system.mapper.SysRoleMenuMapper; diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java index 2487907..f0afad3 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java @@ -12,17 +12,17 @@ import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.bean.BeanValidators; import com.bonus.common.datascope.annotation.DataScope; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.system.api.domain.SysPost; import com.bonus.system.api.domain.SysRole; import com.bonus.system.api.domain.SysUser; +import com.bonus.system.api.domain.SysUserRole; 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.bonus.system.domain.SysPost; import com.bonus.system.domain.SysUserPost; -import com.bonus.system.domain.SysUserRole; import com.bonus.system.mapper.SysPostMapper; import com.bonus.system.mapper.SysRoleMapper; import com.bonus.system.mapper.SysUserMapper; @@ -147,7 +147,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public String selectUserPostGroup(String userName) { - List list = postMapper.selectPostsByUserName(userName); + List< SysPost> list = postMapper.selectPostsByUserName(userName); if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml new file mode 100644 index 0000000..545dc64 --- /dev/null +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap-dev.yml @@ -0,0 +1,25 @@ +# Tomcat +server: + port: 18088 + +# Spring +spring: + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + namespace: ca980e57-dbdd-436f-93e3-fef5aedb5357 + username: nacos + password: nacos + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + namespace: ca980e57-dbdd-436f-93e3-fef5aedb5357 + username: nacos + password: nacos + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..3153865 --- /dev/null +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +# Spring +spring: + application: + # 应用名称 + name: bonus-system + profiles: + # 环境配置 + active: dev + +#加密组件 +jasypt: + encryptor: + password: Encrypt +feign: + hystrix: + enabled: true + diff --git a/bonus-modules/bonus-system/src/main/resources/logback.xml b/bonus-modules/bonus-system/src/main/resources/logback.xml new file mode 100644 index 0000000..75bc969 --- /dev/null +++ b/bonus-modules/bonus-system/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 489cedc..ca827f1 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -14,15 +14,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into sys_logininfor (user_name, nick_name, status, ipaddr, login_location, browser, os, msg, login_time) values (#{userName},#{nickName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) - select info_id, user_name, nick_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml index 0bb6ae8..80295a0 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ from sys_menu - @@ -54,7 +54,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -127,12 +127,12 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -155,7 +155,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysNoticeMapper.xml index e6887aa..f5a4815 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select notice.notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark,log.user_id,show_type,receive_user_ids,file_urls, case when log.user_id is null then 0 else 1 end as is_read @@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by is_read, create_time desc - select count(1) from sys_notice notice where notice.status = '0' @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and not exists (select 1 from sys_notice_view_log where notice_id = notice.notice_id and user_id = #{userId}) - + insert into sys_notice ( notice_title, notice_type, @@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysOperLogMapper.xml index ae0d058..6c9d765 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml index 7be0164..f3cb4dd 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_post - @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index a2afb97..068cac5 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml index bc4d190..312e3b7 100644 --- a/bonus-modules/pom.xml +++ b/bonus-modules/pom.xml @@ -25,6 +25,12 @@ mybatis-plus-boot-starter 3.5.5 + + + com.baomidou + mybatis-plus-generator + 3.5.5 + com.bonus bonus-auth diff --git a/pom.xml b/pom.xml index 70354cf..3bae123 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.3.3 2.0.0 1.2.20 - 4.2.0 + 3.6.1 2.13.0 2.3 2.0.43