diff --git a/service/simple-base/src/main/java/org/simple/config/handler/GlobalExceptionHandler.java b/service/simple-base/src/main/java/org/simple/config/handler/GlobalExceptionHandler.java index 283b6f949d22592312d314143d26e469d1f94c44..1fd1d8ca6fb452830213e3ebe282038eeb9de928 100644 --- a/service/simple-base/src/main/java/org/simple/config/handler/GlobalExceptionHandler.java +++ b/service/simple-base/src/main/java/org/simple/config/handler/GlobalExceptionHandler.java @@ -56,7 +56,7 @@ public class GlobalExceptionHandler { * @return 统一结果 */ @ExceptionHandler(value = FileException.class) - public CommonResultfileExceptionHandler(FileException ex) { + public CommonResult fileExceptionHandler(FileException ex) { if (ex != null) { return CommonResult.failed(ex.getErrorMessage()); } diff --git a/service/simple-base/src/main/java/org/simple/config/handler/GlobalResultHandler.java b/service/simple-base/src/main/java/org/simple/config/handler/GlobalResultHandler.java index 89d680f076213d5dfbd8a44ffc609df8555aa4c1..232c805c4c45f90497c0e3682ac598f8aeb82be7 100644 --- a/service/simple-base/src/main/java/org/simple/config/handler/GlobalResultHandler.java +++ b/service/simple-base/src/main/java/org/simple/config/handler/GlobalResultHandler.java @@ -49,7 +49,7 @@ public class GlobalResultHandler implements ResponseBodyAdvice { if (body instanceof CommonResult) { return body; } - Object wrap = CommonResult.success(body,"操作成功"); + Object wrap = CommonResult.success(body, "操作成功"); /* 防止返回类型为string时需要特殊判断 */ if (body instanceof String) { try { diff --git a/service/simple-base/src/main/java/org/simple/config/mybatisplus/MyBatisPlusConfig.java b/service/simple-base/src/main/java/org/simple/config/mybatisplus/MyBatisPlusConfig.java index 423c9071013d388027b2c846f2557b7bd651fbd0..9759b65f1fd8d0593390c300f5e4c4d8c95b3410 100644 --- a/service/simple-base/src/main/java/org/simple/config/mybatisplus/MyBatisPlusConfig.java +++ b/service/simple-base/src/main/java/org/simple/config/mybatisplus/MyBatisPlusConfig.java @@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration; * @since 2022/7/7 */ @Configuration -@MapperScan(basePackages = {"com.admin.*.mapper"}) +@MapperScan("org.simple.*.mapper") public class MyBatisPlusConfig { /** diff --git a/service/simple-base/src/main/java/org/simple/storage/AliOss.java b/service/simple-base/src/main/java/org/simple/storage/AliOss.java index 9fe3e226e84293a14ad3633fcb413be4e6d37baf..2340d18272935d2d09c97c6acbdeec93bee1600b 100644 --- a/service/simple-base/src/main/java/org/simple/storage/AliOss.java +++ b/service/simple-base/src/main/java/org/simple/storage/AliOss.java @@ -56,7 +56,7 @@ public class AliOss { ossDto.getAccessKeyId(), ossDto.getAccessKeySecret()); } - public CommonResultfileUpload(File file, boolean isPrivate, String userid) { + public CommonResult fileUpload(File file, boolean isPrivate, String userid) { //初始化ossclient对象 OSS ossClient = getOssClient(); String fileName = file.getName(); diff --git a/service/simple-base/src/main/java/org/simple/storage/MinioOss.java b/service/simple-base/src/main/java/org/simple/storage/MinioOss.java index f3051e7d4d4f7d0edc3cb3c2200c14e5da871f39..470af336bc7be18d488a7b099b28b90c97d45c63 100644 --- a/service/simple-base/src/main/java/org/simple/storage/MinioOss.java +++ b/service/simple-base/src/main/java/org/simple/storage/MinioOss.java @@ -64,7 +64,7 @@ public class MinioOss { } - public CommonResultfileUpload(File file, boolean isPrivate, String userid) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + public CommonResult fileUpload(File file, boolean isPrivate, String userid) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { MinioClient minioClient = getMinioClient(); String fileName = file.getName(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/service/simple-base/src/main/java/org/simple/storage/TencentOss.java b/service/simple-base/src/main/java/org/simple/storage/TencentOss.java index 1ce08763b5e5a7a3d23c92579742a225d8826222..862f4eccc7f3b7654d5c6120c18c8467cc3c7385 100644 --- a/service/simple-base/src/main/java/org/simple/storage/TencentOss.java +++ b/service/simple-base/src/main/java/org/simple/storage/TencentOss.java @@ -66,7 +66,7 @@ public class TencentOss { return new COSClient(cred, clientConfig); } - public CommonResultfileUpload(File file, boolean isPrivate, String userid) { + public CommonResult fileUpload(File file, boolean isPrivate, String userid) { //初始化ossclient对象 COSClient cosClient = getCosClient(); String fileName = file.getName(); diff --git a/service/simple-base/src/main/java/org/simple/utils/CommonResult.java b/service/simple-base/src/main/java/org/simple/utils/CommonResult.java index 3bc8c6f73bbf4274d1389de7faa45a13d3be0b18..2db9c56e10c0cec84fd2f82c9dd74a1d43dfa7dd 100644 --- a/service/simple-base/src/main/java/org/simple/utils/CommonResult.java +++ b/service/simple-base/src/main/java/org/simple/utils/CommonResult.java @@ -38,8 +38,9 @@ public class CommonResult { public static CommonResult success() { - return new CommonResult(ResultCodeEnum.SUCCESS.getCode(), ResultCodeEnum.SUCCESS.getMsg(),null); + return new CommonResult(ResultCodeEnum.SUCCESS.getCode(), ResultCodeEnum.SUCCESS.getMsg(), null); } + /** * 成功返回结果 * diff --git a/service/simple-base/src/main/java/org/simple/utils/RandomUtil.java b/service/simple-base/src/main/java/org/simple/utils/RandomUtil.java index 08dfadc4a6c0f0d78b2b22d2ec8b38b168143c46..cebe9e27f3153b65afd8fe662aaca53f93e820e0 100644 --- a/service/simple-base/src/main/java/org/simple/utils/RandomUtil.java +++ b/service/simple-base/src/main/java/org/simple/utils/RandomUtil.java @@ -65,7 +65,6 @@ public class RandomUtil { } - /** * 获取商户编号/机构id */ diff --git a/service/simple-center/src/main/java/org/simple/online/dto/datatype/DataTypeDetailVO.java b/service/simple-center/src/main/java/org/simple/online/dto/datatype/DataTypeDetailVO.java index ebd394d56d63489332e896d21c4d710241850894..e4054e9731729069a4ea3af9e3d9aa420e8f79f5 100644 --- a/service/simple-center/src/main/java/org/simple/online/dto/datatype/DataTypeDetailVO.java +++ b/service/simple-center/src/main/java/org/simple/online/dto/datatype/DataTypeDetailVO.java @@ -1,9 +1,9 @@ package org.simple.online.dto.datatype; -import org.simple.dto.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.simple.dto.BaseEntity; /** * 系统数据类型明细表 diff --git a/service/simple-center/src/main/java/org/simple/online/dto/fieldarea/FieldAreaDetailFormVO.java b/service/simple-center/src/main/java/org/simple/online/dto/fieldarea/FieldAreaDetailFormVO.java index 23b918ba6a16849944fc2f7d38b24afbcc424949..90ce386013cb4179d3d6d920c344bdff331cec7d 100644 --- a/service/simple-center/src/main/java/org/simple/online/dto/fieldarea/FieldAreaDetailFormVO.java +++ b/service/simple-center/src/main/java/org/simple/online/dto/fieldarea/FieldAreaDetailFormVO.java @@ -1,9 +1,9 @@ package org.simple.online.dto.fieldarea; -import org.simple.dto.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.simple.dto.BaseEntity; /** * 系统数据类型明细表 diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeDetailMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeDetailMapper.java index 1d8575dfcd8825d25a7814b6319cd6baf275af17..29b0656310c77142400d5410b6b013bf3f8a0918 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeDetailMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeDetailMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.DataTypeDetailEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.DataTypeDetailEntity; * @version v1.0 * @since 2022/8/6 */ -@Mapper + public interface DataTypeDetailMapper extends BaseMapper { } \ No newline at end of file diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeMapper.java index 9573b38996b1948bfd6ebdd76c8ef9f916213c03..5a64e1e132b64523b9b97af9d9f5ab3002ef6c5e 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/DataTypeMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.DataTypeEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.DataTypeEntity; * @version v1.0 * @since 2022/8/6 */ -@Mapper + public interface DataTypeMapper extends BaseMapper { } \ No newline at end of file diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaDetailMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaDetailMapper.java index c65e914bc956319c4dc43b1dd8f615b6fa803846..ffd5a9802648cc8cfce172c81f74d365b1559735 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaDetailMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaDetailMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.FieldAreaDetailEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.FieldAreaDetailEntity; * @version v1.0 * @since 2022/8/7 */ -@Mapper + public interface FieldAreaDetailMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaMapper.java index 913eb6eabda274e242ab783ef73c4fad029a92c7..3af8815bed538702760ba07daced15ab850afd7f 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/FieldAreaMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.FieldAreaEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.FieldAreaEntity; * @version v1.0 * @since 2022/8/7 */ -@Mapper + public interface FieldAreaMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/TableColumnMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/TableColumnMapper.java index 1f3a2177c8ddb3dd8cfa9f8b6bbca234b11d4902..468a4861d9127571a756f582c990a131f731dc76 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/TableColumnMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/TableColumnMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.TableColumnEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.TableColumnEntity; * @version v1.0 * @since 2022/8/16 */ -@Mapper + public interface TableColumnMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/online/mapper/TableMapper.java b/service/simple-center/src/main/java/org/simple/online/mapper/TableMapper.java index 0c1dfaeec48c845ad726639e0f51e84fd4d2de7b..6fc4badbf1e4671b258a65ef74f9bb7641891750 100644 --- a/service/simple-center/src/main/java/org/simple/online/mapper/TableMapper.java +++ b/service/simple-center/src/main/java/org/simple/online/mapper/TableMapper.java @@ -1,7 +1,6 @@ package org.simple.online.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.online.entity.TableEntity; /** @@ -9,6 +8,6 @@ import org.simple.online.entity.TableEntity; * @version v1.0 * @since 2022/8/16 */ -@Mapper + public interface TableMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/system/controller/CodeController.java b/service/simple-center/src/main/java/org/simple/system/controller/CodeController.java index c32ede620a1a6939d9409d334e06b46fa3cfd5fb..d94ab74239ae9473514f8918975da8f2f619d8dc 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/CodeController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/CodeController.java @@ -64,7 +64,7 @@ public class CodeController { */ @PostMapping("updateTableCfg") @Operation(summary = "修改表配置信息") - public CommonResultupdateTableCfg(@RequestBody TableCfgEntity tableCfgEntity) { + public CommonResult updateTableCfg(@RequestBody TableCfgEntity tableCfgEntity) { if (StringUtils.isEmpty(tableCfgEntity.getId())) { tableCfgEntity.setId(String.valueOf(YitIdHelper.nextId())); tableCfgService.save(tableCfgEntity); @@ -86,7 +86,7 @@ public class CodeController { @PostMapping("addDataSource") @Operation(summary = "新建数据源") - public CommonResultaddDataSource(@RequestBody DataSourceEntity dataSourceEntity) { + public CommonResult addDataSource(@RequestBody DataSourceEntity dataSourceEntity) { if (!tableCfgService.checkCon(dataSourceEntity.getUrl(), dataSourceEntity.getUser(), dataSourceEntity.getPwd())) { return CommonResult.failed(ResultCodeEnum.DB5002.getMsg()); } @@ -98,14 +98,14 @@ public class CodeController { @PostMapping("delDataSource") @Operation(summary = "删除数据源") - public CommonResultdelDataSource(@RequestParam("id") String id) { + public CommonResult delDataSource(@RequestParam("id") String id) { IDataSourceService.removeById(id); return CommonResult.success(); } @PostMapping("checkDataSource") @Operation(summary = "检查数据源") - public CommonResultcheckDataSource(@RequestBody DataSourceEntity dataSourceEntity) { + public CommonResult checkDataSource(@RequestBody DataSourceEntity dataSourceEntity) { if (!tableCfgService.checkCon(dataSourceEntity.getUrl(), dataSourceEntity.getUser(), dataSourceEntity.getPwd())) { return CommonResult.failed(ResultCodeEnum.DB5002.getMsg()); } else { diff --git a/service/simple-center/src/main/java/org/simple/system/controller/DictController.java b/service/simple-center/src/main/java/org/simple/system/controller/DictController.java index 858194ef3b49d4ddc3a39901885b3bc35bd55ff5..a1eafaf759990085552fc63041306ba920877161 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/DictController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/DictController.java @@ -94,7 +94,7 @@ public class DictController { @PostMapping("addDict") @Operation(summary = "新增字典") @SaCheckPermission(value = {"system:dict:add"}, mode = SaMode.OR) - public CommonResultaddDict(@RequestBody DictionaryEntity dictionaryEntity) { + public CommonResult addDict(@RequestBody DictionaryEntity dictionaryEntity) { dictionaryEntity.setId(String.valueOf(YitIdHelper.nextId())); dictionaryService.save(dictionaryEntity); this.refDictCache(); @@ -104,7 +104,7 @@ public class DictController { @PostMapping("editDict") @Operation(summary = "修改字典") @SaCheckPermission(value = {"system:dict:edit"}, mode = SaMode.OR) - public CommonResulteditDict(@RequestBody DictionaryEntity dictionaryEntity) { + public CommonResult editDict(@RequestBody DictionaryEntity dictionaryEntity) { //清洗对象 DictionaryEntity d = dictionaryService.getById(dictionaryEntity.getId()); if (CommonConst.ALARM_SIGNAL.equals(d.getValue())) { @@ -132,7 +132,7 @@ public class DictController { @PostMapping("delDict") @Operation(summary = "删除字典") @SaCheckPermission(value = {"system:dict:del"}, mode = SaMode.OR) - public CommonResultdelDict(@RequestBody IdsModel model) { + public CommonResult delDict(@RequestBody IdsModel model) { DictionaryEntity d = dictionaryService.getById(model.getId()); if (CommonConst.ALARM_SIGNAL.equals(d.getValue())) { DictionaryEntity dic = new DictionaryEntity(); @@ -148,7 +148,7 @@ public class DictController { @GetMapping("refDictCache") @Operation(summary = "刷新字段缓存") @SaCheckPermission(value = {"system:dict:query"}, mode = SaMode.OR) - public CommonResultrefDictCache() { + public CommonResult refDictCache() { DictionaryEntity dictionaryEntity = new DictionaryEntity(); dictionaryEntity.setValue("#"); List dictionaryEntityList = dictionaryService.list(Wrappers.query(dictionaryEntity)); diff --git a/service/simple-center/src/main/java/org/simple/system/controller/EmailController.java b/service/simple-center/src/main/java/org/simple/system/controller/EmailController.java index 7f8a6bfc1cfba10c504b9435de27043881cfddfd..966c55a7b18e491bfa111a30701f8ee868b8b1cd 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/EmailController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/EmailController.java @@ -48,7 +48,7 @@ public class EmailController { @PostMapping("saveOrUpdate") @Operation(summary = "保存邮箱配置") - public CommonResultsaveOrUpdate(@RequestBody EmailEntity emailEntity) { + public CommonResult saveOrUpdate(@RequestBody EmailEntity emailEntity) { if (StrUtil.isEmpty(emailEntity.getId())) { emailEntity.setId(String.valueOf(YitIdHelper.nextId())); } @@ -68,9 +68,9 @@ public class EmailController { @PostMapping("sendEmail") @Operation(summary = "发送邮件") - public CommonResultsendEmail(EmailQuery emailQuery, - @RequestParam(value = "files", required = false) - MultipartFile[] files) throws IOException { + public CommonResult sendEmail(EmailQuery emailQuery, + @RequestParam(value = "files", required = false) + MultipartFile[] files) throws IOException { File[] fileList = new File[files.length]; if (files.length != 0) { for (int i = 0; i < files.length; i++) { diff --git a/service/simple-center/src/main/java/org/simple/system/controller/MenuController.java b/service/simple-center/src/main/java/org/simple/system/controller/MenuController.java index 2d218d4dc78505d467b02ed8cd7042f28aca6fcd..e798c1f7775677dc020e17030805b851bd881d9f 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/MenuController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/MenuController.java @@ -67,7 +67,7 @@ public class MenuController { @PostMapping("addMenu") @Operation(summary = "新增菜单信息") @SaCheckPermission(value = {"center:menu:add"}, mode = SaMode.OR) - public CommonResultaddMenu(@RequestBody MenuEntity menuEntity) { + public CommonResult addMenu(@RequestBody MenuEntity menuEntity) { //重新组装菜单信息表 menuEntity.setId(String.valueOf(YitIdHelper.nextId())); menuEntity.setType("c"); @@ -79,7 +79,7 @@ public class MenuController { @PostMapping("editMenu") @Operation(summary = "修改菜单信息") @SaCheckPermission(value = {"center:menu:edit"}, mode = SaMode.OR) - public CommonResulteditMenu(@RequestBody MenuEntity menuEntity) { + public CommonResult editMenu(@RequestBody MenuEntity menuEntity) { //重新组装菜单信息表 menuService.updateById(menuEntity); return CommonResult.success(); @@ -88,7 +88,7 @@ public class MenuController { @PostMapping("delMenu") @Operation(summary = "删除菜单信息") @SaCheckPermission(value = {"center:menu:del"}, mode = SaMode.OR) - public CommonResultdelMenu(@RequestBody IdsModel IdsModel) { + public CommonResult delMenu(@RequestBody IdsModel IdsModel) { menuService.delMenu(IdsModel.getId()); return CommonResult.success(); } @@ -96,7 +96,7 @@ public class MenuController { @PostMapping("addBtnMenu") @Operation(summary = "新增菜单权限信息") @SaCheckPermission(value = {"system:menu:add"}, mode = SaMode.OR) - public CommonResultaddBtnMenu(@RequestBody MenuEntity menuEntity) { + public CommonResult addBtnMenu(@RequestBody MenuEntity menuEntity) { menuEntity.setId(String.valueOf(YitIdHelper.nextId())); menuEntity.setStatus("0"); menuEntity.setType("b"); @@ -108,7 +108,7 @@ public class MenuController { @PostMapping("editBtnMenu") @Operation(summary = "修改菜单权限信息") @SaCheckPermission(value = {"center:menu:edit"}, mode = SaMode.OR) - public CommonResulteditBtnMenu(@RequestBody MenuEntity menuEntity) { + public CommonResult editBtnMenu(@RequestBody MenuEntity menuEntity) { menuService.updateById(menuEntity); return CommonResult.success(); } @@ -116,7 +116,7 @@ public class MenuController { @PostMapping("delBtnMenu") @Operation(summary = "删除菜单权限信息") @SaCheckPermission(value = {"center:menu:del"}, mode = SaMode.OR) - public CommonResultdelBtnMenu(@RequestBody IdsModel idsModel) { + public CommonResult delBtnMenu(@RequestBody IdsModel idsModel) { menuService.delBtnMenu(idsModel.getId()); return CommonResult.success(); } diff --git a/service/simple-center/src/main/java/org/simple/system/controller/OrganController.java b/service/simple-center/src/main/java/org/simple/system/controller/OrganController.java index 3b1a018b9fa192d477a1c2b471bc6362c33dd51b..e3f88e492783803165108e12e0ea22389e916ed5 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/OrganController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/OrganController.java @@ -42,7 +42,7 @@ public class OrganController { @PostMapping("/editOrgan") @Operation(summary = "修改组织机构信息") @SaCheckPermission(value = {"system:organ:edit"}, mode = SaMode.OR) - public CommonResulteditOrgan(@RequestBody OrganEntity organEntity) { + public CommonResult editOrgan(@RequestBody OrganEntity organEntity) { organService.updateById(organEntity); return CommonResult.success(); } @@ -50,7 +50,7 @@ public class OrganController { @PostMapping("addOrgan") @Operation(summary = "新增组织机构信息") @SaCheckPermission(value = {"system:organ:add"}, mode = SaMode.OR) - public CommonResultaddOrgan(@RequestBody OrganEntity organEntity) { + public CommonResult addOrgan(@RequestBody OrganEntity organEntity) { organEntity.setId(String.valueOf(YitIdHelper.nextId())); organService.save(organEntity); return CommonResult.success(); @@ -60,7 +60,7 @@ public class OrganController { @PostMapping("delOrgan/{id}") @Operation(summary = "新增组织机构信息") @SaCheckPermission(value = {"system:organ:del"}, mode = SaMode.OR) - public CommonResultdelOrgan(@PathVariable("id") Long id) throws CustomException { + public CommonResult delOrgan(@PathVariable("id") Long id) throws CustomException { OrganEntity organEntity = new OrganEntity(); organEntity.setParentId(id); if (!organService.list(Wrappers.query(organEntity)).isEmpty()) { @@ -73,7 +73,7 @@ public class OrganController { @GetMapping("getOrgan/{id}") @Operation(summary = "查询组织机构信息") @SaCheckPermission(value = {"system:organ:query"}, mode = SaMode.OR) - public CommonResultgetOrgan(@PathVariable("id") String id) { + public CommonResult getOrgan(@PathVariable("id") String id) { return CommonResult.success(organService.getById(id)); } } \ No newline at end of file diff --git a/service/simple-center/src/main/java/org/simple/system/controller/RoleController.java b/service/simple-center/src/main/java/org/simple/system/controller/RoleController.java index 5329b096aa9f26a8b264d77796eead20a338bc5e..44d107cdb80f33ce61d8523b1a18ce5a8e48bd96 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/RoleController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/RoleController.java @@ -8,10 +8,10 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.simple.dto.IdsModel; import org.simple.dto.PageResult; +import org.simple.exception.CustomException; import org.simple.system.dto.role.RoleQuery; import org.simple.system.entity.RoleEntity; import org.simple.system.entity.RoleMenuEntity; -import org.simple.exception.CustomException; import org.simple.system.service.IRoleService; import org.springframework.web.bind.annotation.*; diff --git a/service/simple-center/src/main/java/org/simple/system/controller/SmsController.java b/service/simple-center/src/main/java/org/simple/system/controller/SmsController.java index 88eebba7d85369e0c5c4a5eb01e63751c8de0b9b..6dead64bb80a74a7bbb9601362d8b3384c6547ef 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/SmsController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/SmsController.java @@ -37,7 +37,7 @@ public class SmsController { @PostMapping("saveOrUpdate") @Operation(summary = "保存sms配置") - public CommonResultsaveOrUpdate(@RequestBody SmsEntity smsEntity) { + public CommonResult saveOrUpdate(@RequestBody SmsEntity smsEntity) { //防止重复提交 if (StrUtil.isEmpty(smsEntity.getType())) { return CommonResult.failed("数据类型不能为空"); @@ -72,7 +72,7 @@ public class SmsController { @GetMapping("{type}") @Operation(summary = "获取sms信息") - public CommonResultgetOne(@PathVariable("type") String type) { + public CommonResult getOne(@PathVariable("type") String type) { SmsEntity smsEntity = new SmsEntity(); smsEntity.setType(type); return CommonResult.success(smsService.getOne(Wrappers.query(smsEntity))); diff --git a/service/simple-center/src/main/java/org/simple/system/controller/TenantController.java b/service/simple-center/src/main/java/org/simple/system/controller/TenantController.java index 645030bc9dc53ebea8c0ccba86679cafe2849937..15cb6dfa288807d26c1522a0fc5d6398ba88e8a7 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/TenantController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/TenantController.java @@ -9,9 +9,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.simple.dto.PageModel; import org.simple.dto.PageResult; -import org.simple.system.entity.TenantEntity; import org.simple.enums.system.ResultCodeEnum; import org.simple.exception.CustomException; +import org.simple.system.entity.TenantEntity; import org.simple.system.service.ITenantService; import org.springframework.web.bind.annotation.*; diff --git a/service/simple-center/src/main/java/org/simple/system/controller/UserController.java b/service/simple-center/src/main/java/org/simple/system/controller/UserController.java index ea2e0af021bcac455f9d140cf75ac40d132872d5..1ceb326d5ce48e706aa7c885c3815f0fa501a608 100644 --- a/service/simple-center/src/main/java/org/simple/system/controller/UserController.java +++ b/service/simple-center/src/main/java/org/simple/system/controller/UserController.java @@ -24,9 +24,9 @@ import org.simple.system.dto.user.UserEntityDto; import org.simple.system.dto.user.UserQuery; import org.simple.system.entity.UserEntity; import org.simple.system.service.IUserService; +import org.simple.utils.AuthUtils; import org.simple.utils.ComUtil; import org.simple.utils.CommonResult; -import org.simple.utils.AuthUtils; import org.simple.utils.RedisUtil; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -96,7 +96,7 @@ public class UserController { @PostMapping("addUser") @Operation(summary = "新增用户信息") @SaCheckPermission(value = {"system:user:add"}, mode = SaMode.OR) - public CommonResultaddUser(@RequestBody UserEntityDto userDto) { + public CommonResult addUser(@RequestBody UserEntityDto userDto) { String userid = String.valueOf(YitIdHelper.nextId()); UserEntity userEntity = new UserEntity(); userEntity.setId(userid); @@ -129,7 +129,7 @@ public class UserController { @PostMapping("delUser/{id}") @Operation(summary = "删除用户信息") @SaCheckPermission(value = {"system:user:del"}, mode = SaMode.OR) - public CommonResultdelUser(@PathVariable("id") String id) { + public CommonResult delUser(@PathVariable("id") String id) { if (CommonConst.SUPER_ADMIN.equals(id)) { return CommonResult.failed("不允许删除超级管理员"); } @@ -138,7 +138,7 @@ public class UserController { @GetMapping("lock/{id}") @Operation(summary = "锁定用户") - public CommonResultlock(@PathVariable("id") String id) { + public CommonResult lock(@PathVariable("id") String id) { UserEntity userEntity = new UserEntity(); userEntity.setId(id); userEntity.setStatus("1"); @@ -148,7 +148,7 @@ public class UserController { @GetMapping("unlock/{id}") @Operation(summary = "解锁用户") - public CommonResultunlock(@PathVariable("id") String id) { + public CommonResult unlock(@PathVariable("id") String id) { UserEntity userEntity = new UserEntity(); userEntity.setId(id); userEntity.setStatus("0"); @@ -158,7 +158,7 @@ public class UserController { @GetMapping("resetPwd/{id}") @Operation(summary = "重置密码") - public CommonResultresetPwd(@PathVariable("id") String id) { + public CommonResult resetPwd(@PathVariable("id") String id) { UserEntity userEntity = userService.getById(id); String md5Pwd = DigestUtil.md5Hex(userEntity.getUsername().toLowerCase() + "888888"); userEntity.setPassword(md5Pwd); @@ -168,7 +168,7 @@ public class UserController { @PostMapping("updatePwd") @Operation(summary = "修改密码") - public CommonResultupdatePwd(@RequestBody UserEntityDto userDto) { + public CommonResult updatePwd(@RequestBody UserEntityDto userDto) { UserEntity userEntity = new UserEntity(); if (StrUtil.isEmpty(userDto.getId())) { userDto.setId(AuthUtils.getUserId()); @@ -182,7 +182,7 @@ public class UserController { @PostMapping("checkPwd") @Operation(summary = "检验密码是否正确") - public CommonResultcheckPwd(@RequestBody UserEntityDto userDto) { + public CommonResult checkPwd(@RequestBody UserEntityDto userDto) { if (StrUtil.isEmpty(userDto.getId())) { userDto.setId(AuthUtils.getUserId()); } @@ -196,7 +196,7 @@ public class UserController { @PostMapping("updateAvatar") @Operation(summary = "更新用户头像") - public CommonResultupdateAvatar(@RequestParam("file") MultipartFile file) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + public CommonResult updateAvatar(@RequestParam("file") MultipartFile file) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { File file1 = ComUtil.multipartToFile(file); //上传图片 CommonResult result = OssUtil.getMinioOss(redisUtil). @@ -215,7 +215,7 @@ public class UserController { @GetMapping("queryUser") @Operation(summary = "查询当前用户") - public CommonResultqueryUser() { + public CommonResult queryUser() { UserEntity userEntity = userService.getById(AuthUtils.getUserId()); UserEntity r = new UserEntity(); r.setId(userEntity.getId()); @@ -227,7 +227,7 @@ public class UserController { @PostMapping("updateUser") @Operation(summary = "更新用户信息") - public CommonResultupdateUser(@RequestBody UserEntity userEntity) { + public CommonResult updateUser(@RequestBody UserEntity userEntity) { if (!userEntity.getId().equals(AuthUtils.getUserId())) { return CommonResult.failed("非法操作"); } @@ -236,7 +236,7 @@ public class UserController { @GetMapping("sendMsg") @Operation(summary = "发送消息") - public CommonResultsendMsg(@RequestParam("phone") String phone) { + public CommonResult sendMsg(@RequestParam("phone") String phone) { //判断是否和当前手机号一直 UserEntity phoneUserEntity = new UserEntity(); phoneUserEntity.setPhone(phone); @@ -265,8 +265,8 @@ public class UserController { @GetMapping("updatePhone") @Operation(summary = "更新手机号") - public CommonResultupdatePhone(@RequestParam("password") String password, - @RequestParam("code") String code) { + public CommonResult updatePhone(@RequestParam("password") String password, + @RequestParam("code") String code) { String key = RedisConst.PHONE_UPDATE_CODE_STR + AuthUtils.getUserId(); Object smsStr = redisUtil.get(key); if (null == smsStr) { @@ -293,7 +293,7 @@ public class UserController { @GetMapping("sendEmail") @Operation(summary = "发送邮件") - public CommonResultsendEmail(@RequestParam("email") String email) { + public CommonResult sendEmail(@RequestParam("email") String email) { //判断是否和当前手机号一直 UserEntity emailUserEntity = new UserEntity(); emailUserEntity.setEmail(email); @@ -328,8 +328,8 @@ public class UserController { @GetMapping("updateEmail") @Operation(summary = "更新邮箱") - public CommonResultupdateEmail(@RequestParam("password") String password, - @RequestParam("code") String code) { + public CommonResult updateEmail(@RequestParam("password") String password, + @RequestParam("code") String code) { String key = RedisConst.EMAIL_UPDATE_CODE_STR + AuthUtils.getUserId(); Object smsStr = redisUtil.get(key); if (null == smsStr) { diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/DictionaryMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/DictionaryMapper.java index 7ff45361262354def04e3ed1fd6954d7688a8dad..ae5ce82e3657e55c8735fecbfd2555fd007ca7b6 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/DictionaryMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/DictionaryMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.system.entity.DictionaryEntity; /** @@ -11,6 +10,6 @@ import org.simple.system.entity.DictionaryEntity; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface DictionaryMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/EmailMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/EmailMapper.java index e9c44abbdfa240e4bf20bc135c36ad238492d235..9ab31d9e92bcb9296cd8b9e8d8421fc2757fd436 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/EmailMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/EmailMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.system.entity.EmailEntity; /** @@ -11,6 +10,6 @@ import org.simple.system.entity.EmailEntity; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface EmailMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/LogsMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/LogsMapper.java index 69cad816ed1daf35303cf5196094b5261e78c00e..96adb365652440678bd715757c2c9ed36ca9b6f1 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/LogsMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/LogsMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.simple.system.dto.log.LogsQuery; import org.simple.system.entity.LogsEntity; @@ -15,7 +14,7 @@ import java.util.List; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface LogsMapper extends BaseMapper { List logsList(@Param("obj") LogsQuery logs); } diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/MenuMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/MenuMapper.java index b1bb98d684ebe655455e3b4ee66f2e848c9b5c6d..232aad4c39d0795d316b7bd342a24ae885f7aec7 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/MenuMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/MenuMapper.java @@ -2,7 +2,10 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; import org.simple.system.dto.menu.MenuTreeDto; import org.simple.system.entity.MenuEntity; @@ -15,7 +18,7 @@ import java.util.List; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface MenuMapper extends BaseMapper { @Select("select t1.* from center_menu t1 where t1.type = 'c' order by t1.sort asc") @Results({ diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/OrganMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/OrganMapper.java index 90e1a013f5a46085e3f7f3b43badaca69ce5fa73..04d0d01aedb48855d0f8e9f092d6bb47a0b6098b 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/OrganMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/OrganMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.simple.system.dto.organ.OrganTreeDto; @@ -14,7 +13,7 @@ import java.util.List; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface OrganMapper extends BaseMapper { /** diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/OssMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/OssMapper.java index e6d6512801ac5c77cc5bad61f5321b7886b1c6bf..273f2101e543fbfb23fe6293c4b37443314f7390 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/OssMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/OssMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.system.entity.OssEntity; /** @@ -11,6 +10,6 @@ import org.simple.system.entity.OssEntity; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface OssMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/RoleMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/RoleMapper.java index 5df36ea9c50b0ec2c3f437c86c24852741b110fe..e7316c5ccf8ae2f323eb0ed397ab004e407c6bf1 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/RoleMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/RoleMapper.java @@ -1,7 +1,10 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.simple.system.entity.RoleEntity; import java.util.List; @@ -13,7 +16,7 @@ import java.util.List; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface RoleMapper extends BaseMapper { @Delete("delete from center_roleuser where role = #{id}") void delRoleUser(@Param("id") String id); diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/SmsMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/SmsMapper.java index 7ad4eb3f1139af4b3819dc08e6406adecea1984f..ee3b50645d6d62fe98f589f5d78456feef81a1d5 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/SmsMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/SmsMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.simple.system.entity.SmsEntity; /** @@ -11,6 +10,6 @@ import org.simple.system.entity.SmsEntity; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface SmsMapper extends BaseMapper { } diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/TenantMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/TenantMapper.java index 97a0410f2e1cdb6890f05cc286c9ad1b44f1ffb3..411f8d477d9447024697043933de75bd94d4ab85 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/TenantMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/TenantMapper.java @@ -1,7 +1,6 @@ package org.simple.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.simple.system.entity.TenantEntity; @@ -13,7 +12,7 @@ import org.simple.system.entity.TenantEntity; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface TenantMapper extends BaseMapper { @Select("select count(1) from center_usertenant t where t.tenant = #{id} ") diff --git a/service/simple-center/src/main/java/org/simple/system/mapper/UserMapper.java b/service/simple-center/src/main/java/org/simple/system/mapper/UserMapper.java index 076a511e60bc1461db8421409280610a6f0e9b2f..b080b2379afaffd9f281809f8413f0f2bf201cb1 100644 --- a/service/simple-center/src/main/java/org/simple/system/mapper/UserMapper.java +++ b/service/simple-center/src/main/java/org/simple/system/mapper/UserMapper.java @@ -17,7 +17,7 @@ import java.util.List; * @version v1.0 * @since 2022/11/13 */ -@Mapper + public interface UserMapper extends BaseMapper { /** diff --git a/service/simple-center/src/main/java/org/simple/system/service/ILogsService.java b/service/simple-center/src/main/java/org/simple/system/service/ILogsService.java index 081e6712a98c5955386d4188657d316d99fdebc2..0d227244e999a97d41c9592d97f50009428b5c75 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/ILogsService.java +++ b/service/simple-center/src/main/java/org/simple/system/service/ILogsService.java @@ -1,10 +1,10 @@ package org.simple.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.servlet.http.HttpServletRequest; import org.simple.system.dto.log.LogsQuery; import org.simple.system.entity.LogsEntity; -import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/service/simple-center/src/main/java/org/simple/system/service/IRoleService.java b/service/simple-center/src/main/java/org/simple/system/service/IRoleService.java index 74f1e2682a417c7561716c3270b8927b90e148a1..d1f0feaa67f50452216fab6fa7c83767676b9bcc 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/IRoleService.java +++ b/service/simple-center/src/main/java/org/simple/system/service/IRoleService.java @@ -1,10 +1,10 @@ package org.simple.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.simple.exception.CustomException; import org.simple.system.dto.role.RoleQuery; import org.simple.system.entity.RoleEntity; import org.simple.system.entity.RoleMenuEntity; -import org.simple.exception.CustomException; import java.util.List; diff --git a/service/simple-center/src/main/java/org/simple/system/service/impl/AuthServiceImpl.java b/service/simple-center/src/main/java/org/simple/system/service/impl/AuthServiceImpl.java index e09b27778cbc67d338eca4975480c828e1b4af56..d8c86bb280286badb0da187bb5eaa0bc87b226d6 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/impl/AuthServiceImpl.java +++ b/service/simple-center/src/main/java/org/simple/system/service/impl/AuthServiceImpl.java @@ -72,12 +72,12 @@ public class AuthServiceImpl implements IAuthService { StpUtil.getSession().set("tenantId", userEntity.getTenant()); StpUtil.getSession().set("device", loginParam.getDevice()); // 将权限信息放入到redis中 - List permissionList = + List permissionList = userService.getUserMenuAuth(userEntity.getId()); - redisUtil.setObj("sa-token-permission-"+userEntity.getId(),permissionList); + redisUtil.setObj("sa-token-permission-" + userEntity.getId(), permissionList); List roleList = userService.getUserRole(userEntity.getId()); - redisUtil.setObj("sa-token-role-"+userEntity.getId(),roleList); + redisUtil.setObj("sa-token-role-" + userEntity.getId(), roleList); return token; } diff --git a/service/simple-center/src/main/java/org/simple/system/service/impl/LogsServiceImpl.java b/service/simple-center/src/main/java/org/simple/system/service/impl/LogsServiceImpl.java index 4702f98e0691be3c5c7ac003dc17fec12c8a5838..fccb78d99045d0d0f7cf73970d9473ebc7fe313a 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/impl/LogsServiceImpl.java +++ b/service/simple-center/src/main/java/org/simple/system/service/impl/LogsServiceImpl.java @@ -6,12 +6,13 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yitter.idgen.YitIdHelper; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import org.jetbrains.annotations.NotNull; +import org.simple.enums.system.IsDeletedEnum; import org.simple.system.dto.log.LogsQuery; import org.simple.system.entity.LogsEntity; import org.simple.system.entity.UserEntity; -import org.simple.enums.system.IsDeletedEnum; import org.simple.system.mapper.LogsMapper; import org.simple.system.service.ILogsService; import org.simple.system.service.IUserService; @@ -20,7 +21,6 @@ import org.simple.utils.PageUtil; import org.simple.utils.ServletUtil; import org.springframework.stereotype.Service; -import jakarta.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/service/simple-center/src/main/java/org/simple/system/service/impl/RoleServiceImpl.java b/service/simple-center/src/main/java/org/simple/system/service/impl/RoleServiceImpl.java index a10151e00ade4d53c559bd438386af454ac384ce..43003ec74d5999d7d45320b9b8a7000744032493 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/impl/RoleServiceImpl.java +++ b/service/simple-center/src/main/java/org/simple/system/service/impl/RoleServiceImpl.java @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yitter.idgen.YitIdHelper; +import org.simple.enums.system.ResultCodeEnum; +import org.simple.exception.CustomException; import org.simple.system.dto.role.RoleQuery; import org.simple.system.entity.RoleEntity; import org.simple.system.entity.RoleMenuEntity; -import org.simple.enums.system.ResultCodeEnum; -import org.simple.exception.CustomException; import org.simple.system.mapper.RoleMapper; import org.simple.system.service.IRoleService; import org.springframework.stereotype.Service; diff --git a/service/simple-center/src/main/java/org/simple/system/service/impl/StpInterfaceImpl.java b/service/simple-center/src/main/java/org/simple/system/service/impl/StpInterfaceImpl.java index 2a95b3a3dd49deffcccb532e60483b7850bdff13..91ad053f406ef28b9a05681ba4752bd33af14564 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/impl/StpInterfaceImpl.java +++ b/service/simple-center/src/main/java/org/simple/system/service/impl/StpInterfaceImpl.java @@ -29,9 +29,9 @@ public class StpInterfaceImpl implements StpInterface { */ @Override public List getPermissionList(Object loginId, String loginType) { - if(redisUtil.hasKey("sa-token-permission-"+loginId)){ - return (List)redisUtil.get("sa-token-permission-"+loginId); - }else{ + if (redisUtil.hasKey("sa-token-permission-" + loginId)) { + return (List) redisUtil.get("sa-token-permission-" + loginId); + } else { return new ArrayList<>(); } } @@ -41,9 +41,9 @@ public class StpInterfaceImpl implements StpInterface { */ @Override public List getRoleList(Object loginId, String loginType) { - if(redisUtil.hasKey("sa-token-role-"+loginId)){ - return (List)redisUtil.get("sa-token-role-"+loginId); - }else{ + if (redisUtil.hasKey("sa-token-role-" + loginId)) { + return (List) redisUtil.get("sa-token-role-" + loginId); + } else { return new ArrayList<>(); } } diff --git a/service/simple-center/src/main/java/org/simple/system/service/impl/UserServiceImpl.java b/service/simple-center/src/main/java/org/simple/system/service/impl/UserServiceImpl.java index 637608470e5f4a6d4550a0f83b4b861c4ce995bb..5feed0ad0f903792a4e733daf740b35b60012cd8 100644 --- a/service/simple-center/src/main/java/org/simple/system/service/impl/UserServiceImpl.java +++ b/service/simple-center/src/main/java/org/simple/system/service/impl/UserServiceImpl.java @@ -78,7 +78,7 @@ public class UserServiceImpl extends ServiceImpl impleme } @Override - public CommonResultdelUser(String userId) { + public CommonResult delUser(String userId) { //先删除用户关联的数据 baseMapper.delRoleUser(userId); baseMapper.delUserTenant(userId); @@ -103,7 +103,7 @@ public class UserServiceImpl extends ServiceImpl impleme } @Override - public CommonResultupdateUser(UserEntityDto userDto) { + public CommonResult updateUser(UserEntityDto userDto) { UserEntity userEntity = new UserEntity(); userEntity.setUsername(userDto.getUsername()); userEntity.setNickName(userDto.getNickName()); diff --git a/service/simple-center/src/main/java/org/simple/system/tool/annotation/LogRecordAspect.java b/service/simple-center/src/main/java/org/simple/system/tool/annotation/LogRecordAspect.java index 1b33b9b69aab62efac0ba508df7b8aca8b8ca15e..8d51f6c74658868928a5a72fa921e90056968fab 100644 --- a/service/simple-center/src/main/java/org/simple/system/tool/annotation/LogRecordAspect.java +++ b/service/simple-center/src/main/java/org/simple/system/tool/annotation/LogRecordAspect.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -20,7 +21,6 @@ import org.simple.utils.ServletUtil; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; -import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -74,7 +74,7 @@ public class LogRecordAspect { Operation operation = targetMethod.getAnnotation(Operation.class); String duration = String.valueOf((System.currentTimeMillis() - startTime)); String summary = ObjectUtil.isNotNull(operation) ? operation.summary() : ""; - logsData = logsService.getLogData(summary, StpUtil.isLogin()?AuthUtils.getUserId():"匿名游客", duration, request); + logsData = logsService.getLogData(summary, StpUtil.isLogin() ? AuthUtils.getUserId() : "匿名游客", duration, request); log.info("{}", JSONUtil.toJsonStr(logsData)); applicationEventPublisher.publishEvent(new LogEvent<>(new LogEventArgs<>(JSONUtil.toJsonStr(logsData)))); return result; diff --git a/service/simple-center/src/main/resources/templates/Controller.java.vm b/service/simple-center/src/main/resources/templates/Controller.java.vm index 1163558a755139c321ef80c094203eaa385d624f..ee4bf3f5ecd2876e272f676a2ffbc99b599a14ff 100644 --- a/service/simple-center/src/main/resources/templates/Controller.java.vm +++ b/service/simple-center/src/main/resources/templates/Controller.java.vm @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import ${package}.service.${className}Service; -import ${package}.entity.${className}; +import ${package}.entity .${className}; /** * @Copyright: ${company} @@ -27,7 +27,7 @@ public class ${className}Controller { @GetMapping("list") - @Operation(summary="查询${comments}") + @Operation(summary = "查询${comments}") public CommonResult list(Page page, ${className} ${classname}) { return CommonResult.success(${classname}Service.page(page, Wrappers.query(${classname}))); } diff --git a/service/simple-center/src/main/resources/templates/Entity.java.vm b/service/simple-center/src/main/resources/templates/Entity.java.vm index 867ae5529cde2a5f578fa383572c418804c3f4a9..b27eb1052fc8cc21d2817ad31514613db3b12a67 100644 --- a/service/simple-center/src/main/resources/templates/Entity.java.vm +++ b/service/simple-center/src/main/resources/templates/Entity.java.vm @@ -31,18 +31,20 @@ import com.baomidou.mybatisplus.annotation.IdType; @Data @NoArgsConstructor @TableName(value = "${tableName}") -public class ${className} implements Serializable{ -private static final long serialVersionUID=1L; +public class ${className} implements -#foreach ($column in $columns) +Serializable { + private static final long serialVersionUID = 1L; - #if($column.columnKey.equals('PRI')) - @TableId(type = IdType.ASSIGN_ID) - #end - #if($column.dataType.equals('json')) - @TableField(typeHandler = JacksonTypeHandler.class) + #foreach ($column in $columns) + + #if($column.columnKey.equals('PRI')) + @TableId(type = IdType.ASSIGN_ID) + #end + #if($column.dataType.equals('json')) + @TableField(typeHandler = JacksonTypeHandler.class) + #end + private $column.attrType $column.attrname; #end -private $column.attrType $column.attrname; -#end } diff --git a/service/simple-center/src/main/resources/templates/Mapper.java.vm b/service/simple-center/src/main/resources/templates/Mapper.java.vm index ed68cf2bad1845351c425d6058c948b937afe45c..eb7447d47423c498715efd171dc37d26b896cdf7 100644 --- a/service/simple-center/src/main/resources/templates/Mapper.java.vm +++ b/service/simple-center/src/main/resources/templates/Mapper.java.vm @@ -1,7 +1,7 @@ package ${package}.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import ${package}.entity.${className}; +import ${package}.entity .${className}; /** * @Copyright: ${company} diff --git a/service/simple-center/src/main/resources/templates/Service.java.vm b/service/simple-center/src/main/resources/templates/Service.java.vm index 8bbc994ad09090961d8deec69b26d37b7cbde61b..0c7e387073a840260e269ff192c2b37c564ac0fb 100644 --- a/service/simple-center/src/main/resources/templates/Service.java.vm +++ b/service/simple-center/src/main/resources/templates/Service.java.vm @@ -1,7 +1,7 @@ package ${package}.service; import com.baomidou.mybatisplus.extension.service.IService; -import ${package}.entity.${className}; +import ${package}.entity .${className}; /** diff --git a/service/simple-center/src/main/resources/templates/ServiceImpl.java.vm b/service/simple-center/src/main/resources/templates/ServiceImpl.java.vm index 5f3ce6a99a4517061f817cc76f449ac86b984d42..480f53f9d963a7982854c001f29bec1af8d5cb64 100644 --- a/service/simple-center/src/main/resources/templates/ServiceImpl.java.vm +++ b/service/simple-center/src/main/resources/templates/ServiceImpl.java.vm @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import ${package}.service.${className}Service; import ${package}.mapper.${className}Mapper; -import ${package}.entity.${className}; +import ${package}.entity .${className}; /** * @Copyright: ${company} diff --git a/service/simple-start/src/main/java/org/simple/FrSimpleApp.java b/service/simple-start/src/main/java/org/simple/FrSimpleApp.java index 1e740abc3adf29e8ae0d1316f21049b2d4598a7a..f8fc629e6b3eb69b739d98aa6095f3204c9abf43 100644 --- a/service/simple-start/src/main/java/org/simple/FrSimpleApp.java +++ b/service/simple-start/src/main/java/org/simple/FrSimpleApp.java @@ -1,6 +1,5 @@ package org.simple; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; @@ -13,7 +12,6 @@ import org.springframework.scheduling.annotation.EnableAsync; * @since 2022-7-7 */ @EnableAsync -@MapperScan("org.simple.*.mapper") @SpringBootApplication(scanBasePackages = "org.simple") public class FrSimpleApp { /** diff --git a/service/simple-start/src/main/resources/application-dev.yml b/service/simple-start/src/main/resources/application-dev.yml index a87851f9366ae56ba9a0a43ce909e6ad6259782d..00a7718e48b5d4014ada31d688b4c37a93954937 100644 --- a/service/simple-start/src/main/resources/application-dev.yml +++ b/service/simple-start/src/main/resources/application-dev.yml @@ -26,28 +26,28 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver #redis配置 data: - redis: - # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突 - database: 6 - # redis服务器地址（默认为127.0.01） - host: localhost - # redis端口（默认为6379） - port: 6379 - # redis访问密码（默认为空） - password: 123456 - # redis连接超时时间（单位毫秒） - timeout: 3000 - # redis连接池配置 - jedis: - pool: - # 最大可用连接数（默认为8，负数表示无限） - max-active: 8 - # 最大空闲连接数（默认为8，负数表示无限） - max-idle: 8 - # 最小空闲连接数（默认为0，该值只有为正数才有用） - min-idle: 0 - # 从连接池中获取连接最大等待时间（默认为-1，单位为毫秒，负数表示无限） - max-wait: -1 + redis: + # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突 + database: 6 + # redis服务器地址（默认为127.0.01） + host: localhost + # redis端口（默认为6379） + port: 6379 + # redis访问密码（默认为空） + password: + # redis连接超时时间（单位毫秒） + timeout: 3000 + # redis连接池配置 + jedis: + pool: + # 最大可用连接数（默认为8，负数表示无限） + max-active: 8 + # 最大空闲连接数（默认为8，负数表示无限） + max-idle: 8 + # 最小空闲连接数（默认为0，该值只有为正数才有用） + min-idle: 0 + # 从连接池中获取连接最大等待时间（默认为-1，单位为毫秒，负数表示无限） + max-wait: -1 config: minio: endpoint: https://localhost:9090 @@ -103,8 +103,8 @@ logging: org.simple: debug # debug 可以查看打印的sql com.baomidou.dynamic: debug mybatis-plus: -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + # configuration: + # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl global-config: sql-parser-cache: true banner: false diff --git a/service/simple-start/src/main/resources/application-pro.yml b/service/simple-start/src/main/resources/application-pro.yml index 106aa6ad1de14b6fd16c3586e2a50adac484ced2..2f71c99807d5a69b07c584acbfe60264c4529471 100644 --- a/service/simple-start/src/main/resources/application-pro.yml +++ b/service/simple-start/src/main/resources/application-pro.yml @@ -27,26 +27,26 @@ spring: #redis配置 data: redis: - # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突 + # redis数据库索引(默认为0)，我们使用索引为3的数据库，避免和其他数据库冲突 database: 4 - # redis服务器地址（默认为127.0.01） + # redis服务器地址（默认为127.0.01） host: localhost - # redis端口（默认为6379） + # redis端口（默认为6379） port: 6379 - # redis访问密码（默认为空） + # redis访问密码（默认为空） password: 123456 - # redis连接超时时间（单位毫秒） + # redis连接超时时间（单位毫秒） timeout: 3000 - # redis连接池配置 + # redis连接池配置 jedis: pool: - # 最大可用连接数（默认为8，负数表示无限） + # 最大可用连接数（默认为8，负数表示无限） max-active: 8 - # 最大空闲连接数（默认为8，负数表示无限） + # 最大空闲连接数（默认为8，负数表示无限） max-idle: 8 - # 最小空闲连接数（默认为0，该值只有为正数才有用） + # 最小空闲连接数（默认为0，该值只有为正数才有用） min-idle: 0 - # 从连接池中获取连接最大等待时间（默认为-1，单位为毫秒，负数表示无限） + # 从连接池中获取连接最大等待时间（默认为-1，单位为毫秒，负数表示无限） max-wait: -1 config: minio: