diff --git a/src/main/java/org/micai/platform/auth/exception/DefaultException.java b/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java
similarity index 90%
rename from src/main/java/org/micai/platform/auth/exception/DefaultException.java
rename to src/main/java/org/micai/platform/auth/base/exception/DefaultException.java
index 646de4a1217b1ab2b784655546a6680af1540d48..2d70094a17417247c57e10fe94d8a49cb47a0243 100644
--- a/src/main/java/org/micai/platform/auth/exception/DefaultException.java
+++ b/src/main/java/org/micai/platform/auth/base/exception/DefaultException.java
@@ -1,8 +1,8 @@
-package org.micai.platform.auth.exception;
+package org.micai.platform.auth.base.exception;
import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.result.Result;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
diff --git a/src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java b/src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java
similarity index 94%
rename from src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java
rename to src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java
index 8e2e3c7aaf915ae583043718a603ac9cff60de00..80b8ac798df8ff2b87af33ab4f2bbf4249c10805 100644
--- a/src/main/java/org/micai/platform/auth/exception/GlobalExceptionHandler.java
+++ b/src/main/java/org/micai/platform/auth/base/exception/GlobalExceptionHandler.java
@@ -1,7 +1,7 @@
-package org.micai.platform.auth.exception;
+package org.micai.platform.auth.base.exception;
import lombok.extern.slf4j.Slf4j;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.result.Result;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/src/main/java/org/micai/platform/auth/exception/PlatformException.java b/src/main/java/org/micai/platform/auth/base/exception/PlatformException.java
similarity index 96%
rename from src/main/java/org/micai/platform/auth/exception/PlatformException.java
rename to src/main/java/org/micai/platform/auth/base/exception/PlatformException.java
index 2d59187bc87e2d7bd846214f651000932b007e06..2e5c18541e0794d92a7e517de8d0da91a783b556 100644
--- a/src/main/java/org/micai/platform/auth/exception/PlatformException.java
+++ b/src/main/java/org/micai/platform/auth/base/exception/PlatformException.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.exception;
+package org.micai.platform.auth.base.exception;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/src/main/java/org/micai/platform/auth/result/Result.java b/src/main/java/org/micai/platform/auth/base/result/Result.java
similarity index 94%
rename from src/main/java/org/micai/platform/auth/result/Result.java
rename to src/main/java/org/micai/platform/auth/base/result/Result.java
index 02fa1b3dd1ea61e0ff5f7195de9b40b5e25eba9b..bebed909c738f5fa1888898ceb1d8e83ebd4f694 100644
--- a/src/main/java/org/micai/platform/auth/result/Result.java
+++ b/src/main/java/org/micai/platform/auth/base/result/Result.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.result;
+package org.micai.platform.auth.base.result;
import lombok.Data;
import org.micai.platform.auth.constant.ConstantEnum;
diff --git a/src/main/java/org/micai/platform/auth/result/UploadResult.java b/src/main/java/org/micai/platform/auth/base/result/UploadResult.java
similarity index 94%
rename from src/main/java/org/micai/platform/auth/result/UploadResult.java
rename to src/main/java/org/micai/platform/auth/base/result/UploadResult.java
index 3440c3b7b3834957b1399dc94229c3b855246f90..2f5ed01a82b0d9b066fe65e8618874e560aa6da9 100644
--- a/src/main/java/org/micai/platform/auth/result/UploadResult.java
+++ b/src/main/java/org/micai/platform/auth/base/result/UploadResult.java
@@ -1,4 +1,4 @@
-package org.micai.platform.auth.result;
+package org.micai.platform.auth.base.result;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java b/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java
index 369c8a36cb70c93497898fd1f4899d18596c8931..fec60bb6282b72600d1cc330c76b4e4bded22490 100644
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java
+++ b/src/main/java/org/micai/platform/auth/base/storage/impl/AbstractStorage.java
@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.base.storage.Storage;
import org.micai.platform.auth.config.SiteOptions;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.utils.FileKit;
import org.micai.platform.auth.utils.FilePathUtils;
import org.micai.platform.auth.utils.ImageUtils;
diff --git a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java b/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java
index 068160395e66048411686533687d76cd496c4383..b1a02bf1cc79d2c19cf863d2150dfa222bbcfd73 100644
--- a/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java
+++ b/src/main/java/org/micai/platform/auth/base/storage/impl/OssStorageImpl.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.micai.platform.auth.base.storage.Storage;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.utils.FileKit;
import org.springframework.stereotype.Component;
import java.io.ByteArrayInputStream;
diff --git a/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java b/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java
new file mode 100644
index 0000000000000000000000000000000000000000..c29c51598021c660b9ad2ddf2144b55b538ca9ce
--- /dev/null
+++ b/src/main/java/org/micai/platform/auth/bo/OrganDelBo.java
@@ -0,0 +1,10 @@
+package org.micai.platform.auth.bo;
+
+/**
+ * @Author zhaoxinguo
+ * @Date 2021-12-31 13:39
+ * @ClassName OrganDelBo
+ * @Description TODO
+ */
+public class OrganDelBo {
+}
diff --git a/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java b/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java
new file mode 100644
index 0000000000000000000000000000000000000000..02e27f393d70f4624da5088c2dfa6770956630cc
--- /dev/null
+++ b/src/main/java/org/micai/platform/auth/bo/OrganFindBo.java
@@ -0,0 +1,31 @@
+package org.micai.platform.auth.bo;
+
+import cn.hutool.db.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author liuCong
+ * @Date 2021/12/29 15:35
+ * @ClassName OrganFindBo
+ * @Description
+ */
+@Data
+@ApiModel(value = "查询组织bo")
+public class OrganFindBo extends Page implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "组织编码")
+ private String organCode;
+
+ @ApiModelProperty(value = "组织名称")
+ private String organName;
+
+ @ApiModelProperty(value = "状态: 01 启用 02停用")
+ private String status;
+
+}
diff --git a/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java b/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c0a79477088644ad33fc6807fef5e3e64063d7a
--- /dev/null
+++ b/src/main/java/org/micai/platform/auth/bo/OrganSaveBo.java
@@ -0,0 +1,10 @@
+package org.micai.platform.auth.bo;
+
+/**
+ * @Author zhaoxinguo
+ * @Date 2021-12-31 13:39
+ * @ClassName OrganSaveBo
+ * @Description TODO
+ */
+public class OrganSaveBo {
+}
diff --git a/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java b/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java
new file mode 100644
index 0000000000000000000000000000000000000000..a715f9b910e2f4a214a0e0b227c3ee67fbd0584a
--- /dev/null
+++ b/src/main/java/org/micai/platform/auth/bo/OrganUpdateBo.java
@@ -0,0 +1,10 @@
+package org.micai.platform.auth.bo;
+
+/**
+ * @Author zhaoxinguo
+ * @Date 2021-12-31 13:39
+ * @ClassName OrganUpdateBo
+ * @Description TODO
+ */
+public class OrganUpdateBo {
+}
diff --git a/src/main/java/org/micai/platform/auth/query/UserQuery.java b/src/main/java/org/micai/platform/auth/bo/UserQueryBo.java
similarity index 64%
rename from src/main/java/org/micai/platform/auth/query/UserQuery.java
rename to src/main/java/org/micai/platform/auth/bo/UserQueryBo.java
index deda7c242198828d26e7331aad0d2154c262b098..052c8decfdc144726ec23e12bf2f3dad27598ce5 100644
--- a/src/main/java/org/micai/platform/auth/query/UserQuery.java
+++ b/src/main/java/org/micai/platform/auth/bo/UserQueryBo.java
@@ -1,9 +1,9 @@
-package org.micai.platform.auth.query;
+package org.micai.platform.auth.bo;
import lombok.Data;
@Data
-public class UserQuery {
+public class UserQueryBo {
private String username;
private String password;
diff --git a/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java b/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java
index 2caf64a4b6597d7e99a42b3376158d8c5290dff3..bb5a61a90fa3e716b31538d36a11a2b665983914 100644
--- a/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java
+++ b/src/main/java/org/micai/platform/auth/controller/JwtExceptionController.java
@@ -7,7 +7,7 @@ import io.jsonwebtoken.UnsupportedJwtException;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.result.Result;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java b/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java
index 56a428385cd15583e5c91e534c3ce731095adb5d..1a1cd034d6103bb444d9209c0c581f9a737c606f 100644
--- a/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java
+++ b/src/main/java/org/micai/platform/auth/controller/OrganInfoController.java
@@ -1,9 +1,23 @@
package org.micai.platform.auth.controller;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.micai.platform.auth.bo.*;
+import org.micai.platform.auth.constant.ConstantEnum;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.base.result.Result;
+import org.micai.platform.auth.service.OrganInfoService;
+import org.micai.platform.auth.vo.OrganListVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.stereotype.Controller;
+import javax.validation.Valid;
/**
*
@@ -13,9 +27,86 @@ import org.springframework.stereotype.Controller;
* @author liucong
* @since 2021-12-06
*/
-@Controller
-@RequestMapping("/Tb/organInfo")
+@RestController
+@RequestMapping("/organ")
+@Api(tags = "组织管理", value = "组织管理")
+@Slf4j
public class OrganInfoController {
+ @Autowired
+ private OrganInfoService organInfoService;
+
+ @ApiOperation(value = "获取组织列表", notes = "获取组织列表")
+ @PostMapping("/getOrganList")
+ @PreAuthorize("hasAnyAuthority('root')")
+ public Result getOrganList(@RequestBody OrganFindBo bo){
+ Result result;
+ try {
+ Page page = organInfoService.getOrganList(bo);
+ result = new Result(ConstantEnum.SUCCESS,page);
+ } catch (PlatformException e) {
+ log.error("error info:",e);
+ result = new Result(e.getErrorCode(), e.getErrorMessage());
+ } catch (Exception e) {
+ log.error("error info:",e);
+ result = new Result(ConstantEnum.FAIL);
+ }
+ return result;
+ }
+
+
+ @ApiOperation(value = "更新组织信息", notes = "更新组织信息")
+ @PostMapping("/updateOrgan")
+ @PreAuthorize("hasAnyAuthority('root')")
+ public Result updateOrgan(@RequestBody @Valid OrganUpdateBo bo){
+ Result result;
+ try {
+ organInfoService.updateOrgan(bo);
+ result = new Result(ConstantEnum.SUCCESS);
+ } catch (PlatformException e) {
+ log.error("error info:",e);
+ result = new Result(e.getErrorCode(), e.getErrorMessage());
+ } catch (Exception e) {
+ log.error("error info:",e);
+ result = new Result(ConstantEnum.FAIL);
+ }
+ return result;
+ }
+
+ @ApiOperation(value = "新增组织", notes = "新增组织")
+ @PostMapping("/saveOrgan")
+ @PreAuthorize("hasAnyAuthority('root')")
+ public Result saveOrgan(@RequestBody @Valid OrganSaveBo bo){
+ Result result;
+ try {
+ organInfoService.saveOrgan(bo);
+ result = new Result(ConstantEnum.SUCCESS);
+ } catch (PlatformException e) {
+ log.error("error info:",e);
+ result = new Result(e.getErrorCode(), e.getErrorMessage());
+ } catch (Exception e) {
+ log.error("error info:",e);
+ result = new Result(ConstantEnum.FAIL);
+ }
+ return result;
+ }
+
+ @ApiOperation(value = "删除组织", notes = "删除组织")
+ @PostMapping("/delOrgan")
+ @PreAuthorize("hasAnyAuthority('root')")
+ public Result delOrgan(@RequestBody @Valid OrganDelBo bo){
+ Result result;
+ try {
+ organInfoService.delOrgan(bo);
+ result = new Result(ConstantEnum.SUCCESS);
+ } catch (PlatformException e) {
+ log.error("error info:",e);
+ result = new Result(e.getErrorCode(), e.getErrorMessage());
+ } catch (Exception e) {
+ log.error("error info:",e);
+ result = new Result(ConstantEnum.FAIL);
+ }
+ return result;
+ }
}
diff --git a/src/main/java/org/micai/platform/auth/controller/PermissionController.java b/src/main/java/org/micai/platform/auth/controller/PermissionController.java
index 70fbb5f957a48b12176db7eeb86510038f698056..4fc5ceaa28280d8bcd67a1c6189e8c1a8df949c8 100644
--- a/src/main/java/org/micai/platform/auth/controller/PermissionController.java
+++ b/src/main/java/org/micai/platform/auth/controller/PermissionController.java
@@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.PermissionFindBo;
import org.micai.platform.auth.bo.PermissionSaveBo;
import org.micai.platform.auth.bo.PermissionUpdateBo;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.base.result.Result;
import org.micai.platform.auth.service.PermissionService;
import org.micai.platform.auth.vo.RoleListVo;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/micai/platform/auth/controller/RoleController.java b/src/main/java/org/micai/platform/auth/controller/RoleController.java
index 06c0cef03cc347f8bad3aea4230f104c4b72c9dc..911801830a5dbfad9c487cf5c4abea44b76d3257 100644
--- a/src/main/java/org/micai/platform/auth/controller/RoleController.java
+++ b/src/main/java/org/micai/platform/auth/controller/RoleController.java
@@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.RoleFindBo;
import org.micai.platform.auth.bo.RoleSaveBo;
import org.micai.platform.auth.bo.RoleUpdateBo;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.base.result.Result;
import org.micai.platform.auth.service.RoleService;
import org.micai.platform.auth.vo.UserListVo;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java b/src/main/java/org/micai/platform/auth/controller/SysMenuController.java
index 7827620abc6a7de9a11c73c22bd480e680a3addf..b769d3c5bc29db424ee51ff586c07b79a31f8532 100644
--- a/src/main/java/org/micai/platform/auth/controller/SysMenuController.java
+++ b/src/main/java/org/micai/platform/auth/controller/SysMenuController.java
@@ -9,8 +9,8 @@ import org.micai.platform.auth.bo.MenuDelBo;
import org.micai.platform.auth.bo.MenuSaveBo;
import org.micai.platform.auth.bo.MenuUpdateBo;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.base.result.Result;
import org.micai.platform.auth.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/src/main/java/org/micai/platform/auth/controller/UploadController.java b/src/main/java/org/micai/platform/auth/controller/UploadController.java
index 7bfe958ee75659522162fde0d96753c2f91a64ab..cc6ff85ddddc570e64931072715797e8b83b543a 100644
--- a/src/main/java/org/micai/platform/auth/controller/UploadController.java
+++ b/src/main/java/org/micai/platform/auth/controller/UploadController.java
@@ -5,8 +5,7 @@ import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.constant.ConstantCode;
-import org.micai.platform.auth.result.UploadResult;
+import org.micai.platform.auth.base.result.UploadResult;
import org.micai.platform.auth.utils.FileKit;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.ServletRequestUtils;
diff --git a/src/main/java/org/micai/platform/auth/controller/UserController.java b/src/main/java/org/micai/platform/auth/controller/UserController.java
index 1f0cd3ab402cba7399272c45e56b8f29aa21082a..92b720f7e257fb37b135ade59085058786653313 100644
--- a/src/main/java/org/micai/platform/auth/controller/UserController.java
+++ b/src/main/java/org/micai/platform/auth/controller/UserController.java
@@ -10,8 +10,8 @@ import org.micai.platform.auth.bo.UserSaveBo;
import org.micai.platform.auth.bo.UserUpdateBo;
import org.micai.platform.auth.constant.ConstantEnum;
import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.exception.PlatformException;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.base.result.Result;
import org.micai.platform.auth.vo.UserListVo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java b/src/main/java/org/micai/platform/auth/entity/OrganInfo.java
index 2768caedc4e10143d8be8aaf73f0b66ef8849e9a..9064c2153bc92e1f8f4058bd750e55bef97d9f78 100644
--- a/src/main/java/org/micai/platform/auth/entity/OrganInfo.java
+++ b/src/main/java/org/micai/platform/auth/entity/OrganInfo.java
@@ -27,7 +27,7 @@ public class OrganInfo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键id")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "机构编码")
diff --git a/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java b/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java
index 1243c55e2f2c37c1531684e2f9883c2a8e9f1061..d9870e5726b0d272d5e70f477cced81d01460414 100644
--- a/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java
+++ b/src/main/java/org/micai/platform/auth/filter/JWTAuthenticationFilter.java
@@ -6,7 +6,7 @@ import io.jsonwebtoken.*;
import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.service.GrantedAuthorityImpl;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java b/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java
index f6a8227d61df5735c70edf1792f17c394d9a404a..1e986b54252abdcf35bdcb80dbb6f79a650ca35e 100644
--- a/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java
+++ b/src/main/java/org/micai/platform/auth/filter/JWTLoginFilter.java
@@ -7,9 +7,9 @@ import io.jsonwebtoken.SignatureAlgorithm;
import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
-import org.micai.platform.auth.exception.PlatformException;
-import org.micai.platform.auth.query.UserQuery;
-import org.micai.platform.auth.result.Result;
+import org.micai.platform.auth.base.exception.PlatformException;
+import org.micai.platform.auth.bo.UserQueryBo;
+import org.micai.platform.auth.base.result.Result;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -56,11 +56,11 @@ public class JWTLoginFilter extends UsernamePasswordAuthenticationFilter {
public Authentication attemptAuthentication(HttpServletRequest req, HttpServletResponse res) throws AuthenticationException {
Authentication authenticate = null;
try {
- UserQuery userQuery = new ObjectMapper().readValue(req.getInputStream(), UserQuery.class);
+ UserQueryBo userQueryBo = new ObjectMapper().readValue(req.getInputStream(), UserQueryBo.class);
authenticate = authenticationManager.authenticate(
new UsernamePasswordAuthenticationToken(
- userQuery.getUsername(),
- userQuery.getPassword(),
+ userQueryBo.getUsername(),
+ userQueryBo.getPassword(),
new ArrayList<>())
);
} catch (IOException e) {
diff --git a/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java b/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java
index 536ee62ebb8e8c958eb4ff28b4b286bcf53029ee..e95cbe20dce666b7c84a2d03ea43906e92bfa332 100644
--- a/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java
+++ b/src/main/java/org/micai/platform/auth/provider/CustomAuthenticationProvider.java
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
import org.micai.platform.auth.entity.*;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.service.*;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java b/src/main/java/org/micai/platform/auth/service/OrganInfoService.java
index d83423467657d4d315e6106f0917850cd72e6526..5016f2fd37023816776621d50595f472d11800c3 100644
--- a/src/main/java/org/micai/platform/auth/service/OrganInfoService.java
+++ b/src/main/java/org/micai/platform/auth/service/OrganInfoService.java
@@ -1,7 +1,13 @@
package org.micai.platform.auth.service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.micai.platform.auth.bo.OrganDelBo;
+import org.micai.platform.auth.bo.OrganFindBo;
+import org.micai.platform.auth.bo.OrganSaveBo;
+import org.micai.platform.auth.bo.OrganUpdateBo;
import org.micai.platform.auth.entity.OrganInfo;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.micai.platform.auth.vo.OrganListVo;
/**
*
@@ -13,4 +19,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface OrganInfoService extends IService {
+ Page getOrganList(OrganFindBo bo);
+
+ void updateOrgan(OrganUpdateBo bo);
+
+ void saveOrgan(OrganSaveBo bo);
+
+ void delOrgan(OrganDelBo bo);
}
diff --git a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java
index 462f73451ae5018f1840a11d876baab120cc3cc5..0c7c3b5f1026677a39f057b700ee76eb3eac6bd3 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java
+++ b/src/main/java/org/micai/platform/auth/service/impl/PermissionServiceImpl.java
@@ -14,7 +14,7 @@ import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
import org.micai.platform.auth.dto.UserAuthenticationDto;
import org.micai.platform.auth.entity.Permission;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.mapper.PermissionMapper;
import org.micai.platform.auth.service.PermissionService;
import org.micai.platform.auth.utils.AuthenticationManger;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java
index a64e2750e2536397bfb237a3829e5ed3f84bf613..8e7c88dc0901c6aeeabc52261bf9e682fd607e5a 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java
+++ b/src/main/java/org/micai/platform/auth/service/impl/RoleServiceImpl.java
@@ -14,7 +14,7 @@ import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
import org.micai.platform.auth.dto.UserAuthenticationDto;
import org.micai.platform.auth.entity.Role;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.mapper.RoleMapper;
import org.micai.platform.auth.service.RoleService;
import org.micai.platform.auth.utils.AuthenticationManger;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java
index a8e51350358f233632bf3cbc9deb60b7a7f56e4a..f12f6eaa48238f837f4b34898ae4a10230cea44d 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/org/micai/platform/auth/service/impl/SysMenuServiceImpl.java
@@ -17,7 +17,7 @@ import org.micai.platform.auth.dto.UserAuthenticationDto;
import org.micai.platform.auth.entity.Permission;
import org.micai.platform.auth.entity.PermissionMenu;
import org.micai.platform.auth.entity.SysMenu;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.mapper.PermissionMapper;
import org.micai.platform.auth.mapper.PermissionMenuMapper;
import org.micai.platform.auth.mapper.SysMenuMapper;
diff --git a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java b/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java
index 7b7b933ea8f83822f8ff6d483bcd27eb482c6550..d85bc903a7abfd980b292b6e8f2fe5fe35ebd1ae 100644
--- a/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/micai/platform/auth/service/impl/UserServiceImpl.java
@@ -15,7 +15,7 @@ import org.micai.platform.auth.constant.ConstantCode;
import org.micai.platform.auth.constant.ConstantEnum;
import org.micai.platform.auth.dto.UserAuthenticationDto;
import org.micai.platform.auth.entity.User;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import org.micai.platform.auth.mapper.UserMapper;
import org.micai.platform.auth.service.UserService;
import org.micai.platform.auth.utils.AuthenticationManger;
diff --git a/src/main/java/org/micai/platform/auth/utils/MD5.java b/src/main/java/org/micai/platform/auth/utils/MD5.java
index 086c54beee6bcd02c4c442bd3352a1cc8b7e1c7b..939967231d47a49bc5a8d236a05a4c2cb1ac0241 100644
--- a/src/main/java/org/micai/platform/auth/utils/MD5.java
+++ b/src/main/java/org/micai/platform/auth/utils/MD5.java
@@ -1,7 +1,7 @@
package org.micai.platform.auth.utils;
import org.apache.commons.lang3.StringUtils;
-import org.micai.platform.auth.exception.PlatformException;
+import org.micai.platform.auth.base.exception.PlatformException;
import java.math.BigInteger;
import java.security.MessageDigest;
diff --git a/src/main/java/org/micai/platform/auth/vo/OrganListVo.java b/src/main/java/org/micai/platform/auth/vo/OrganListVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..c799fe9d9fdfb0bea17561543ccac441a3de31ca
--- /dev/null
+++ b/src/main/java/org/micai/platform/auth/vo/OrganListVo.java
@@ -0,0 +1,46 @@
+package org.micai.platform.auth.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author liuCong
+ * @Date 2021/12/29 15:38
+ * @ClassName RoleListVo
+ * @Description
+ */
+@Data
+@ApiModel(value = "组织列表")
+public class OrganListVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+
+ @ApiModelProperty(value = "机构编码")
+ private String code;
+
+ @ApiModelProperty(value = "机构名称")
+ private String name;
+
+ @ApiModelProperty(value = "机构类型")
+ private String type;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createUserId;
+
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ @ApiModelProperty(value = "修改人")
+ private Long updateUserId;
+
+ @ApiModelProperty(value = "修改时间")
+ private Date updateTime;
+
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 84fd4caa7c4e0a3fd6b9ab8253c435a738f6996d..e6c261680060ba36ad2bdb4ce738bb0f71ed9873 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,8 +8,9 @@ spring:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
username: root
- password: ly1218
+ password: root
#签名key
sign:
- key: spring-security-@Jwt!&Secret^#
\ No newline at end of file
+ key: spring-security-@Jwt!&Secret^#
+ password: root
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b331fc00f0237f6f7f5cb6507b95fef60f274cba..7d5311584f65f23b5275edd230bdc3589400c492 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,6 +5,9 @@ spring:
matching-strategy: ant_path_matcher
profiles:
active: dev
+ devtools:
+ restart:
+ enabled: true
#mybatis-plus
mybatis-plus:
diff --git a/src/test/java/org/micai/platform/auth/LogTests.java b/src/test/java/org/micai/platform/auth/LogTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..c9d5418e23dbd2f2b28aa1e6d2c7600af20e138c
--- /dev/null
+++ b/src/test/java/org/micai/platform/auth/LogTests.java
@@ -0,0 +1,34 @@
+package org.micai.platform.auth;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @Author zhaoxinguo
+ * @Date 2021-12-13 15:34
+ * @ClassName LogTests
+ * @Description 日志输出测试类
+ */
+@SpringBootTest
+@RunWith(SpringJUnit4ClassRunner.class)
+public class LogTests {
+
+ Logger logger = LoggerFactory.getLogger(Logger.class);
+
+ @Test
+ public void contextLoad() {
+ // 可以调整日志级别、日志的输出会按照这个配置的级别及以上的级别生效
+ // 日志级别从低到高分为:TRACE < DEBUG < INFO < WARN < ERROR < FATAL
+ logger.trace("这是trace日志......");
+ logger.debug("这是debug日志......");
+ logger.info("这是info日志......");
+ logger.warn("这是warn日志......");
+ logger.error("这是error日志......");
+ }
+
+
+}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
new file mode 100644
index 0000000000000000000000000000000000000000..c92166330255f909afcecc127f53648643bb1dfb
--- /dev/null
+++ b/src/test/resources/application.properties
@@ -0,0 +1,42 @@
+# MySQL
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/security?prepStmtCacheSize=517&cachePrepStmts=true&autoReconnect=true&characterEncoding=utf-8&allowMultiQueries=true
+spring.datasource.username=root
+spring.datasource.password=root
+
+# JPA
+#spring.jpa.hibernate.ddl-auto=update
+#spring.jpa.show-sql=true
+#spring.jackson.serialization.indent_output=true
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
+
+# JWT Config
+jwt.header=Authorization
+jwt.secret=NDU0NTY4amhmc3NkeHp6eGNxdzIlMjFAJTIxQCUyM2ZmNQ==
+jwt.expiration=7200000
+
+#mybatis-plus
+mybatis-plus.global-config.db-config.insert-strategy=not_empty
+mybatis-plus.global-config.db-config.update-strategy=not_empty
+mybatis-plus.global-config.db-config.where-strategy=not_empty
+#mybatis-plus.mapper-locations=
+mybatis-plus.global-config.db-config.id-type=auto
+mybatis-plus.configuration.map-underscore-to-camel-case=true
+mybatis-plus.global-config.db-config.table-prefix=tb_
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+
+#log level config
+logging.level.org.micai.platform.auto=warn
+logging.level.org.springframework.web=debug
+#logging.level.org.hibernate=error
+logging.file.name=auth.log
+logging.file.path=/opt/auth/logs
+
+site.location=${user.dir}
+site.options.storage_max_width=800
+site.options.storage_limit_size=2
+site.options.thumbnail_channel_size=200x112
+site.options.thumbnail_post_size=360x200
+
+
+