From 181af797d827fd3906b4dbe67c62dbe29a156272 Mon Sep 17 00:00:00 2001 From: "20932067@zju.edu.cn" Date: Fri, 22 Jan 2021 15:08:50 +0800 Subject: [PATCH] 11 --- .../controller/common/CaptchaController.java | 2 +- .../controller/common/CommonController.java | 2 +- .../controller/monitor/ServerController.java | 2 +- .../monitor/SysLogininforController.java | 2 +- .../monitor/SysOperlogController.java | 2 +- .../monitor/SysUserOnlineController.java | 4 +- .../controller/system/RegularController.java | 2 +- .../system/SysConfigController.java | 2 +- .../controller/system/SysDeptController.java | 4 +- .../system/SysDictDataController.java | 4 +- .../system/SysDictTypeController.java | 4 +- .../controller/system/SysLoginController.java | 10 +- .../controller/system/SysMenuController.java | 6 +- .../system/SysNoticeController.java | 2 +- .../controller/system/SysPostController.java | 2 +- .../system/SysProfileController.java | 6 +- .../controller/system/SysRoleController.java | 6 +- .../controller/system/SysUserController.java | 8 +- .../web/controller/tool/TestController.java | 2 +- .../core/controller/BaseController.java | 2 +- .../core/controller/HcyBaseController.java | 2 +- .../core/{domain => entity}/AjaxResult.java | 2 +- .../core/{domain => entity}/BaseEntity.java | 2 +- .../core/{domain => entity}/TreeEntity.java | 2 +- .../core/{domain => entity}/TreeSelect.java | 6 +- .../{domain => entity}/entity/SysDept.java | 4 +- .../entity/SysDictData.java | 4 +- .../entity/SysDictType.java | 4 +- .../{domain => entity}/entity/SysMenu.java | 4 +- .../{domain => entity}/entity/SysRole.java | 4 +- .../{domain => entity}/entity/SysUser.java | 4 +- .../{domain => entity}/model/LoginBody.java | 2 +- .../{domain => entity}/model/LoginUser.java | 4 +- .../com/hchyun/common/utils/DateUtils.java | 77 ++--- .../com/hchyun/common/utils/DictUtils.java | 2 +- .../hchyun/common/utils/SecurityUtils.java | 2 +- .../hchyun/common/utils/poi/ExcelUtil.java | 2 +- .../framework/aspectj/DataScopeAspect.java | 8 +- .../hchyun/framework/aspectj/LogAspect.java | 2 +- .../interceptor/RepeatSubmitInterceptor.java | 2 +- .../filter/JwtAuthenticationTokenFilter.java | 2 +- .../handle/AuthenticationEntryPointImpl.java | 2 +- .../handle/LogoutSuccessHandlerImpl.java | 4 +- .../web/exception/GlobalExceptionHandler.java | 2 +- .../web/service/PermissionService.java | 4 +- .../web/service/SysLoginService.java | 2 +- .../web/service/SysPermissionService.java | 2 +- .../framework/web/service/TokenService.java | 2 +- .../web/service/UserDetailsServiceImpl.java | 4 +- .../generator/controller/GenController.java | 84 ++--- ...lumnMapper.java => GenTableColumnDao.java} | 6 +- .../{GenTableMapper.java => GenTableDao.java} | 5 +- .../com/hchyun/generator/entity/GenTable.java | 2 +- .../generator/entity/GenTableColumn.java | 25 +- .../service/GenTableColumnServiceImpl.java | 15 +- .../service/GenTableServiceImpl.java | 324 ++++++++---------- .../generator/service/IGenTableService.java | 2 +- .../hchyun/generator/util/VelocityUtils.java | 22 +- .../mapper/generator/GenTableColumnMapper.xml | 50 +-- .../mapper/generator/GenTableMapper.xml | 42 ++- .../vm/java/{mapper.java.vm => dao.java.vm} | 4 +- .../java/{domain.java.vm => entity.java.vm} | 6 +- .../main/resources/vm/java/service.java.vm | 2 +- .../resources/vm/java/serviceImpl.java.vm | 4 +- ...{sub-domain.java.vm => sub-entity.java.vm} | 4 +- .../src/main/resources/vm/sql/sql.vm | 12 +- .../src/main/resources/vm/xml/mapper.xml.vm | 2 +- .../quartz/controller/SysJobController.java | 2 +- .../controller/SysJobLogController.java | 2 +- .../java/com/hchyun/quartz/entity/SysJob.java | 2 +- .../com/hchyun/quartz/entity/SysJobLog.java | 2 +- .../com/hchyun/system/dao/SysDeptDao.java | 2 +- .../com/hchyun/system/dao/SysDictDataDao.java | 2 +- .../com/hchyun/system/dao/SysDictTypeDao.java | 2 +- .../com/hchyun/system/dao/SysMenuDao.java | 2 +- .../com/hchyun/system/dao/SysRoleDao.java | 2 +- .../com/hchyun/system/dao/SysUserDao.java | 2 +- .../com/hchyun/system/entity/Regular.java | 2 +- .../com/hchyun/system/entity/SysConfig.java | 2 +- .../hchyun/system/entity/SysLogininfor.java | 2 +- .../com/hchyun/system/entity/SysNotice.java | 2 +- .../com/hchyun/system/entity/SysOperLog.java | 2 +- .../com/hchyun/system/entity/SysPost.java | 2 +- .../system/service/ISysDeptService.java | 4 +- .../system/service/ISysDictDataService.java | 2 +- .../system/service/ISysDictTypeService.java | 4 +- .../system/service/ISysMenuService.java | 4 +- .../system/service/ISysRoleService.java | 2 +- .../system/service/ISysUserOnlineService.java | 2 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 6 +- .../service/impl/SysDictDataServiceImpl.java | 2 +- .../service/impl/SysDictTypeServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 8 +- .../service/impl/SysRoleServiceImpl.java | 2 +- .../impl/SysUserOnlineServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 4 +- .../system/controller/SysStuController.java | 103 ++++++ .../java/com/ruoyi/system/dao/SysStudao.java | 61 ++++ .../java/com/ruoyi/system/entity/SysStu.java | 80 +++++ .../ruoyi/system/service/ISysStuService.java | 61 ++++ .../service/impl/SysStuServiceImpl.java | 95 +++++ .../resources/mapper/system/SysStuMapper.xml | 70 ++++ 103 files changed, 932 insertions(+), 466 deletions(-) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/AjaxResult.java (98%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/BaseEntity.java (98%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/TreeEntity.java (97%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/TreeSelect.java (90%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysDept.java (97%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysDictData.java (97%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysDictType.java (96%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysMenu.java (98%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysRole.java (98%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/entity/SysUser.java (98%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/model/LoginBody.java (95%) rename hchyun/hchyun-common/src/main/java/com/hchyun/common/core/{domain => entity}/model/LoginUser.java (97%) rename hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/{GenTableColumnMapper.java => GenTableColumnDao.java} (88%) rename hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/{GenTableMapper.java => GenTableDao.java} (92%) rename hchyun/hchyun-generator/src/main/resources/vm/java/{mapper.java.vm => dao.java.vm} (96%) rename hchyun/hchyun-generator/src/main/resources/vm/java/{domain.java.vm => entity.java.vm} (95%) rename hchyun/hchyun-generator/src/main/resources/vm/java/{sub-domain.java.vm => sub-entity.java.vm} (96%) create mode 100644 hchyun/hchyun-test/src/main/java/com/ruoyi/system/controller/SysStuController.java create mode 100644 hchyun/hchyun-test/src/main/java/com/ruoyi/system/dao/SysStudao.java create mode 100644 hchyun/hchyun-test/src/main/java/com/ruoyi/system/entity/SysStu.java create mode 100644 hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/ISysStuService.java create mode 100644 hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/impl/SysStuServiceImpl.java create mode 100644 hchyun/hchyun-test/src/main/resources/mapper/system/SysStuMapper.xml diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java index 4c5c182..0d80fce 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CaptchaController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.redis.RedisCache; import com.hchyun.common.utils.sign.Base64; import com.hchyun.common.utils.uuid.IdUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java index 474ce18..0fb8f64 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/common/CommonController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.hchyun.common.config.HchYunConfig; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.file.FileUploadUtils; import com.hchyun.common.utils.file.FileUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java index 00ac13b..54fb332 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/ServerController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.framework.web.domain.Server; /** diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java index bbcedfa..3cdba78 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysLogininforController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.poi.ExcelUtil; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java index f76ff09..2033766 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysOperlogController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.poi.ExcelUtil; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java index ff61cc1..1a0fba2 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/monitor/SysUserOnlineController.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.Constants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.redis.RedisCache; import com.hchyun.common.enums.BusinessType; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java index 2cbcef8..e6dbc73 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RegularController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.HcyBaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.enums.BusinessType; import com.hchyun.system.entity.Regular; import com.hchyun.system.service.RegularService; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java index dac8d1a..ff9bdf0 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysConfigController.java @@ -16,7 +16,7 @@ import com.hchyun.common.annotation.Log; import com.hchyun.common.annotation.RepeatSubmit; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java index 54868d7..7d82f44 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDeptController.java @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysDept; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysDept; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java index f1db974..038e09e 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictDataController.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysDictData; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysDictData; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java index ea7b038..c450855 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysDictTypeController.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysDictType; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysDictType; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java index de64d7d..dd3bae4 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysLoginController.java @@ -8,11 +8,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysMenu; -import com.hchyun.common.core.domain.entity.SysUser; -import com.hchyun.common.core.domain.model.LoginBody; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysMenu; +import com.hchyun.common.core.entity.entity.SysUser; +import com.hchyun.common.core.entity.model.LoginBody; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.ServletUtils; import com.hchyun.framework.web.service.SysLoginService; import com.hchyun.framework.web.service.SysPermissionService; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java index 9cf377d..ab6f282 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysMenuController.java @@ -16,9 +16,9 @@ import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.Constants; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysMenu; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysMenu; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.ServletUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java index 0270870..608d941 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysNoticeController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java index b45a052..f35446b 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysPostController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java index 9ae21b0..c7cb6a9 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysProfileController.java @@ -13,9 +13,9 @@ import org.springframework.web.multipart.MultipartFile; import com.hchyun.common.annotation.Log; import com.hchyun.common.config.HchYunConfig; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysUser; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.ServletUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java index 7a0590e..73ae04e 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysRoleController.java @@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java index 38f8b40..ffaa555 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/SysUserController.java @@ -17,10 +17,10 @@ import org.springframework.web.multipart.MultipartFile; import com.hchyun.common.annotation.Log; import com.hchyun.common.constant.UserConstants; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.entity.SysUser; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.SecurityUtils; diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java index f6af6d7..614460e 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/tool/TestController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java index 4610cd9..0817bfa 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/BaseController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.PageDomain; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.page.TableSupport; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java index 8d1ae6d..4ecf355 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/controller/HcyBaseController.java @@ -3,7 +3,7 @@ package com.hchyun.common.core.controller; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.PageDomain; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.page.TableSupport; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/AjaxResult.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java similarity index 98% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/AjaxResult.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java index 358fedc..b10c4b4 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/AjaxResult.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/AjaxResult.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain; +package com.hchyun.common.core.entity; import java.util.HashMap; import com.hchyun.common.constant.HttpStatus; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/BaseEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java similarity index 98% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/BaseEntity.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java index 812cff4..f7e3acd 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/BaseEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain; +package com.hchyun.common.core.entity; import java.io.Serializable; import java.util.Date; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeEntity.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java similarity index 97% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeEntity.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java index f6c5459..4f174ae 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeEntity.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeEntity.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain; +package com.hchyun.common.core.entity; import java.util.ArrayList; import java.util.List; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeSelect.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java similarity index 90% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeSelect.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java index 316acb8..b33ebbd 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/TreeSelect.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/TreeSelect.java @@ -1,11 +1,11 @@ -package com.hchyun.common.core.domain; +package com.hchyun.common.core.entity; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.hchyun.common.core.domain.entity.SysDept; -import com.hchyun.common.core.domain.entity.SysMenu; +import com.hchyun.common.core.entity.entity.SysDept; +import com.hchyun.common.core.entity.entity.SysMenu; /** * Treeselect树结构实体类 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDept.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java similarity index 97% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDept.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java index cabad92..e6693ab 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDept.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDept.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 部门表 sys_dept diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictData.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java similarity index 97% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictData.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java index 15f8509..b99c015 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictData.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictData.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 字典数据表 sys_dict_data diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictType.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java similarity index 96% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictType.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java index d846474..12b0af8 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysDictType.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysDictType.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 字典类型表 sys_dict_type diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysMenu.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java similarity index 98% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysMenu.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java index ce79adb..4a8477a 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysMenu.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 菜单权限表 sys_menu diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysRole.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java similarity index 98% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysRole.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java index 1794d1d..3406b9a 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysRole.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 角色表 sys_role diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysUser.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java similarity index 98% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysUser.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java index 3b2d278..2499bba 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/entity/SysUser.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.entity; +package com.hchyun.common.core.entity.entity; import java.util.Date; import java.util.List; @@ -13,7 +13,7 @@ import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; import com.hchyun.common.annotation.Excel.Type; import com.hchyun.common.annotation.Excels; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 用户对象 sys_user diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginBody.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginBody.java similarity index 95% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginBody.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginBody.java index 5ef211e..033483d 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginBody.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginBody.java @@ -1,4 +1,4 @@ -package com.hchyun.common.core.domain.model; +package com.hchyun.common.core.entity.model; /** * 用户登录对象 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginUser.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java similarity index 97% rename from hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginUser.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java index aab323a..8d1f3f5 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/domain/model/LoginUser.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/core/entity/model/LoginUser.java @@ -1,11 +1,11 @@ -package com.hchyun.common.core.domain.model; +package com.hchyun.common.core.entity.model; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.entity.SysUser; /** * 登录用户身份权限 diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DateUtils.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DateUtils.java index b3bf390..2981dba 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DateUtils.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DateUtils.java @@ -4,15 +4,15 @@ import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; + import org.apache.commons.lang3.time.DateFormatUtils; /** * 时间工具类 - * + * * @author hchyun */ -public class DateUtils extends org.apache.commons.lang3.time.DateUtils -{ +public class DateUtils extends org.apache.commons.lang3.time.DateUtils { public static String YYYY = "yyyy"; public static String YYYY_MM = "yyyy-MM"; @@ -22,65 +22,55 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - + private static String[] parsePatterns = { - "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", - "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", - "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + "yyyy-MM-dd" , "yyyy-MM-dd HH:mm:ss" , "yyyy-MM-dd HH:mm" , "yyyy-MM" , + "yyyy/MM/dd" , "yyyy/MM/dd HH:mm:ss" , "yyyy/MM/dd HH:mm" , "yyyy/MM" , + "yyyy.MM.dd" , "yyyy.MM.dd HH:mm:ss" , "yyyy.MM.dd HH:mm" , "yyyy.MM"}; /** * 获取当前Date型日期 - * + * * @return Date() 当前日期 */ - public static Date getNowDate() - { + public static Date getNowDate() { return new Date(); } /** * 获取当前日期, 默认格式为yyyy-MM-dd - * + * * @return String */ - public static String getDate() - { + public static String getDate() { return dateTimeNow(YYYY_MM_DD); } - public static final String getTime() - { + + public static final String getTime() { return dateTimeNow(YYYY_MM_DD_HH_MM_SS); } - public static final String dateTimeNow() - { + public static final String dateTimeNow() { return dateTimeNow(YYYYMMDDHHMMSS); } - public static final String dateTimeNow(final String format) - { + public static final String dateTimeNow(final String format) { return parseDateToStr(format, new Date()); } - public static final String dateTime(final Date date) - { + public static final String dateTime(final Date date) { return parseDateToStr(YYYY_MM_DD, date); } - public static final String parseDateToStr(final String format, final Date date) - { + public static final String parseDateToStr(final String format, final Date date) { return new SimpleDateFormat(format).format(date); } - public static final Date dateTime(final String format, final String ts) - { - try - { + public static final Date dateTime(final String format, final String ts) { + try { return new SimpleDateFormat(format).parse(ts); - } - catch (ParseException e) - { + } catch (ParseException e) { throw new RuntimeException(e); } } @@ -88,8 +78,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 日期路径 即年/月/日 如2018/08/08 */ - public static final String datePath() - { + public static final String datePath() { Date now = new Date(); return DateFormatUtils.format(now, "yyyy/MM/dd"); } @@ -97,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 日期路径 即年/月/日 如20180808 */ - public static final String dateTime() - { + public static final String dateTime() { Date now = new Date(); return DateFormatUtils.format(now, "yyyyMMdd"); } @@ -106,27 +94,21 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 日期型字符串转化为日期 格式 */ - public static Date parseDate(Object str) - { - if (str == null) - { + public static Date parseDate(Object str) { + if (str == null) { return null; } - try - { + try { return parseDate(str.toString(), parsePatterns); - } - catch (ParseException e) - { + } catch (ParseException e) { return null; } } - + /** * 获取服务器启动时间 */ - public static Date getServerStartDate() - { + public static Date getServerStartDate() { long time = ManagementFactory.getRuntimeMXBean().getStartTime(); return new Date(time); } @@ -134,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils /** * 计算两个时间差 */ - public static String getDatePoor(Date endDate, Date nowDate) - { + public static String getDatePoor(Date endDate, Date nowDate) { long nd = 1000 * 24 * 60 * 60; long nh = 1000 * 60 * 60; long nm = 1000 * 60; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DictUtils.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DictUtils.java index b30e0e6..2f9b863 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DictUtils.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/DictUtils.java @@ -3,7 +3,7 @@ package com.hchyun.common.utils; import java.util.Collection; import java.util.List; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictData; import com.hchyun.common.core.redis.RedisCache; import com.hchyun.common.utils.spring.SpringUtils; diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/SecurityUtils.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/SecurityUtils.java index dc1cceb..ecc2af6 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/SecurityUtils.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/SecurityUtils.java @@ -4,7 +4,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.exception.CustomException; /** diff --git a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/poi/ExcelUtil.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/poi/ExcelUtil.java index ab8e36b..c5a2d85 100644 --- a/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/poi/ExcelUtil.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/poi/ExcelUtil.java @@ -46,7 +46,7 @@ import com.hchyun.common.annotation.Excel.ColumnType; import com.hchyun.common.annotation.Excel.Type; import com.hchyun.common.annotation.Excels; import com.hchyun.common.config.HchYunConfig; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.text.Convert; import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.DateUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataScopeAspect.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataScopeAspect.java index d47f571..b18e5b6 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataScopeAspect.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/DataScopeAspect.java @@ -9,10 +9,10 @@ import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; import com.hchyun.common.annotation.DataScope; -import com.hchyun.common.core.domain.BaseEntity; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.entity.SysUser; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.BaseEntity; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.ServletUtils; import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.spring.SpringUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/LogAspect.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/LogAspect.java index ece5f02..279bb8f 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/LogAspect.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/aspectj/LogAspect.java @@ -18,7 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; import com.alibaba.fastjson.JSON; import com.hchyun.common.annotation.Log; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.enums.BusinessStatus; import com.hchyun.common.enums.HttpMethod; import com.hchyun.common.utils.ServletUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/interceptor/RepeatSubmitInterceptor.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/interceptor/RepeatSubmitInterceptor.java index a6671bf..b73762f 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/interceptor/RepeatSubmitInterceptor.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/interceptor/RepeatSubmitInterceptor.java @@ -8,7 +8,7 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import com.alibaba.fastjson.JSONObject; import com.hchyun.common.annotation.RepeatSubmit; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.utils.ServletUtils; /** diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/filter/JwtAuthenticationTokenFilter.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/filter/JwtAuthenticationTokenFilter.java index b4837e9..06a9e0c 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -11,7 +11,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.StringUtils; import com.hchyun.framework.web.service.TokenService; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/AuthenticationEntryPointImpl.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/AuthenticationEntryPointImpl.java index 3849119..fcf0ee5 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/AuthenticationEntryPointImpl.java @@ -9,7 +9,7 @@ import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson.JSON; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.utils.ServletUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/LogoutSuccessHandlerImpl.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/LogoutSuccessHandlerImpl.java index a126c89..7053c45 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -11,8 +11,8 @@ import org.springframework.security.web.authentication.logout.LogoutSuccessHandl import com.alibaba.fastjson.JSON; import com.hchyun.common.constant.Constants; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.AjaxResult; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.AjaxResult; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.ServletUtils; import com.hchyun.common.utils.StringUtils; import com.hchyun.framework.dao.AsyncDao; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/exception/GlobalExceptionHandler.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/exception/GlobalExceptionHandler.java index 00811ee..0ad9dfd 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/exception/GlobalExceptionHandler.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/exception/GlobalExceptionHandler.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.NoHandlerFoundException; import com.hchyun.common.constant.HttpStatus; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.exception.BaseException; import com.hchyun.common.exception.CustomException; import com.hchyun.common.exception.DemoModeException; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/PermissionService.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/PermissionService.java index dc0ac8d..1db5519 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/PermissionService.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/PermissionService.java @@ -4,8 +4,8 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.ServletUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysLoginService.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysLoginService.java index abaab89..12e89f5 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysLoginService.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysLoginService.java @@ -8,7 +8,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.core.redis.RedisCache; import com.hchyun.common.exception.CustomException; import com.hchyun.common.exception.user.CaptchaException; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysPermissionService.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysPermissionService.java index 7c76dff..fe8b5cc 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysPermissionService.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/SysPermissionService.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.entity.SysUser; import com.hchyun.system.service.ISysMenuService; import com.hchyun.system.service.ISysRoleService; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/TokenService.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/TokenService.java index 0933f9a..ec82931 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/TokenService.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/TokenService.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.hchyun.common.constant.Constants; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.core.redis.RedisCache; import com.hchyun.common.utils.ServletUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/UserDetailsServiceImpl.java b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/UserDetailsServiceImpl.java index 3fd2b66..befdc9a 100644 --- a/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/UserDetailsServiceImpl.java +++ b/hchyun/hchyun-framework/src/main/java/com/hchyun/framework/web/service/UserDetailsServiceImpl.java @@ -7,8 +7,8 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.hchyun.common.core.domain.entity.SysUser; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.entity.SysUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.enums.UserStatus; import com.hchyun.common.exception.BaseException; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java index 28c6d4a..fca1a86 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/GenController.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletResponse; + import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.core.text.Convert; import com.hchyun.common.enums.BusinessType; @@ -30,13 +31,12 @@ import com.hchyun.generator.service.IGenTableService; /** * 代码生成 操作处理 - * + * * @author ruoyi */ @RestController @RequestMapping("/tool/gen") -public class GenController extends BaseController -{ +public class GenController extends BaseController { @Autowired private IGenTableService genTableService; @@ -48,8 +48,7 @@ public class GenController extends BaseController */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/list") - public TableDataInfo genList(GenTable genTable) - { + public TableDataInfo genList(GenTable genTable) { startPage(); List list = genTableService.selectGenTableList(genTable); return getDataTable(list); @@ -60,15 +59,14 @@ public class GenController extends BaseController */ @PreAuthorize("@ss.hasPermi('tool:gen:query')") @GetMapping(value = "/{talbleId}") - public AjaxResult getInfo(@PathVariable Long talbleId) - { + public AjaxResult getInfo(@PathVariable Long talbleId) { GenTable table = genTableService.selectGenTableById(talbleId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(talbleId); Map map = new HashMap(); - map.put("info", table); - map.put("rows", list); - map.put("tables", tables); + map.put("info" , table); + map.put("rows" , list); + map.put("tables" , tables); return AjaxResult.success(map); } @@ -77,8 +75,7 @@ public class GenController extends BaseController */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable) - { + public TableDataInfo dataList(GenTable genTable) { startPage(); List list = genTableService.selectDbTableList(genTable); return getDataTable(list); @@ -89,8 +86,7 @@ public class GenController extends BaseController */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") @GetMapping(value = "/column/{talbleId}") - public TableDataInfo columnList(Long tableId) - { + public TableDataInfo columnList(Long tableId) { TableDataInfo dataInfo = new TableDataInfo(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); dataInfo.setRows(list); @@ -102,10 +98,9 @@ public class GenController extends BaseController * 导入表结构（保存） */ @PreAuthorize("@ss.hasPermi('tool:gen:list')") - @Log(title = "代码生成", businessType = BusinessType.IMPORT) + @Log(title = "代码生成" , businessType = BusinessType.IMPORT) @PostMapping("/importTable") - public AjaxResult importTableSave(String tables) - { + public AjaxResult importTableSave(String tables) { String[] tableNames = Convert.toStrArray(tables); // 查询表信息 List tableList = genTableService.selectDbTableListByNames(tableNames); @@ -114,13 +109,13 @@ public class GenController extends BaseController } /** + * todo * 修改保存代码生成业务 */ @PreAuthorize("@ss.hasPermi('tool:gen:edit')") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @Log(title = "代码生成" , businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult editSave(@Validated @RequestBody GenTable genTable) - { + public AjaxResult editSave(@Validated @RequestBody GenTable genTable) { genTableService.validateEdit(genTable); genTableService.updateGenTable(genTable); return AjaxResult.success(); @@ -130,10 +125,9 @@ public class GenController extends BaseController * 删除代码生成 */ @PreAuthorize("@ss.hasPermi('tool:gen:remove')") - @Log(title = "代码生成", businessType = BusinessType.DELETE) + @Log(title = "代码生成" , businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public AjaxResult remove(@PathVariable Long[] tableIds) - { + public AjaxResult remove(@PathVariable Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return AjaxResult.success(); } @@ -143,8 +137,7 @@ public class GenController extends BaseController */ @PreAuthorize("@ss.hasPermi('tool:gen:preview')") @GetMapping("/preview/{tableId}") - public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException - { + public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException { Map dataMap = genTableService.previewCode(tableId); return AjaxResult.success(dataMap); } @@ -153,10 +146,9 @@ public class GenController extends BaseController * 生成代码（下载方式） */ @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @Log(title = "代码生成" , businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") - public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException - { + public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException { byte[] data = genTableService.downloadCode(tableName); genCode(response, data); } @@ -165,22 +157,24 @@ public class GenController extends BaseController * 生成代码（自定义路径） */ @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @Log(title = "代码生成" , businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") - public AjaxResult genCode(@PathVariable("tableName") String tableName) - { - genTableService.generatorCode(tableName); - return AjaxResult.success(); + public AjaxResult genCode(@PathVariable("tableName") String tableName) { + boolean start = genTableService.generatorCode(tableName); + if (start) { + return AjaxResult.success(); + } else { + return AjaxResult.error("模板渲染失败!"); + } } /** * 同步数据库 */ @PreAuthorize("@ss.hasPermi('tool:gen:edit')") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) + @Log(title = "代码生成" , businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") - public AjaxResult synchDb(@PathVariable("tableName") String tableName) - { + public AjaxResult synchDb(@PathVariable("tableName") String tableName) { genTableService.synchDb(tableName); return AjaxResult.success(); } @@ -189,10 +183,9 @@ public class GenController extends BaseController * 批量生成代码 */ @PreAuthorize("@ss.hasPermi('tool:gen:code')") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) + @Log(title = "代码生成" , businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tables) throws IOException - { + public void batchGenCode(HttpServletResponse response, String tables) throws IOException { String[] tableNames = Convert.toStrArray(tables); byte[] data = genTableService.downloadCode(tableNames); genCode(response, data); @@ -201,13 +194,12 @@ public class GenController extends BaseController /** * 生成zip文件 */ - private void genCode(HttpServletResponse response, byte[] data) throws IOException - { + private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); - response.addHeader("Access-Control-Allow-Origin", "*"); - response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); - response.addHeader("Content-Length", "" + data.length); + response.addHeader("Access-Control-Allow-Origin" , "*"); + response.addHeader("Access-Control-Expose-Headers" , "Content-Disposition"); + response.setHeader("Content-Disposition" , "attachment; filename=\"ruoyi.zip\""); + response.addHeader("Content-Length" , "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); } diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnDao.java similarity index 88% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnDao.java index ee8370a..a6433ca 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnMapper.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableColumnDao.java @@ -8,7 +8,7 @@ import com.hchyun.generator.entity.GenTableColumn; * * @author ruoyi */ -public interface GenTableColumnMapper +public interface GenTableColumnDao { /** * 根据表名称查询列信息 @@ -37,10 +37,10 @@ public interface GenTableColumnMapper /** * 修改业务字段 * - * @param genTableColumn 业务字段信息 + * @param genTableColumns 业务字段信息 * @return 结果 */ - public int updateGenTableColumn(GenTableColumn genTableColumn); + public int updateGenTableColumn(List genTableColumns); /** * 删除业务字段 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableDao.java similarity index 92% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java rename to hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableDao.java index bed4fff..9733f70 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableMapper.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/dao/GenTableDao.java @@ -2,13 +2,14 @@ package com.hchyun.generator.dao; import java.util.List; import com.hchyun.generator.entity.GenTable; +import org.apache.ibatis.annotations.Param; /** * 业务 数据层 * * @author ruoyi */ -public interface GenTableMapper +public interface GenTableDao { /** * 查询业务列表 @@ -80,4 +81,6 @@ public interface GenTableMapper * @return 结果 */ public int deleteGenTableByIds(Long[] ids); + + int insertMenu(@Param("paramSQL") String sql); } diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java index 25ef942..fa1852d 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTable.java @@ -5,7 +5,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; import com.hchyun.common.constant.GenConstants; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; import com.hchyun.common.utils.StringUtils; /** diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java index c893bda..191be05 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/entity/GenTableColumn.java @@ -1,7 +1,7 @@ package com.hchyun.generator.entity; import javax.validation.constraints.NotBlank; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; import com.hchyun.common.utils.StringUtils; /** @@ -56,6 +56,12 @@ public class GenTableColumn extends BaseEntity /** 是否查询字段（1是） */ private String isQuery; + /** 是否正则(1否)*/ + private Long isRegular; + + /** 正则表达式内容 */ + private String regular; + /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */ private String queryType; @@ -68,6 +74,23 @@ public class GenTableColumn extends BaseEntity /** 排序 */ private Integer sort; + + public Long getIsRegular() { + return isRegular; + } + + public void setIsRegular(Long isRegular) { + this.isRegular = isRegular; + } + + public String getRegular() { + return regular; + } + + public void setRegular(String regular) { + this.regular = regular; + } + public void setColumnId(Long columnId) { this.columnId = columnId; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java index 3c63694..5d2fd28 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableColumnServiceImpl.java @@ -1,11 +1,12 @@ package com.hchyun.generator.service; +import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hchyun.common.core.text.Convert; import com.hchyun.generator.entity.GenTableColumn; -import com.hchyun.generator.dao.GenTableColumnMapper; +import com.hchyun.generator.dao.GenTableColumnDao; /** * 业务字段 服务层实现 @@ -16,7 +17,7 @@ import com.hchyun.generator.dao.GenTableColumnMapper; public class GenTableColumnServiceImpl implements IGenTableColumnService { @Autowired - private GenTableColumnMapper genTableColumnMapper; + private GenTableColumnDao genTableColumnDao; /** * 查询业务字段列表 @@ -27,7 +28,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService @Override public List selectGenTableColumnListByTableId(Long tableId) { - return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); + return genTableColumnDao.selectGenTableColumnListByTableId(tableId); } /** @@ -39,7 +40,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService @Override public int insertGenTableColumn(GenTableColumn genTableColumn) { - return genTableColumnMapper.insertGenTableColumn(genTableColumn); + return genTableColumnDao.insertGenTableColumn(genTableColumn); } /** @@ -51,7 +52,9 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService @Override public int updateGenTableColumn(GenTableColumn genTableColumn) { - return genTableColumnMapper.updateGenTableColumn(genTableColumn); + List genTableColumns = new ArrayList(); + genTableColumns.add(genTableColumn); + return genTableColumnDao.updateGenTableColumn(genTableColumns); } /** @@ -63,6 +66,6 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService @Override public int deleteGenTableColumnByIds(String ids) { - return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); + return genTableColumnDao.deleteGenTableColumnByIds(Convert.toLongArray(ids)); } } diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java index 93f7fbf..f97999d 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/GenTableServiceImpl.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -30,172 +31,155 @@ import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.file.FileUtils; import com.hchyun.generator.entity.GenTable; import com.hchyun.generator.entity.GenTableColumn; -import com.hchyun.generator.dao.GenTableColumnMapper; -import com.hchyun.generator.dao.GenTableMapper; +import com.hchyun.generator.dao.GenTableColumnDao; +import com.hchyun.generator.dao.GenTableDao; import com.hchyun.generator.util.GenUtils; import com.hchyun.generator.util.VelocityInitializer; import com.hchyun.generator.util.VelocityUtils; /** * 业务 服务层实现 - * + * * @author ruoyi */ @Service -public class GenTableServiceImpl implements IGenTableService -{ +public class GenTableServiceImpl implements IGenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); @Autowired - private GenTableMapper genTableMapper; + private GenTableDao genTableDao; @Autowired - private GenTableColumnMapper genTableColumnMapper; + private GenTableColumnDao genTableColumnDao; /** * 查询业务信息 - * + * * @param id 业务ID * @return 业务信息 */ @Override - public GenTable selectGenTableById(Long id) - { - GenTable genTable = genTableMapper.selectGenTableById(id); + public GenTable selectGenTableById(Long id) { + GenTable genTable = genTableDao.selectGenTableById(id); setTableFromOptions(genTable); return genTable; } /** * 查询业务列表 - * + * * @param genTable 业务信息 * @return 业务集合 */ @Override - public List selectGenTableList(GenTable genTable) - { - return genTableMapper.selectGenTableList(genTable); + public List selectGenTableList(GenTable genTable) { + return genTableDao.selectGenTableList(genTable); } /** * 查询据库列表 - * + * * @param genTable 业务信息 * @return 数据库表集合 */ @Override - public List selectDbTableList(GenTable genTable) - { - return genTableMapper.selectDbTableList(genTable); + public List selectDbTableList(GenTable genTable) { + return genTableDao.selectDbTableList(genTable); } /** * 查询据库列表 - * + * * @param tableNames 表名称组 * @return 数据库表集合 */ @Override - public List selectDbTableListByNames(String[] tableNames) - { - return genTableMapper.selectDbTableListByNames(tableNames); + public List selectDbTableListByNames(String[] tableNames) { + return genTableDao.selectDbTableListByNames(tableNames); } /** * 查询所有表信息 - * + * * @return 表信息集合 */ @Override - public List selectGenTableAll() - { - return genTableMapper.selectGenTableAll(); + public List selectGenTableAll() { + return genTableDao.selectGenTableAll(); } /** - * 修改业务 - * + * todo 修改业务 + * * @param genTable 业务信息 * @return 结果 */ @Override @Transactional - public void updateGenTable(GenTable genTable) - { + public void updateGenTable(GenTable genTable) { String options = JSON.toJSONString(genTable.getParams()); genTable.setOptions(options); - int row = genTableMapper.updateGenTable(genTable); - if (row > 0) - { - for (GenTableColumn cenTableColumn : genTable.getColumns()) - { - genTableColumnMapper.updateGenTableColumn(cenTableColumn); - } + int row = genTableDao.updateGenTable(genTable); + if (row > 0) { +// for (GenTableColumn cenTableColumn : genTable.getColumns()) +// { + genTableColumnDao.updateGenTableColumn(genTable.getColumns()); +// } } } /** * 删除业务对象 - * + * * @param tableIds 需要删除的数据ID * @return 结果 */ @Override @Transactional - public void deleteGenTableByIds(Long[] tableIds) - { - genTableMapper.deleteGenTableByIds(tableIds); - genTableColumnMapper.deleteGenTableColumnByIds(tableIds); + public void deleteGenTableByIds(Long[] tableIds) { + genTableDao.deleteGenTableByIds(tableIds); + genTableColumnDao.deleteGenTableColumnByIds(tableIds); } /** * 导入表结构 - * + * * @param tableList 导入表列表 */ @Override @Transactional - public void importGenTable(List tableList) - { + public void importGenTable(List tableList) { Long operName = SecurityUtils.getUserId(); - try - { - for (GenTable table : tableList) - { + try { + for (GenTable table : tableList) { String tableName = table.getTableName(); GenUtils.initTable(table, operName); - int row = genTableMapper.insertGenTable(table); - if (row > 0) - { + int row = genTableDao.insertGenTable(table); + if (row > 0) { // 保存列信息 - List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) - { + List genTableColumns = genTableColumnDao.selectDbTableColumnsByName(tableName); + for (GenTableColumn column : genTableColumns) { GenUtils.initColumnField(column, table); - genTableColumnMapper.insertGenTableColumn(column); + genTableColumnDao.insertGenTableColumn(column); } } } - } - catch (Exception e) - { + } catch (Exception e) { throw new CustomException("导入失败：" + e.getMessage()); } } /** * 预览代码 - * + * * @param tableId 表编号 * @return 预览数据列表 */ @Override - public Map previewCode(Long tableId) - { + public Map previewCode(Long tableId) { Map dataMap = new LinkedHashMap<>(); // 查询表信息 - GenTable table = genTableMapper.selectGenTableById(tableId); + GenTable table = genTableDao.selectGenTableById(tableId); // 设置主子表信息 setSubTable(table); // 设置主键列信息 @@ -206,9 +190,11 @@ public class GenTableServiceImpl implements IGenTableService // 获取模板列表 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { + for (String template : templates) { // 渲染模板 + if (template.equals("")){ + + } StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); tpl.merge(context, sw); @@ -219,13 +205,12 @@ public class GenTableServiceImpl implements IGenTableService /** * 生成代码（下载方式） - * + * * @param tableName 表名称 * @return 数据 */ @Override - public byte[] downloadCode(String tableName) - { + public byte[] downloadCode(String tableName) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); generatorCode(tableName, zip); @@ -235,14 +220,14 @@ public class GenTableServiceImpl implements IGenTableService /** * 生成代码（自定义路径） - * + * * @param tableName 表名称 + * @return */ @Override - public void generatorCode(String tableName) - { + public boolean generatorCode(String tableName) { // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); + GenTable table = genTableDao.selectGenTableByName(tableName); // 设置主子表信息 setSubTable(table); // 设置主键列信息 @@ -254,88 +239,103 @@ public class GenTableServiceImpl implements IGenTableService // 获取模板列表 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) - { + for (String template : templates) { + if (!StringUtils.containsAny(template, "sql.vm" , "api.js.vm" , "index.vue.vm" , "index-tree.vue.vm")) { // 渲染模板 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); tpl.merge(context, sw); - try - { - String path = getGenPath(table, template); - FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); - } - catch (IOException e) - { - throw new CustomException("渲染模板失败，表名：" + table.getTableName()); + if (template.equals("vm/sql/sql.vm")) { + Boolean start = insertMenuItem(sw); + if (start){ + return false; + } + }else { + try { + String path = getGenPath(table, template); + FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); + } catch (IOException e) { + log.error("渲染模板失败，表名：" + table.getTableName()); + return false; + } } } } + return true; } /** * 同步数据库 - * + * * @param tableName 表名称 */ @Override @Transactional - public void synchDb(String tableName) - { - GenTable table = genTableMapper.selectGenTableByName(tableName); + public void synchDb(String tableName) { + GenTable table = genTableDao.selectGenTableByName(tableName); List tableColumns = table.getColumns(); List tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - if (StringUtils.isEmpty(dbTableColumns)) - { + List dbTableColumns = genTableColumnDao.selectDbTableColumnsByName(tableName); + if (StringUtils.isEmpty(dbTableColumns)) { throw new CustomException("同步数据失败，原表结构不存在"); } List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); dbTableColumns.forEach(column -> { - if (!tableColumnNames.contains(column.getColumnName())) - { + if (!tableColumnNames.contains(column.getColumnName())) { GenUtils.initColumnField(column, table); - genTableColumnMapper.insertGenTableColumn(column); + genTableColumnDao.insertGenTableColumn(column); } }); List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); - if (StringUtils.isNotEmpty(delColumns)) - { - genTableColumnMapper.deleteGenTableColumns(delColumns); + if (StringUtils.isNotEmpty(delColumns)) { + genTableColumnDao.deleteGenTableColumns(delColumns); } } /** * 批量生成代码（下载方式） - * + * * @param tableNames 表数组 * @return 数据 */ @Override - public byte[] downloadCode(String[] tableNames) - { + public byte[] downloadCode(String[] tableNames) { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableName : tableNames) - { - generatorCode(tableName, zip); + for (String tableName : tableNames) { + zip = generatorCode(tableName, zip); + if (zip==null){ + return null; + } } IOUtils.closeQuietly(zip); return outputStream.toByteArray(); } + @Transactional + boolean insertMenuItem(StringWriter stringWriter){ + try { + String sql = stringWriter.toString(); + int start = genTableDao.insertMenu(sql); + if (start > 0){ + return false; + }else { + return true; + } + } catch (RuntimeException e) { + log.error(e.getMessage()); + return true; + } + } /** - * 查询表信息并生成代码 + * todo 查询表信息并生成代码 */ - private void generatorCode(String tableName, ZipOutputStream zip) - { + private ZipOutputStream generatorCode(String tableName, ZipOutputStream zip) { // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); + GenTable table = genTableDao.selectGenTableByName(tableName); // 设置主子表信息 setSubTable(table); // 设置主键列信息 @@ -347,60 +347,52 @@ public class GenTableServiceImpl implements IGenTableService // 获取模板列表 List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { + for (String template : templates) { // 渲染模板 StringWriter sw = new StringWriter(); Template tpl = Velocity.getTemplate(template, Constants.UTF8); tpl.merge(context, sw); - try - { + + if (template.equals("vm/sql/sql.vm")) { + Boolean start = insertMenuItem(sw); + if (start){ + return null; + } + } + try { // 添加到zip zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); IOUtils.write(sw.toString(), zip, Constants.UTF8); IOUtils.closeQuietly(sw); - zip.flush(); + zip.flush(); zip.closeEntry(); - } - catch (IOException e) - { + } catch (IOException e) { log.error("渲染模板失败，表名：" + table.getTableName(), e); } } + return zip; } /** - * 修改保存参数校验 - * + * todo 修改保存参数校验 + * * @param genTable 业务信息 */ @Override - public void validateEdit(GenTable genTable) - { - if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) - { + public void validateEdit(GenTable genTable) { + if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) { String options = JSON.toJSONString(genTable.getParams()); JSONObject paramsObj = JSONObject.parseObject(options); - if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) - { + if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) { throw new CustomException("树编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) - { + } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) { throw new CustomException("树父编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) - { + } else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) { throw new CustomException("树名称字段不能为空"); - } - else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) - { - if (StringUtils.isEmpty(genTable.getSubTableName())) - { + } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) { + if (StringUtils.isEmpty(genTable.getSubTableName())) { throw new CustomException("关联子表的表名不能为空"); - } - else if (StringUtils.isEmpty(genTable.getSubTableFkName())) - { + } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) { throw new CustomException("子表关联的外键名不能为空"); } } @@ -409,35 +401,27 @@ public class GenTableServiceImpl implements IGenTableService /** * 设置主键列信息 - * + * * @param table 业务表信息 */ - public void setPkColumn(GenTable table) - { - for (GenTableColumn column : table.getColumns()) - { - if (column.isPk()) - { + public void setPkColumn(GenTable table) { + for (GenTableColumn column : table.getColumns()) { + if (column.isPk()) { table.setPkColumn(column); break; } } - if (StringUtils.isNull(table.getPkColumn())) - { + if (StringUtils.isNull(table.getPkColumn())) { table.setPkColumn(table.getColumns().get(0)); } - if (GenConstants.TPL_SUB.equals(table.getTplCategory())) - { - for (GenTableColumn column : table.getSubTable().getColumns()) - { - if (column.isPk()) - { + if (GenConstants.TPL_SUB.equals(table.getTplCategory())) { + for (GenTableColumn column : table.getSubTable().getColumns()) { + if (column.isPk()) { table.getSubTable().setPkColumn(column); break; } } - if (StringUtils.isNull(table.getSubTable().getPkColumn())) - { + if (StringUtils.isNull(table.getSubTable().getPkColumn())) { table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); } } @@ -445,34 +429,30 @@ public class GenTableServiceImpl implements IGenTableService /** * 设置主子表信息 - * + * * @param table 业务表信息 */ - public void setSubTable(GenTable table) - { + public void setSubTable(GenTable table) { String subTableName = table.getSubTableName(); - if (StringUtils.isNotEmpty(subTableName)) - { - table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); + if (StringUtils.isNotEmpty(subTableName)) { + table.setSubTable(genTableDao.selectGenTableByName(subTableName)); } } /** * 设置代码生成其他选项值 - * + * * @param genTable 设置后的生成对象 */ - public void setTableFromOptions(GenTable genTable) - { + public void setTableFromOptions(GenTable genTable) { JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions()); - if (StringUtils.isNotNull(paramsObj)) - { + if (StringUtils.isNotNull(paramsObj)) { String treeCode = paramsObj.getString(GenConstants.TREE_CODE); String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); String treeName = paramsObj.getString(GenConstants.TREE_NAME); String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID); String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME); - + genTable.setTreeCode(treeCode); genTable.setTreeParentCode(treeParentCode); genTable.setTreeName(treeName); @@ -483,16 +463,14 @@ public class GenTableServiceImpl implements IGenTableService /** * 获取代码生成地址 - * - * @param table 业务表信息 + * + * @param table 业务表信息 * @param template 模板文件路径 * @return 生成地址 */ - public static String getGenPath(GenTable table, String template) - { + public static String getGenPath(GenTable table, String template) { String genPath = table.getGenPath(); - if (StringUtils.equals(genPath, "/")) - { + if (StringUtils.equals(genPath, "/")) { return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); } return genPath + File.separator + VelocityUtils.getFileName(template, table); diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java index 6e44b6c..984a089 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/IGenTableService.java @@ -95,7 +95,7 @@ public interface IGenTableService * @param tableName 表名称 * @return 数据 */ - public void generatorCode(String tableName); + public boolean generatorCode(String tableName); /** * 同步数据库 diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java index fbeb2aa..8290403 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/VelocityUtils.java @@ -3,6 +3,8 @@ package com.hchyun.generator.util; import java.util.ArrayList; import java.util.HashSet; import java.util.List; + +import com.hchyun.common.utils.SecurityUtils; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson.JSONObject; import com.hchyun.common.constant.GenConstants; @@ -53,6 +55,8 @@ public class VelocityUtils velocityContext.put("packageName", packageName); velocityContext.put("author", genTable.getFunctionAuthor()); velocityContext.put("datetime", DateUtils.getDate()); +// velocityContext.put("createTime", DateUtils.getTime()); + velocityContext.put("createBy", SecurityUtils.getUserId()); velocityContext.put("pkColumn", genTable.getPkColumn()); velocityContext.put("importList", getImportList(genTable)); velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); @@ -126,8 +130,8 @@ public class VelocityUtils public static List getTemplateList(String tplCategory) { List templates = new ArrayList(); - templates.add("vm/java/domain.java.vm"); - templates.add("vm/java/mapper.java.vm"); + templates.add("vm/java/entity.java.vm"); + templates.add("vm/java/dao.java.vm"); templates.add("vm/java/service.java.vm"); templates.add("vm/java/serviceImpl.java.vm"); templates.add("vm/java/controller.java.vm"); @@ -145,7 +149,7 @@ public class VelocityUtils else if (GenConstants.TPL_SUB.equals(tplCategory)) { templates.add("vm/vue/index.vue.vm"); - templates.add("vm/java/sub-domain.java.vm"); + templates.add("vm/java/sub-entity.java.vm"); } return templates; } @@ -170,17 +174,17 @@ public class VelocityUtils String mybatisPath = MYBATIS_PATH + "/" + moduleName; String vuePath = "vue"; - if (template.contains("domain.java.vm")) + if (template.contains("entity.java.vm")) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); + fileName = StringUtils.format("{}/entity/{}.java", javaPath, className); } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) + if (template.contains("sub-entity.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); + fileName = StringUtils.format("{}/entity/{}.java", javaPath, genTable.getSubTable().getClassName()); } - else if (template.contains("mapper.java.vm")) + else if (template.contains("dao.java.vm")) { - fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); + fileName = StringUtils.format("{}/dao/{}dao.java", javaPath, className); } else if (template.contains("service.java.vm")) { diff --git a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index e7d2423..24ddfda 100644 --- a/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/hchyun/hchyun-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + @@ -14,11 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -30,9 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column + select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time,is_regular from gen_table_column - + @@ -93,38 +98,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - + - + - + + - + - + - + insert into gen_table ( table_name, @@ -166,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + update gen_table @@ -190,9 +198,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where table_id = #{tableId} - + - delete from gen_table where table_id in + delete from gen_table where table_id in #{tableId} diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/mapper.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm similarity index 96% rename from hchyun/hchyun-generator/src/main/resources/vm/java/mapper.java.vm rename to hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm index 1bb36d6..4205b5e 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/mapper.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/dao.java.vm @@ -1,9 +1,9 @@ package ${packageName}.mapper; import java.util.List; -import ${packageName}.domain.${ClassName}; +import ${packageName}.entity.${ClassName}; #if($table.sub) -import ${packageName}.domain.${subClassName}; +import ${packageName}.entity.${subClassName}; #end /** diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/domain.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm similarity index 95% rename from hchyun/hchyun-generator/src/main/resources/vm/java/domain.java.vm rename to hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm index bd51c17..a60fe15 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/domain.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/entity.java.vm @@ -1,4 +1,4 @@ -package ${packageName}.domain; +package ${packageName}.entity; #foreach ($import in $importList) import ${import}; @@ -7,9 +7,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.entity.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.ruoyi.common.core.entity.TreeEntity; #end /** diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/service.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/service.java.vm index 1217d53..c6af4e9 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/service.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/service.java.vm @@ -1,7 +1,7 @@ package ${packageName}.service; import java.util.List; -import ${packageName}.domain.${ClassName}; +import ${packageName}.entity.${ClassName}; /** * ${functionName}Service接口 diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm index 1351738..3196115 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -13,10 +13,10 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import com.ruoyi.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; -import ${packageName}.domain.${subClassName}; +import ${packageName}.entity.${subClassName}; #end import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; +import ${packageName}.entity.${ClassName}; import ${packageName}.service.I${ClassName}Service; /** diff --git a/hchyun/hchyun-generator/src/main/resources/vm/java/sub-domain.java.vm b/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm similarity index 96% rename from hchyun/hchyun-generator/src/main/resources/vm/java/sub-domain.java.vm rename to hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm index a3f53eb..580016d 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/java/sub-entity.java.vm @@ -1,4 +1,4 @@ -package ${packageName}.domain; +package ${packageName}.entity; #foreach ($import in $subImportList) import ${import}; @@ -6,7 +6,7 @@ import ${import}; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.core.entity.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/hchyun/hchyun-generator/src/main/resources/vm/sql/sql.vm b/hchyun/hchyun-generator/src/main/resources/vm/sql/sql.vm index 0575583..89f50ab 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/sql/sql.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/sql/sql.vm @@ -1,22 +1,22 @@ -- 菜单 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', ${createBy}, sysdate(), 0, null, '${functionName}菜单'); -- 按钮父菜单ID SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', ${createBy}, sysdate(), 0, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', ${createBy}, sysdate(), 0, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', ${createBy}, sysdate(), 0, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', ${createBy}, sysdate(), 0, null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', ${createBy}, sysdate(), 0, null, ''); \ No newline at end of file diff --git a/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm b/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm index 1cc0795..caa62eb 100644 --- a/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm +++ b/hchyun/hchyun-generator/src/main/resources/vm/xml/mapper.xml.vm @@ -2,7 +2,7 @@ - + #foreach ($column in $columns) diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobController.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobController.java index a24b5e0..f1181fe 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobController.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.exception.job.TaskException; diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobLogController.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobLogController.java index 78ce987..25432d4 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobLogController.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/controller/SysJobLogController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.hchyun.common.annotation.Log; import com.hchyun.common.core.controller.BaseController; -import com.hchyun.common.core.domain.AjaxResult; +import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.core.page.TableDataInfo; import com.hchyun.common.enums.BusinessType; import com.hchyun.common.utils.poi.ExcelUtil; diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java index 6416d51..f767097 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJob.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; import com.hchyun.common.constant.ScheduleConstants; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; import com.hchyun.common.utils.StringUtils; import com.hchyun.quartz.util.CronUtils; diff --git a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java index 5693a26..57d3dbe 100644 --- a/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java +++ b/hchyun/hchyun-quartz/src/main/java/com/hchyun/quartz/entity/SysJobLog.java @@ -4,7 +4,7 @@ import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 定时任务调度日志表 sys_job_log diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDeptDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDeptDao.java index 44df580..908785f 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDeptDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDeptDao.java @@ -2,7 +2,7 @@ package com.hchyun.system.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.hchyun.common.core.domain.entity.SysDept; +import com.hchyun.common.core.entity.entity.SysDept; /** * 部门管理 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictDataDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictDataDao.java index 97be985..b5687e5 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictDataDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictDataDao.java @@ -2,7 +2,7 @@ package com.hchyun.system.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.hchyun.common.core.domain.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictData; /** * 字典表 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictTypeDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictTypeDao.java index 6c5983d..dbcd2a8 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictTypeDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysDictTypeDao.java @@ -2,7 +2,7 @@ package com.hchyun.system.dao; import java.util.List; import org.apache.ibatis.annotations.Mapper; -import com.hchyun.common.core.domain.entity.SysDictType; +import com.hchyun.common.core.entity.entity.SysDictType; /** * 字典表 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysMenuDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysMenuDao.java index abb2fd6..9d57dc9 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysMenuDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysMenuDao.java @@ -2,7 +2,7 @@ package com.hchyun.system.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.hchyun.common.core.domain.entity.SysMenu; +import com.hchyun.common.core.entity.entity.SysMenu; /** * 菜单表 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysRoleDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysRoleDao.java index 38a063b..3ccfe73 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysRoleDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysRoleDao.java @@ -1,7 +1,7 @@ package com.hchyun.system.dao; import java.util.List; -import com.hchyun.common.core.domain.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysRole; /** * 角色表 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysUserDao.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysUserDao.java index b14626b..182d710 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysUserDao.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/dao/SysUserDao.java @@ -2,7 +2,7 @@ package com.hchyun.system.dao; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.entity.SysUser; /** * 用户表 数据层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java index 1752ad1..4b737d4 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/Regular.java @@ -1,7 +1,7 @@ package com.hchyun.system.entity; import com.hchyun.common.annotation.Excel; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java index 61231b8..d03e6c3 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysConfig.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 参数配置表 sys_config diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java index 2b2f12f..5436dff 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysLogininfor.java @@ -4,7 +4,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 系统访问记录表 sys_logininfor diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java index 4362895..8a8a864 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysNotice.java @@ -4,7 +4,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 通知公告表 sys_notice diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java index bbfb4bb..0e89127 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysOperLog.java @@ -4,7 +4,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 操作日志记录表 oper_log diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java index d089d19..9adfbb6 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/entity/SysPost.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.hchyun.common.annotation.Excel; import com.hchyun.common.annotation.Excel.ColumnType; -import com.hchyun.common.core.domain.BaseEntity; +import com.hchyun.common.core.entity.BaseEntity; /** * 岗位表 sys_post diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDeptService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDeptService.java index 10ce334..6497c17 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDeptService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ package com.hchyun.system.service; import java.util.List; -import com.hchyun.common.core.domain.TreeSelect; -import com.hchyun.common.core.domain.entity.SysDept; +import com.hchyun.common.core.entity.TreeSelect; +import com.hchyun.common.core.entity.entity.SysDept; /** * 部门管理 服务层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictDataService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictDataService.java index 2720c8b..cbb4331 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictDataService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package com.hchyun.system.service; import java.util.List; -import com.hchyun.common.core.domain.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictData; /** * 字典 业务层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictTypeService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictTypeService.java index 838ecdd..60872d4 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictTypeService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ package com.hchyun.system.service; import java.util.List; -import com.hchyun.common.core.domain.entity.SysDictData; -import com.hchyun.common.core.domain.entity.SysDictType; +import com.hchyun.common.core.entity.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictType; /** * 字典 业务层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysMenuService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysMenuService.java index b9fd96e..1878526 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysMenuService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysMenuService.java @@ -2,8 +2,8 @@ package com.hchyun.system.service; import java.util.List; import java.util.Set; -import com.hchyun.common.core.domain.TreeSelect; -import com.hchyun.common.core.domain.entity.SysMenu; +import com.hchyun.common.core.entity.TreeSelect; +import com.hchyun.common.core.entity.entity.SysMenu; import com.hchyun.system.entity.vo.RouterVo; /** diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysRoleService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysRoleService.java index 8b1d449..363a54b 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysRoleService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysRoleService.java @@ -2,7 +2,7 @@ package com.hchyun.system.service; import java.util.List; import java.util.Set; -import com.hchyun.common.core.domain.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysRole; /** * 角色业务层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserOnlineService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserOnlineService.java index 6467853..e4691d9 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserOnlineService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserOnlineService.java @@ -1,6 +1,6 @@ package com.hchyun.system.service; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.system.entity.SysUserOnline; /** diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserService.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserService.java index 9d82ffd..ce10ba4 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserService.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/ISysUserService.java @@ -1,7 +1,7 @@ package com.hchyun.system.service; import java.util.List; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.entity.SysUser; /** * 用户 业务层 diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDeptServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDeptServiceImpl.java index 21a59a3..bfbeb42 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDeptServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDeptServiceImpl.java @@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hchyun.common.annotation.DataScope; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.TreeSelect; -import com.hchyun.common.core.domain.entity.SysDept; -import com.hchyun.common.core.domain.entity.SysRole; +import com.hchyun.common.core.entity.TreeSelect; +import com.hchyun.common.core.entity.entity.SysDept; +import com.hchyun.common.core.entity.entity.SysRole; import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.StringUtils; import com.hchyun.system.dao.SysDeptDao; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictDataServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictDataServiceImpl.java index f0bc7e6..c06611a 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictDataServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictDataServiceImpl.java @@ -3,7 +3,7 @@ package com.hchyun.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.hchyun.common.core.domain.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictData; import com.hchyun.common.utils.DictUtils; import com.hchyun.system.dao.SysDictDataDao; import com.hchyun.system.service.ISysDictDataService; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictTypeServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictTypeServiceImpl.java index 87c01f1..1bfd86b 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictTypeServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysDictTypeServiceImpl.java @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.entity.SysDictData; -import com.hchyun.common.core.domain.entity.SysDictType; +import com.hchyun.common.core.entity.entity.SysDictData; +import com.hchyun.common.core.entity.entity.SysDictType; import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.DictUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysMenuServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysMenuServiceImpl.java index ca2dc61..8a12848 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysMenuServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysMenuServiceImpl.java @@ -11,10 +11,10 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.TreeSelect; -import com.hchyun.common.core.domain.entity.SysMenu; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.TreeSelect; +import com.hchyun.common.core.entity.entity.SysMenu; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysUser; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.StringUtils; import com.hchyun.system.entity.vo.MetaVo; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysRoleServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysRoleServiceImpl.java index c268651..ce3dca6 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysRoleServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysRoleServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.hchyun.common.annotation.DataScope; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysRole; import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.StringUtils; import com.hchyun.common.utils.spring.SpringUtils; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserOnlineServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserOnlineServiceImpl.java index 59457f0..3444ba9 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserOnlineServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,7 +1,7 @@ package com.hchyun.system.service.impl; import org.springframework.stereotype.Service; -import com.hchyun.common.core.domain.model.LoginUser; +import com.hchyun.common.core.entity.model.LoginUser; import com.hchyun.common.utils.StringUtils; import com.hchyun.system.entity.SysUserOnline; import com.hchyun.system.service.ISysUserOnlineService; diff --git a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserServiceImpl.java b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserServiceImpl.java index d4ce04a..45ea1f0 100644 --- a/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserServiceImpl.java +++ b/hchyun/hchyun-system/src/main/java/com/hchyun/system/service/impl/SysUserServiceImpl.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.hchyun.common.annotation.DataScope; import com.hchyun.common.constant.UserConstants; -import com.hchyun.common.core.domain.entity.SysRole; -import com.hchyun.common.core.domain.entity.SysUser; +import com.hchyun.common.core.entity.entity.SysRole; +import com.hchyun.common.core.entity.entity.SysUser; import com.hchyun.common.exception.CustomException; import com.hchyun.common.utils.SecurityUtils; import com.hchyun.common.utils.StringUtils; diff --git a/hchyun/hchyun-test/src/main/java/com/ruoyi/system/controller/SysStuController.java b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/controller/SysStuController.java new file mode 100644 index 0000000..a54442d --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/controller/SysStuController.java @@ -0,0 +1,103 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.SysStu; +import com.ruoyi.system.service.ISysStuService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 学生Controller + * + * @author ruoyi + * @date 2021-01-22 + */ +@RestController +@RequestMapping("/system/stu") +public class SysStuController extends BaseController +{ + @Autowired + private ISysStuService sysStuService; + + /** + * 查询学生列表 + */ + @PreAuthorize("@ss.hasPermi('system:stu:list')") + @GetMapping("/list") + public TableDataInfo list(SysStu sysStu) + { + startPage(); + List list = sysStuService.selectSysStuList(sysStu); + return getDataTable(list); + } + + /** + * 导出学生列表 + */ + @PreAuthorize("@ss.hasPermi('system:stu:export')") + @Log(title = "学生", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysStu sysStu) + { + List list = sysStuService.selectSysStuList(sysStu); + ExcelUtil util = new ExcelUtil(SysStu.class); + return util.exportExcel(list, "stu"); + } + + /** + * 获取学生详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:stu:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysStuService.selectSysStuById(id)); + } + + /** + * 新增学生 + */ + @PreAuthorize("@ss.hasPermi('system:stu:add')") + @Log(title = "学生", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysStu sysStu) + { + return toAjax(sysStuService.insertSysStu(sysStu)); + } + + /** + * 修改学生 + */ + @PreAuthorize("@ss.hasPermi('system:stu:edit')") + @Log(title = "学生", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysStu sysStu) + { + return toAjax(sysStuService.updateSysStu(sysStu)); + } + + /** + * 删除学生 + */ + @PreAuthorize("@ss.hasPermi('system:stu:remove')") + @Log(title = "学生", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysStuService.deleteSysStuByIds(ids)); + } +} diff --git a/hchyun/hchyun-test/src/main/java/com/ruoyi/system/dao/SysStudao.java b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/dao/SysStudao.java new file mode 100644 index 0000000..a598f95 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/dao/SysStudao.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.entity.SysStu; + +/** + * 学生Mapper接口 + * + * @author ruoyi + * @date 2021-01-22 + */ +public interface SysStuMapper +{ + /** + * 查询学生 + * + * @param id 学生ID + * @return 学生 + */ + public SysStu selectSysStuById(Long id); + + /** + * 查询学生列表 + * + * @param sysStu 学生 + * @return 学生集合 + */ + public List selectSysStuList(SysStu sysStu); + + /** + * 新增学生 + * + * @param sysStu 学生 + * @return 结果 + */ + public int insertSysStu(SysStu sysStu); + + /** + * 修改学生 + * + * @param sysStu 学生 + * @return 结果 + */ + public int updateSysStu(SysStu sysStu); + + /** + * 删除学生 + * + * @param id 学生ID + * @return 结果 + */ + public int deleteSysStuById(Long id); + + /** + * 批量删除学生 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysStuByIds(Long[] ids); +} diff --git a/hchyun/hchyun-test/src/main/java/com/ruoyi/system/entity/SysStu.java b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/entity/SysStu.java new file mode 100644 index 0000000..d91827b --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/entity/SysStu.java @@ -0,0 +1,80 @@ +package com.ruoyi.system.entity; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.entity.BaseEntity; + +/** + * 学生对象 sys_stu + * + * @author ruoyi + * @date 2021-01-22 + */ +public class SysStu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 学生姓名 */ + @Excel(name = "学生姓名") + private String name; + + /** 电话 */ + @Excel(name = "电话") + private Long tel; + + /** 电子邮件 */ + @Excel(name = "电子邮件") + private String email; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setName(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + public void setTel(Long tel) + { + this.tel = tel; + } + + public Long getTel() + { + return tel; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("name", getName()) + .append("tel", getTel()) + .append("email", getEmail()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/ISysStuService.java b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/ISysStuService.java new file mode 100644 index 0000000..e24d094 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/ISysStuService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.entity.SysStu; + +/** + * 学生Service接口 + * + * @author ruoyi + * @date 2021-01-22 + */ +public interface ISysStuService +{ + /** + * 查询学生 + * + * @param id 学生ID + * @return 学生 + */ + public SysStu selectSysStuById(Long id); + + /** + * 查询学生列表 + * + * @param sysStu 学生 + * @return 学生集合 + */ + public List selectSysStuList(SysStu sysStu); + + /** + * 新增学生 + * + * @param sysStu 学生 + * @return 结果 + */ + public int insertSysStu(SysStu sysStu); + + /** + * 修改学生 + * + * @param sysStu 学生 + * @return 结果 + */ + public int updateSysStu(SysStu sysStu); + + /** + * 批量删除学生 + * + * @param ids 需要删除的学生ID + * @return 结果 + */ + public int deleteSysStuByIds(Long[] ids); + + /** + * 删除学生信息 + * + * @param id 学生ID + * @return 结果 + */ + public int deleteSysStuById(Long id); +} diff --git a/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/impl/SysStuServiceImpl.java b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/impl/SysStuServiceImpl.java new file mode 100644 index 0000000..7b8f700 --- /dev/null +++ b/hchyun/hchyun-test/src/main/java/com/ruoyi/system/service/impl/SysStuServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysStuMapper; +import com.ruoyi.system.entity.SysStu; +import com.ruoyi.system.service.ISysStuService; + +/** + * 学生Service业务层处理 + * + * @author ruoyi + * @date 2021-01-22 + */ +@Service +public class SysStuServiceImpl implements ISysStuService +{ + @Autowired + private SysStuMapper sysStuMapper; + + /** + * 查询学生 + * + * @param id 学生ID + * @return 学生 + */ + @Override + public SysStu selectSysStuById(Long id) + { + return sysStuMapper.selectSysStuById(id); + } + + /** + * 查询学生列表 + * + * @param sysStu 学生 + * @return 学生 + */ + @Override + public List selectSysStuList(SysStu sysStu) + { + return sysStuMapper.selectSysStuList(sysStu); + } + + /** + * 新增学生 + * + * @param sysStu 学生 + * @return 结果 + */ + @Override + public int insertSysStu(SysStu sysStu) + { + sysStu.setCreateTime(DateUtils.getNowDate()); + return sysStuMapper.insertSysStu(sysStu); + } + + /** + * 修改学生 + * + * @param sysStu 学生 + * @return 结果 + */ + @Override + public int updateSysStu(SysStu sysStu) + { + return sysStuMapper.updateSysStu(sysStu); + } + + /** + * 批量删除学生 + * + * @param ids 需要删除的学生ID + * @return 结果 + */ + @Override + public int deleteSysStuByIds(Long[] ids) + { + return sysStuMapper.deleteSysStuByIds(ids); + } + + /** + * 删除学生信息 + * + * @param id 学生ID + * @return 结果 + */ + @Override + public int deleteSysStuById(Long id) + { + return sysStuMapper.deleteSysStuById(id); + } +} diff --git a/hchyun/hchyun-test/src/main/resources/mapper/system/SysStuMapper.xml b/hchyun/hchyun-test/src/main/resources/mapper/system/SysStuMapper.xml new file mode 100644 index 0000000..d43f145 --- /dev/null +++ b/hchyun/hchyun-test/src/main/resources/mapper/system/SysStuMapper.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + select id, name, tel, email, create_time from sys_stu + + + + + + + + insert into sys_stu + + name, + tel, + email, + create_time, + + + #{name}, + #{tel}, + #{email}, + #{createTime}, + + + + + update sys_stu + + name = #{name}, + tel = #{tel}, + email = #{email}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from sys_stu where id = #{id} + + + + delete from sys_stu where id in + + #{id} + + + \ No newline at end of file