Browse Source

权限管理模块整理(去除无用类)

songxinlu 3 years ago
parent
commit
d08d0b74a3
100 changed files with 39 additions and 6410 deletions
  1. 5 32
      security-center/pom.xml
  2. 1 0
      security-center/src/main/java/com/lantone/security/config/CustomTokenEnhancer.java
  3. 0 33
      security-center/src/main/java/com/lantone/security/config/MybatisPlusConfigurer.java
  4. 0 298
      security-center/src/main/java/com/lantone/security/config/security/UrlAccessDecisionManager.java
  5. 0 29
      security-center/src/main/java/com/lantone/security/config/security/UrlConfigAttribute.java
  6. 0 79
      security-center/src/main/java/com/lantone/security/config/security/UrlFilterSecurityInterceptor.java
  7. 0 40
      security-center/src/main/java/com/lantone/security/config/security/UrlMetadataSourceService.java
  8. 0 23
      security-center/src/main/java/com/lantone/security/dto/BasDeptInfoDTO.java
  9. 0 38
      security-center/src/main/java/com/lantone/security/dto/BasHospitalInfoDTO.java
  10. 0 20
      security-center/src/main/java/com/lantone/security/dto/ColumnDTO.java
  11. 0 16
      security-center/src/main/java/com/lantone/security/dto/DeptBaseDTO.java
  12. 1 2
      security-center/src/main/java/com/lantone/security/dto/JwtDTO.java
  13. 0 20
      security-center/src/main/java/com/lantone/security/dto/LoginDTO.java
  14. 0 48
      security-center/src/main/java/com/lantone/security/dto/SysDictionaryInfoDTO.java
  15. 0 21
      security-center/src/main/java/com/lantone/security/dto/SysMenuPermissionDTO.java
  16. 0 18
      security-center/src/main/java/com/lantone/security/dto/SysPermissionDTO.java
  17. 0 53
      security-center/src/main/java/com/lantone/security/dto/SysRoleDTO.java
  18. 0 24
      security-center/src/main/java/com/lantone/security/dto/SysRoleMenuDTO.java
  19. 0 20
      security-center/src/main/java/com/lantone/security/dto/SysUserDeptDTO.java
  20. 0 33
      security-center/src/main/java/com/lantone/security/dto/SysUserPagesetDTO.java
  21. 0 33
      security-center/src/main/java/com/lantone/security/dto/SysUserPermissionDTO.java
  22. 0 27
      security-center/src/main/java/com/lantone/security/dto/SysUserQueryDTO.java
  23. 0 19
      security-center/src/main/java/com/lantone/security/dto/SysUserRoleDTO.java
  24. 0 18
      security-center/src/main/java/com/lantone/security/dto/UnModifyMRDTO.java
  25. 0 21
      security-center/src/main/java/com/lantone/security/dto/UnModifyMRDetailDTO.java
  26. 0 40
      security-center/src/main/java/com/lantone/security/dto/UserLoginDTO.java
  27. 0 181
      security-center/src/main/java/com/lantone/security/entity/BasDeptInfo.java
  28. 0 171
      security-center/src/main/java/com/lantone/security/entity/BasDoctorInfo.java
  29. 0 223
      security-center/src/main/java/com/lantone/security/entity/BasHospitalInfo.java
  30. 0 481
      security-center/src/main/java/com/lantone/security/entity/BehospitalInfo.java
  31. 0 195
      security-center/src/main/java/com/lantone/security/entity/SysDictionaryInfo.java
  32. 0 104
      security-center/src/main/java/com/lantone/security/entity/SysMenu.java
  33. 0 170
      security-center/src/main/java/com/lantone/security/entity/SysPermission.java
  34. 0 184
      security-center/src/main/java/com/lantone/security/entity/SysRole.java
  35. 0 153
      security-center/src/main/java/com/lantone/security/entity/SysRoleMenu.java
  36. 0 153
      security-center/src/main/java/com/lantone/security/entity/SysRolePermission.java
  37. 0 78
      security-center/src/main/java/com/lantone/security/entity/SysTaskCron.java
  38. 0 196
      security-center/src/main/java/com/lantone/security/entity/SysUser.java
  39. 0 167
      security-center/src/main/java/com/lantone/security/entity/SysUserDept.java
  40. 0 153
      security-center/src/main/java/com/lantone/security/entity/SysUserHospital.java
  41. 0 197
      security-center/src/main/java/com/lantone/security/entity/SysUserPageset.java
  42. 0 153
      security-center/src/main/java/com/lantone/security/entity/SysUserRole.java
  43. 4 79
      security-center/src/main/java/com/lantone/security/entity/SysUserUaa.java
  44. 0 21
      security-center/src/main/java/com/lantone/security/entity/wrapper/SysMenuWrapper.java
  45. 0 44
      security-center/src/main/java/com/lantone/security/facade/BasDeptInfoFacade.java
  46. 0 47
      security-center/src/main/java/com/lantone/security/facade/BasHospitalInfoFacade.java
  47. 0 64
      security-center/src/main/java/com/lantone/security/facade/SysDictionaryFacade.java
  48. 0 130
      security-center/src/main/java/com/lantone/security/facade/SysMenuFacade.java
  49. 0 206
      security-center/src/main/java/com/lantone/security/facade/SysRoleFacade.java
  50. 0 13
      security-center/src/main/java/com/lantone/security/facade/SysUserDeptFacade.java
  51. 0 711
      security-center/src/main/java/com/lantone/security/facade/SysUserFacade.java
  52. 0 13
      security-center/src/main/java/com/lantone/security/facade/SysUserHospitalFacade.java
  53. 0 117
      security-center/src/main/java/com/lantone/security/facade/SysUserPagesetFacade.java
  54. 0 13
      security-center/src/main/java/com/lantone/security/facade/SysUserRoleFacade.java
  55. 0 33
      security-center/src/main/java/com/lantone/security/mapper/BasDeptInfoMapper.java
  56. 0 20
      security-center/src/main/java/com/lantone/security/mapper/BasDoctorInfoMapper.java
  57. 0 17
      security-center/src/main/java/com/lantone/security/mapper/BasHospitalInfoMapper.java
  58. 0 16
      security-center/src/main/java/com/lantone/security/mapper/BehospitalInfoMapper.java
  59. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysDictionaryInfoMapper.java
  60. 0 38
      security-center/src/main/java/com/lantone/security/mapper/SysMenuMapper.java
  61. 0 19
      security-center/src/main/java/com/lantone/security/mapper/SysPermissionMapper.java
  62. 0 21
      security-center/src/main/java/com/lantone/security/mapper/SysRoleMapper.java
  63. 0 16
      security-center/src/main/java/com/lantone/security/mapper/SysRoleMenuMapper.java
  64. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysRolePermissionMapper.java
  65. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysUserDeptMapper.java
  66. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysUserHospitalMapper.java
  67. 0 20
      security-center/src/main/java/com/lantone/security/mapper/SysUserMapper.java
  68. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysUserPagesetMapper.java
  69. 0 17
      security-center/src/main/java/com/lantone/security/mapper/SysUserRoleMapper.java
  70. 0 18
      security-center/src/main/java/com/lantone/security/mapper/SysUserUaaMapper.java
  71. 0 34
      security-center/src/main/java/com/lantone/security/service/BasDeptInfoService.java
  72. 0 17
      security-center/src/main/java/com/lantone/security/service/BasDoctorInfoService.java
  73. 0 17
      security-center/src/main/java/com/lantone/security/service/BasHospitalInfoService.java
  74. 0 18
      security-center/src/main/java/com/lantone/security/service/BehospitalInfoService.java
  75. 0 17
      security-center/src/main/java/com/lantone/security/service/SysDictionaryInfoService.java
  76. 0 37
      security-center/src/main/java/com/lantone/security/service/SysMenuService.java
  77. 0 17
      security-center/src/main/java/com/lantone/security/service/SysRoleMenuService.java
  78. 0 17
      security-center/src/main/java/com/lantone/security/service/SysRolePermissionService.java
  79. 0 21
      security-center/src/main/java/com/lantone/security/service/SysRoleService.java
  80. 0 17
      security-center/src/main/java/com/lantone/security/service/SysTaskCronService.java
  81. 0 17
      security-center/src/main/java/com/lantone/security/service/SysUserDeptService.java
  82. 0 17
      security-center/src/main/java/com/lantone/security/service/SysUserHospitalService.java
  83. 0 17
      security-center/src/main/java/com/lantone/security/service/SysUserPagesetService.java
  84. 0 17
      security-center/src/main/java/com/lantone/security/service/SysUserRoleService.java
  85. 0 20
      security-center/src/main/java/com/lantone/security/service/SysUserService.java
  86. 28 23
      security-center/src/main/java/com/lantone/security/service/UrlUserService.java
  87. 0 55
      security-center/src/main/java/com/lantone/security/service/impl/BasDeptInfoServiceImpl.java
  88. 0 29
      security-center/src/main/java/com/lantone/security/service/impl/BasDoctorInfoServiceImpl.java
  89. 0 21
      security-center/src/main/java/com/lantone/security/service/impl/BasHospitalInfoServiceImpl.java
  90. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/BehospitalInfoServiceImpl.java
  91. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysDictionaryInfoServiceImpl.java
  92. 0 52
      security-center/src/main/java/com/lantone/security/service/impl/SysMenuServiceImpl.java
  93. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysRoleMenuServiceImpl.java
  94. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysRolePermissionServiceImpl.java
  95. 0 28
      security-center/src/main/java/com/lantone/security/service/impl/SysRoleServiceImpl.java
  96. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysUserDeptServiceImpl.java
  97. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysUserHospitalServiceImpl.java
  98. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysUserPagesetServiceImpl.java
  99. 0 20
      security-center/src/main/java/com/lantone/security/service/impl/SysUserRoleServiceImpl.java
  100. 0 0
      security-center/src/main/java/com/lantone/security/service/impl/SysUserServiceImpl.java

+ 5 - 32
security-center/pom.xml

@@ -14,10 +14,7 @@
     <description>Demo project for Spring Boot</description>
     <description>Demo project for Spring Boot</description>
     <properties>
     <properties>
         <java.version>1.8</java.version>
         <java.version>1.8</java.version>
-        <swagger.version>2.9.2</swagger.version>
         <logstash.version>5.2</logstash.version>
         <logstash.version>5.2</logstash.version>
-        <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
-        <mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
         <aggregator.version>1.1.0</aggregator.version>
         <aggregator.version>1.1.0</aggregator.version>
         <druid.version>1.1.21</druid.version>
         <druid.version>1.1.21</druid.version>
         <easypoi.version>4.2.0</easypoi.version>
         <easypoi.version>4.2.0</easypoi.version>
@@ -36,6 +33,11 @@
             <artifactId>common</artifactId>
             <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>com.lantone</groupId>
+            <artifactId>dblayer-mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <!-- 开启web-->
         <!-- 开启web-->
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
@@ -73,11 +75,6 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         </dependency>
 
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <!--security-->
         <!--security-->
         <dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <groupId>org.springframework.cloud</groupId>
@@ -96,30 +93,6 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${logstash.version}</version>
             <version>${logstash.version}</version>
         </dependency>
         </dependency>
-        <!-- mybatis-plus begin -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>${mybatis-plus-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <!-- mybatis-plus end -->
-        <!-- 阿里巴巴druid数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>${druid.version}</version>
-        </dependency>
-
 
 
         <!--redis设置-->
         <!--redis设置-->
         <dependency>
         <dependency>

+ 1 - 0
security-center/src/main/java/com/lantone/security/config/CustomTokenEnhancer.java

@@ -22,6 +22,7 @@ public class CustomTokenEnhancer implements TokenEnhancer {
         SysUserUaa user = (SysUserUaa) authentication.getUserAuthentication().getPrincipal();
         SysUserUaa user = (SysUserUaa) authentication.getUserAuthentication().getPrincipal();
         additionalInfo.put("user_id", user.getId());
         additionalInfo.put("user_id", user.getId());
         additionalInfo.put("hosp_id", user.getHospitalId());
         additionalInfo.put("hosp_id", user.getHospitalId());
+        additionalInfo.put("functionAuthorities", user.getFunctionAuthorities());
         //		additionalInfo.put("authorities", user.getAuthorities());
         //		additionalInfo.put("authorities", user.getAuthorities());
         ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
         ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
         return accessToken;
         return accessToken;

+ 0 - 33
security-center/src/main/java/com/lantone/security/config/MybatisPlusConfigurer.java

@@ -1,33 +0,0 @@
-package com.lantone.security.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * @Description: MybatisPlus配置类
- * @author: gaodm
- * @time: 2018/8/2 13:39
- */
-@EnableTransactionManagement
-@Configuration
-@MapperScan("com.lantone.security.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfigurer {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档:http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
-        //paginationInterceptor.setOverflow(false);
-        // 设置最大单页限制数量,默认500条,-1不受限制
-        paginationInterceptor.setLimit(-1L);
-        return paginationInterceptor;
-    }
-
-}

+ 0 - 298
security-center/src/main/java/com/lantone/security/config/security/UrlAccessDecisionManager.java

@@ -1,298 +0,0 @@
-package com.lantone.security.config.security;
-
-import com.diagbot.util.HttpUtils;
-import com.diagbot.util.StringUtil;
-import com.lantone.security.facade.TokenFacade;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.AccessDecisionManager;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.authentication.AccountExpiredException;
-import org.springframework.security.authentication.InsufficientAuthenticationException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.web.FilterInvocation;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-
-/**
- * @Description: 自定义权限拦截
- * @author: gaodm
- * @time: 2018/8/23 13:46
- */
-@Service
-public class UrlAccessDecisionManager implements AccessDecisionManager {
-    @Autowired
-    private TokenFacade tokenFacade;
-
-    @Override
-    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
-        HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
-        String url, method;
-        //拦一刀分出不同系统权限
-        if (matchPermitAllUrl(request)) {
-            return;
-        }
-        if ("anonymousUser".equals(authentication.getPrincipal())) {
-            throw new AccessDeniedException("no right");
-        } else {
-            String tokenStr = HttpUtils.getHeaders(request).get("Authorization");
-            if (StringUtil.isNotEmpty(tokenStr)) {
-                tokenStr = tokenStr.replaceFirst("Bearer ", "");
-                Boolean res = tokenFacade.verifyToken(tokenStr, 1);
-                if (!res) {
-                    throw new AccountExpiredException("token expire");
-                }
-            }
-            for (GrantedAuthority ga : authentication.getAuthorities()) {
-                String[] authority = ga.getAuthority().split(";");
-                url = authority[0];
-                method = authority[1];
-                if (matchers(url, request)) {
-                    if (method.equals(request.getMethod()) || "ALL".equals(method)) {
-                        return;
-                    }
-                }
-            }
-        }
-        throw new AccessDeniedException("no right");
-    }
-
-
-    @Override
-    public boolean supports(ConfigAttribute attribute) {
-        return true;
-    }
-
-    @Override
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
-
-    private Boolean matchPermitAllUrl(HttpServletRequest request) {
-        if (matchers("/swagger/**", request)
-                || matchers("/v2/**", request)
-                || matchers("/swagger-ui.html/**", request)
-                || matchers("/swagger-resources/**", request)
-                || matchers("/webjars/**", request)
-                || matchers("/druid/**", request)
-                || matchers("/actuator/**", request)
-                || matchers("/hystrix/**", request)
-                || matchers("/sys/user/getJwt", request)
-                || matchers("/sys/user/getJwtNoPass", request)
-                || matchers("/sys/user/refreshJwt", request)
-                || matchers("/sys/dictionaryInfo/getDictionary", request)
-                || matchers("/sys/user/checkToken", request)
-                || matchers("/oauth/token", request)
-                || matchers("/oauth/check_token", request)
-                || matchers("/cache/clear", request)
-                || matchers("/qc/behospitalInfo/execule", request)
-                || matchers("/qc/behospitalInfo/analyze_rpc", request)
-                || matchers("/qc/behospitalInfo/analyze_api", request)
-                || matchers("/qc/behospitalInfo/analyze_run", request)
-                || matchers("/qc/module/getById", request)
-                || matchers("/qc/module/getModuleMap", request)
-                || matchers("/qc/cases/getQcCases", request)
-                || matchers("/qc/behospitalInfo/page", request)
-                || matchers("/qc/casesEntryHospital/getQcCasesEntryAll", request)
-                || matchers("/qc/casesEntryHospital/getQcCasesAll", request)
-                || matchers("/qc/behospitalInfo/getByBehospitalCode", request)
-                || matchers("/bas/dept/getList", request)
-                || matchers("/bas/dept/getListUser", request)
-                || matchers("/qc/behospitalInfo/page_dept", request)
-                || matchers("/qc/behospitalInfo/page_person", request)
-                || matchers("/qc/behospitalInfo/page_group", request)
-                || matchers("/qc/casesEntryHospital/findQcCasesEntry", request)
-                || matchers("/qc/behospitalInfo/exportExcel", request)
-                || matchers("/qc/dataimport/import", request)
-                || matchers("/qc/dataimport/test", request)
-                || matchers("/qc/behospitalInfo/exportExcel", request)
-                || matchers("/qc/behospitalInfo/exportQcresult", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByDept", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByGroup", request)
-                || matchers("/qc/abnormal/getQcAnnormalMode", request)
-                || matchers("/qc/dataimport/import", request)
-                || matchers("/qc/dataimport/dataimportPrepare", request)
-                || matchers("/qc/dataimport/test", request)
-                || matchers("/sys/user/pageset/getPageSet", request)
-                || matchers("/sys/user/pageset/savePageSet", request)
-                || matchers("/sys/user/pageset/getDefaultPageSet", request)
-                || matchers("/consoleByDept/getDept", request)
-                || matchers("/console/entryRejectPercent", request)
-                || matchers("/console/qcResultLevelPercent", request)
-                || matchers("/console/averageStatistics", request)
-                || matchers("/console/entryByDept", request)
-                || matchers("/console/entryCountGroupByCase", request)
-                || matchers("/console/entryCountGroupByCasePage", request)
-                || matchers("/console/entryCountGroupByEntry", request)
-                || matchers("/console/entryCountGroupByEntryPage", request)
-                || matchers("/console/entryGroupByEntryInnerPage", request)
-                || matchers("/console/getAverageDayNum", request)
-                || matchers("/console/getAverageDayNumPage", request)
-                || matchers("/console/getAverageFee", request)
-                || matchers("/console/getAverageFeePage", request)
-                || matchers("/console/getAverageScore", request)
-                || matchers("/console/getAverageScoreByDeptClass", request)
-                || matchers("/console/getAverageScoreByDeptPage", request)
-                || matchers("/console/getLevelResultDept", request)
-                || matchers("/console/homePageLevelLimit", request)
-                || matchers("/console/homePageLevelStatistics", request)
-                || matchers("/console/leaveHosCount", request)
-                || matchers("/console/levelPercentGroupByDeptPage", request)
-                || matchers("/console/levelStatistics", request)
-                || matchers("/console/levelStatisticsByDeptClass", request)
-                || matchers("/console/mrCount", request)
-                || matchers("/console/mrStatistics", request)
-                || matchers("/console/medicalRecordIndicator", request)
-                || matchers("/console/codingMonthly", request)
-                || matchers("/console/qcResultShortPage", request)
-                || matchers("/console/resultStatistics", request)
-                || matchers("/console/resultStatisticsByDeptPage", request)
-                || matchers("/console/homePageMRCount", request)
-                || matchers("/console/qcCheckStatistics", request)
-                || matchers("/console/unModifyMRStatistics", request)
-                || matchers("/console/unModifyMRPage", request)
-                || matchers("/console/reHos31DaysPage", request)
-                || matchers("/console/beHosCount", request)
-                || matchers("/console/casesEntryStatisticsById", request)
-                || matchers("/console/hmImproveMRPage", request)
-                || matchers("/console/qcCheckMRPage", request)
-                || matchers("/consoleByDept/entryCountGroupByCaseAndDept", request)
-                || matchers("/consoleByDept/entryCountGroupByCaseAndDeptPage", request)
-                || matchers("/consoleByDept/entryCountGroupByEntryAndDept", request)
-                || matchers("/consoleByDept/entryCountGroupByEntryAndDeptPage", request)
-                || matchers("/consoleByDept/entryGroupByEntryAndDeptInnerPage", request)
-                || matchers("/consoleByDept/homePageLevelByDeptLimit", request)
-                || matchers("/consoleByDept/homePageLevelStatisticsByDept", request)
-                || matchers("/consoleByDept/leaveHosCountByDept", request)
-                || matchers("/consoleByDept/levelStatisticsByDept", request)
-                || matchers("/consoleByDept/mrCountByDept", request)
-                || matchers("/consoleByDept/qcResultShortByDeptPage", request)
-                || matchers("/consoleByDept/resultStatisticsByDeptAndDoctorPage", request)
-                || matchers("/console/export/homePageLevelExport", request)
-                || matchers("/console/export/entryGroupByEntryExport", request)
-                || matchers("/console/export/levelExport", request)
-                || matchers("/console/entryStatistics", request)
-                || matchers("/console/export/levelExport_TZ", request)
-                || matchers("/console/export/getAverageDayNumExport", request)
-                || matchers("/console/export/getAverageFeeExport", request)
-                || matchers("/console/export/levelPercentGroupByDeptExport", request)
-                || matchers("/console/export/entryCountGroupByEntryExport", request)
-                || matchers("/console/export/entryCountGroupByCaseExport", request)
-                || matchers("/console/export/entryStatisticsExport", request)
-                || matchers("/console/export/qcResultShortPageExport", request)
-                || matchers("/console/export/leaveHosMrPageExport", request)
-                || matchers("/console/export/qcCheckStatisticsExport", request)
-                || matchers("/console/export/unModifyMRPageExport", request)
-                || matchers("/console/export/unModifyMRStatisticsExport", request)
-                || matchers("/console/export/reHos31DaysPageExport", request)
-                || matchers("/console/export/hmImproveMRPageExport", request)
-                || matchers("/console/export/qcCheckMRPageExport", request)
-                || matchers("/qc/data/sendDoctorInfos", request)
-                || matchers("/qc/data/sendDeptInfos", request)
-                || matchers("/qc/data/sendRecordTypes", request)
-                || matchers("/qc/data/sendMrRecordIng", request)
-                || matchers("/qc/data/sendMrContent", request)
-                || matchers("/qc/data/sendMrRecord", request)
-                || matchers("/qc/data/sendPatientInfo", request)
-                || matchers("/qc/data/sendDoctorAdvice", request)
-                || matchers("/qc/data/sendHomePageIng", request)
-                || matchers("/qc/data/sendHomePage", request)
-                || matchers("/qc/data/sendHomeDiagnose", request)
-                || matchers("/qc/data/sendHomeOperation", request)
-                || matchers("/qc/data/sendCrisis", request)
-                || matchers("/qc/data/deleteFlag", request)
-                || matchers("/qc/data/placeFile", request)
-                || matchers("/qc/data/sendLisResults", request)
-                || matchers("/qc/data/sendPacsResults", request)
-                || matchers("/qc/data/getColumnZhAndCh", request)
-                || matchers("/qc/data/analyseRec", request)
-                || matchers("/qc/data/hisDataDeal", request)
-                || matchers("/qc/data_str/sendAdmissionNote", request)
-                || matchers("/qc/data_str/sendBloodResult", request)
-                || matchers("/qc/data_str/sendBloodTransfusion", request)
-                || matchers("/qc/data_str/sendConsultationApply", request)
-                || matchers("/qc/data_str/sendConsultationNote", request)
-                || matchers("/qc/data_str/sendConsultationRecord", request)
-                || matchers("/qc/data_str/sendConsultationResult", request)
-                || matchers("/qc/data_str/sendCrisisNote", request)
-                || matchers("/qc/data_str/sendDeathDiscussion", request)
-                || matchers("/qc/data_str/sendDeathNote", request)
-                || matchers("/qc/data_str/sendDifficultCase", request)
-                || matchers("/qc/data_str/sendFirstRecord", request)
-                || matchers("/qc/data_str/sendIllCritically", request)
-                || matchers("/qc/data_str/sendIllSeriousl", request)
-                || matchers("/qc/data_str/sendLeaveHospital", request)
-                || matchers("/qc/data_str/sendOperativeFirstRecord", request)
-                || matchers("/qc/data_str/sendOperativeNote", request)
-                || matchers("/qc/data_str/sendWardRecord", request)
-                || matchers("/qc/data_str/sendTransferOutNote", request)
-                || matchers("/qc/data_str/sendTransferInNote", request)
-                || matchers("/qc/data_str/sendRescueNote", request)
-                || matchers("/qc/data_str/sendPeriodConclusion", request)
-                || matchers("/qc/data_str/sendPreoperativeDiscussion", request)
-                || matchers("/qc/data_str/sendTalkInform", request)
-                || matchers("/qc/data_str/sendInformedConsent", request)
-                || matchers("/qc/data_str/sendContent", request)
-                || matchers("/qc/doctoradvice/getPage", request)
-                || matchers("/qc/medPacsInfo/getCheckPage", request)
-                || matchers("/qc/medLisInfo/getExaminePage", request)
-                || matchers("/qc/behospitalInfo/analyzeCds", request)
-                || matchers("/qc/medLisInfo/getExamineSonPage", request)
-                || matchers("/console/medicalCheckForm", request)
-                || matchers("/console/medicalCheckTitle", request)
-                || matchers("/console/export/medicalCheckExport", request)
-                || matchers("/console/export/medicalCheckInnerExport", request)
-                || matchers("/console/badLevelPage", request)
-                || matchers("/console/export/badLevelPagePageExport", request)
-                || matchers("/qc/medNurse/getMedNursePage", request)
-                || matchers("/qc/behospitalInfo/exportQcresultByPerson", request)
-                || matchers("/consoleByDept/beHosCountByDept", request)
-                || matchers("/consoleByDept/casesEntryStatisticsByDept", request)
-                || matchers("/bas/doctor/getList", request)
-                || matchers("/consoleByDept/homePageOrGoodLevelByDept", request)
-                || matchers("/print/export/homePageLevelExportByDept", request)
-                || matchers("/print/export/homePageOrLevelExportByDept", request)
-                || matchers("/print/export/entryGroupExportByDeptPage", request)
-                || matchers("/print/export/entryGroupExportByDeptCase", request)
-                || matchers("/print/export/entryGroupExportByDeptEntry", request)
-                || matchers("/print/export/qcResultShortExportByDeptPage", request)
-                || matchers("/print/export/levelExportByDept", request)
-                || matchers("/consoleByDept/entryStatisticsByDept", request)
-                || matchers("/print/export/entryStatisticsExportByDept", request)
-                || matchers("/consoleByDept/leaveHosMRPageByDept", request)
-                || matchers("/print/export/leaveHosMrPageExportByDept", request)
-                || matchers("/consoleByDept/qcCheckStatisticsByDept", request)
-                || matchers("/print/export/qcCheckStaExportByDept", request)
-                || matchers("/consoleByDept/qcCheckMRPageByDept", request)
-                || matchers("/print/export/qcCheckMRPageExportByDept", request)
-                || matchers("/consoleByDept/hmImproveMRPageByDept", request)
-                || matchers("/print/export/improveMRExportByDept", request)
-                || matchers("/consoleByDept/reHos31DaysPageByDept", request)
-                || matchers("/print/export/reHos31DaysPageExportByDept", request)
-                || matchers("/consoleByDept/unModifyMRSByDept", request)
-                || matchers("/print/export/unModifyMRSExportByDept", request)
-                || matchers("/consoleByDept/unModifyMRPageByDept", request)
-                || matchers("/print/export/unModifyMRPageExportByDept", request)
-                || matchers("/consoleByDept/medicalCheckFormKs", request)
-                || matchers("/print/export/medicalCheckExportByDept", request)
-                || matchers("/consoleByDept/medicalCheckTitleKs", request)
-                || matchers("/qc/medCheckInfo/createMedBeHospitalInfoType", request)
-                || matchers("/", request)) {
-            return true;
-        }
-        return false;
-    }
-
-
-    private boolean matchers(String url, HttpServletRequest request) {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher(url);
-        if (matcher.matches(request)) {
-            return true;
-        }
-        return false;
-    }
-}

+ 0 - 29
security-center/src/main/java/com/lantone/security/config/security/UrlConfigAttribute.java

@@ -1,29 +0,0 @@
-package com.lantone.security.config.security;
-
-import org.springframework.security.access.ConfigAttribute;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @Description: 自定义权限拦截
- * @author: gaodm
- * @time: 2018/8/23 13:47
- */
-public class UrlConfigAttribute implements ConfigAttribute {
-
-    private final HttpServletRequest httpServletRequest;
-
-    public UrlConfigAttribute(HttpServletRequest httpServletRequest) {
-        this.httpServletRequest = httpServletRequest;
-    }
-
-
-    @Override
-    public String getAttribute() {
-        return null;
-    }
-
-    public HttpServletRequest getHttpServletRequest() {
-        return httpServletRequest;
-    }
-}

+ 0 - 79
security-center/src/main/java/com/lantone/security/config/security/UrlFilterSecurityInterceptor.java

@@ -1,79 +0,0 @@
-package com.lantone.security.config.security;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.SecurityMetadataSource;
-import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
-import org.springframework.security.access.intercept.InterceptorStatusToken;
-import org.springframework.security.web.FilterInvocation;
-import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import java.io.IOException;
-
-/**
- * @Description: 自定义权限拦截
- * @author: gaodm
- * @time: 2018/8/23 13:47
- */
-@Service
-public class UrlFilterSecurityInterceptor extends AbstractSecurityInterceptor implements Filter {
-
-
-    @Autowired
-    private FilterInvocationSecurityMetadataSource securityMetadataSource;
-
-    @Autowired
-    public void setUrlAccessDecisionManager(UrlAccessDecisionManager urlAccessDecisionManager) {
-        super.setAccessDecisionManager(urlAccessDecisionManager);
-    }
-
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-
-        FilterInvocation fi = new FilterInvocation(request, response, chain);
-        invoke(fi);
-    }
-
-
-    public void invoke(FilterInvocation fi) throws IOException, ServletException {
-        //fi里面有一个被拦截的url
-        //里面调用UrlMetadataSource的getAttributes(Object object)这个方法获取fi对应的所有权限
-        //再调用UrlAccessDecisionManager的decide方法来校验用户的权限是否足够
-        InterceptorStatusToken token = super.beforeInvocation(fi);
-        try {
-            //执行下一个拦截器
-            fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
-        } finally {
-            super.afterInvocation(token, null);
-        }
-    }
-
-
-    @Override
-    public void destroy() {
-
-    }
-
-    @Override
-    public Class<?> getSecureObjectClass() {
-        return FilterInvocation.class;
-
-    }
-
-    @Override
-    public SecurityMetadataSource obtainSecurityMetadataSource() {
-        return this.securityMetadataSource;
-    }
-}

+ 0 - 40
security-center/src/main/java/com/lantone/security/config/security/UrlMetadataSourceService.java

@@ -1,40 +0,0 @@
-package com.lantone.security.config.security;
-
-import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.web.FilterInvocation;
-import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @Description: 自定义权限拦截
- * @author: gaodm
- * @time: 2018/8/23 13:47
- */
-@Service
-public class UrlMetadataSourceService implements
-        FilterInvocationSecurityMetadataSource {
-
-    @Override
-    public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
-        final HttpServletRequest request = ((FilterInvocation) object).getRequest();
-        Set<ConfigAttribute> allAttributes = new HashSet<>();
-        ConfigAttribute configAttribute = new UrlConfigAttribute(request);
-        allAttributes.add(configAttribute);
-        return allAttributes;
-    }
-
-    @Override
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        return null;
-    }
-
-    @Override
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
-}

+ 0 - 23
security-center/src/main/java/com/lantone/security/dto/BasDeptInfoDTO.java

@@ -1,23 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 18:56
- */
-@Getter
-@Setter
-public class BasDeptInfoDTO {
-    /**
-     * 科室编码(HIS导入)
-     */
-    private String deptId;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-}

+ 0 - 38
security-center/src/main/java/com/lantone/security/dto/BasHospitalInfoDTO.java

@@ -1,38 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/12 11:37
- */
-@Getter
-@Setter
-public class BasHospitalInfoDTO {
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 医院名称
-     */
-    private String name;
-
-    /**
-     * 组织机构代码
-     */
-    private String code;
-
-    /**
-     * 医院名称拼音
-     */
-    private String spell;
-
-    /**
-     * 医院地址
-     */
-    private String address;
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/dto/ColumnDTO.java

@@ -1,20 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/13 17:37
- */
-@Getter
-@Setter
-public class ColumnDTO {
-    private Long id;
-    private String columnName;
-    private String fieldName;
-    private Integer orderNo;
-    private String fieldType;
-    private Integer isShow;
-}

+ 0 - 16
security-center/src/main/java/com/lantone/security/dto/DeptBaseDTO.java

@@ -1,16 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/5/8 19:11
- */
-@Getter
-@Setter
-public class DeptBaseDTO {
-    private String deptId;
-    private String deptName;
-}

+ 1 - 2
security-center/src/main/java/com/lantone/security/dto/JwtDTO.java

@@ -3,7 +3,6 @@ package com.lantone.security.dto;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
-import java.util.List;
 
 
 /**
 /**
  * @Description: jwt 输出类
  * @Description: jwt 输出类
@@ -18,7 +17,7 @@ public class JwtDTO {
     private Integer type; //用户类型
     private Integer type; //用户类型
     private String typeCn; //用户类型中文
     private String typeCn; //用户类型中文
     //用户权限列表
     //用户权限列表
-    private List<SysRoleDTO> selRoles;
+//    private List<SysRoleDTO> selRoles;
     //用户密码复杂度是否符合
     //用户密码复杂度是否符合
 //    private String passwordComplexity;
 //    private String passwordComplexity;
 }
 }

+ 0 - 20
security-center/src/main/java/com/lantone/security/dto/LoginDTO.java

@@ -1,20 +0,0 @@
-package com.lantone.security.dto;
-
-import com.lantone.security.entity.wrapper.SysMenuWrapper;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description: 登录输出类
- * @author: gaodm
- * @time: 2018/8/2 14:22
- */
-@Getter
-@Setter
-public class LoginDTO {
-    private UserLoginDTO userLoginDTO;
-    private BasHospitalInfoDTO basHospitalInfoDTO;
-    private List<SysMenuWrapper> menuWrappers;
-}

+ 0 - 48
security-center/src/main/java/com/lantone/security/dto/SysDictionaryInfoDTO.java

@@ -1,48 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * icss字典表
- * </p>
- *
- * @author zhoutg
- * @since 2018-12-25
- */
-@Getter
-@Setter
-public class SysDictionaryInfoDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 分组(值自定义)
-     */
-    private Long groupType;
-
-    /**
-     * 内容
-     */
-    private String name;
-
-    /**
-     * 值
-     */
-    private String val;
-
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

+ 0 - 21
security-center/src/main/java/com/lantone/security/dto/SysMenuPermissionDTO.java

@@ -1,21 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 13:40
- */
-@Getter
-@Setter
-public class SysMenuPermissionDTO {
-    private Long menuId;
-    private String menuName;
-    private Long parentId;
-    private Integer haveMenu;
-    private Long permissionId;
-    private String permissionName;
-    private Integer havePermission;
-}

+ 0 - 18
security-center/src/main/java/com/lantone/security/dto/SysPermissionDTO.java

@@ -1,18 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 13:40
- */
-@Getter
-@Setter
-public class SysPermissionDTO {
-    private Long permissionId;
-    private String permissionName;
-    private Integer havePermission;
-    private Long parentId;
-}

+ 0 - 53
security-center/src/main/java/com/lantone/security/dto/SysRoleDTO.java

@@ -1,53 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 10:59
- */
-@Getter
-@Setter
-public class SysRoleDTO {
-    /**
-     * 角色ID
-     */
-    private Long id;
-
-//    /**
-//     * 是否删除,N:未删除,Y:删除
-//     */
-//    private String isDeleted;
-//
-//    /**
-//     * 记录创建时间
-//     */
-//    private Date gmtCreate;
-//
-//    /**
-//     * 记录修改时间,如果时间是1970年则表示纪录未修改
-//     */
-//    private Date gmtModified;
-//
-//    /**
-//     * 创建人,0表示无创建人值
-//     */
-//    private String creator;
-//
-//    /**
-//     * 修改人,如果为0则表示纪录未修改
-//     */
-//    private String modifier;
-
-    /**
-     * 角色名称
-     */
-    private String name;
-
-    /**
-     * 角色描述
-     */
-    private String descritpion;
-}

+ 0 - 24
security-center/src/main/java/com/lantone/security/dto/SysRoleMenuDTO.java

@@ -1,24 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 11:06
- */
-@Getter
-@Setter
-public class SysRoleMenuDTO {
-    private Long menuId;
-    private String menuName;
-    private Long parentId;
-    private Integer haveMenu;
-    //权限
-    private List<SysPermissionDTO> sysPermissionDTOList;
-    //子菜单
-    private List<SysRoleMenuDTO> sonMenuDTOList;
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/dto/SysUserDeptDTO.java

@@ -1,20 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 9:26
- */
-@Getter
-@Setter
-public class SysUserDeptDTO {
-    private Long userId;
-    private List<BasDeptInfoDTO> notSelDepts;
-    private List<BasDeptInfoDTO> selDepts;
-}

+ 0 - 33
security-center/src/main/java/com/lantone/security/dto/SysUserPagesetDTO.java

@@ -1,33 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/12 10:26
- */
-@Getter
-@Setter
-public class SysUserPagesetDTO {
-    /**
-     * 列名
-     */
-    private String name;
-
-    /**
-     * 列名值
-     */
-    private String val;
-
-    /**
-     * 是否启用(0:停用,1:启用)
-     */
-    private Integer status;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-}

+ 0 - 33
security-center/src/main/java/com/lantone/security/dto/SysUserPermissionDTO.java

@@ -1,33 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 17:14
- */
-@Getter
-@Setter
-public class SysUserPermissionDTO {
-    /**
-     * 菜单ID
-     */
-    private Long menuId;
-
-    /**
-     * 权限ID
-     */
-    private Long permissionId;
-
-    /**
-     * 资源名称
-     */
-    private String name;
-
-    /**
-     * 资源编码
-     */
-    private String code;
-}

+ 0 - 27
security-center/src/main/java/com/lantone/security/dto/SysUserQueryDTO.java

@@ -1,27 +0,0 @@
-package com.lantone.security.dto;
-
-import com.lantone.security.enums.StatusEnum;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 9:17
- */
-@Getter
-@Setter
-public class SysUserQueryDTO {
-    private Long userId;
-    private String userName;
-    private String linkman;
-    private String deptName;
-    private String roleName;
-    private Integer status;
-    private String statusName;
-
-
-    public String getStatusName() {
-        return StatusEnum.getName(this.status);
-    }
-}

+ 0 - 19
security-center/src/main/java/com/lantone/security/dto/SysUserRoleDTO.java

@@ -1,19 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 9:26
- */
-@Getter
-@Setter
-public class SysUserRoleDTO {
-    private Long userId;
-    private List<SysRoleDTO> notSelRoles;
-    private List<SysRoleDTO> selRoles;
-}

+ 0 - 18
security-center/src/main/java/com/lantone/security/dto/UnModifyMRDTO.java

@@ -1,18 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/14 10:19
- */
-@Getter
-@Setter
-public class UnModifyMRDTO {
-    private List<ColumnDTO> columns;
-    private List<Object> data;
-}

+ 0 - 21
security-center/src/main/java/com/lantone/security/dto/UnModifyMRDetailDTO.java

@@ -1,21 +0,0 @@
-package com.lantone.security.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2020/7/13 16:57
- */
-@Getter
-@Setter
-public class UnModifyMRDetailDTO {
-    private String deptId;
-    private String deptName;
-    private String doctorId;
-    private String doctorName;
-    private Long casesEntryId;
-    private String casesEntryName;
-    private Integer casesEntryNum;
-}

+ 0 - 40
security-center/src/main/java/com/lantone/security/dto/UserLoginDTO.java

@@ -1,40 +0,0 @@
-package com.lantone.security.dto;
-
-import com.lantone.security.enums.ConstantEnum;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 登录返回的用户信息
- * @author: gaodm
- * @time: 2018/9/28 15:10
- */
-@Getter
-@Setter
-public class UserLoginDTO {
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 联系人
-     */
-    private String linkman;
-
-    /**
-     * 用户类型
-     */
-    private Integer type;
-
-    /**
-     * 用户类型中文
-     */
-    private String typeCn;
-
-
-    public String getTypeCn() {
-        return ConstantEnum.getName(this.type);
-    }
-}

+ 0 - 181
security-center/src/main/java/com/lantone/security/entity/BasDeptInfo.java

@@ -1,181 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 医院科室信息
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public class BasDeptInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 科室编码(HIS导入)
-     */
-    @TableId(value = "dept_id",type = IdType.INPUT)
-    private String deptId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    private String parentDeptId;
-
-    /**
-     * 科室名称
-     */
-    private String deptName;
-
-    /**
-     * 科室类别
-     */
-    private String deptType;
-
-    /**
-     * 首字母拼音
-     */
-    private String spell;
-
-    /**
-     * 区域类别(门诊、工作站、住院等)
-     */
-    private String station;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getParentDeptId() {
-        return parentDeptId;
-    }
-
-    public void setParentDeptId(String parentDeptId) {
-        this.parentDeptId = parentDeptId;
-    }
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-    public String getDeptType() {
-        return deptType;
-    }
-
-    public void setDeptType(String deptType) {
-        this.deptType = deptType;
-    }
-    public String getSpell() {
-        return spell;
-    }
-
-    public void setSpell(String spell) {
-        this.spell = spell;
-    }
-    public String getStation() {
-        return station;
-    }
-
-    public void setStation(String station) {
-        this.station = station;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "BasDeptInfo{" +
-            "deptId=" + deptId +
-            ", hospitalId=" + hospitalId +
-            ", parentDeptId=" + parentDeptId +
-            ", deptName=" + deptName +
-            ", deptType=" + deptType +
-            ", spell=" + spell +
-            ", station=" + station +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-        "}";
-    }
-}

+ 0 - 171
security-center/src/main/java/com/lantone/security/entity/BasDoctorInfo.java

@@ -1,171 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2020-04-17
- */
-public class BasDoctorInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * HIS导入的医生ID
-     */
-    @TableId(value = "doctor_id",type = IdType.INPUT)
-    private String doctorId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 医院导入科室ID
-     */
-    private String deptId;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 职称
-     */
-    private String professor;
-
-    /**
-     * 职业医师资格
-     */
-    private String occup;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    public String getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(String doctorId) {
-        this.doctorId = doctorId;
-    }
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getProfessor() {
-        return professor;
-    }
-
-    public void setProfessor(String professor) {
-        this.professor = professor;
-    }
-    public String getOccup() {
-        return occup;
-    }
-
-    public void setOccup(String occup) {
-        this.occup = occup;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "BasDoctorInfo{" +
-                "doctorId=" + doctorId +
-                ", hospitalId=" + hospitalId +
-                ", deptId=" + deptId +
-                ", name=" + name +
-                ", professor=" + professor +
-                ", occup=" + occup +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                "}";
-    }
-}

+ 0 - 223
security-center/src/main/java/com/lantone/security/entity/BasHospitalInfo.java

@@ -1,223 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 医院信息表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public class BasHospitalInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 医院名称
-     */
-    private String name;
-
-    /**
-     * 组织机构代码
-     */
-    private String code;
-
-    /**
-     * 医院名称拼音
-     */
-    private String spell;
-
-    /**
-     * 医院地址
-     */
-    private String address;
-
-    /**
-     * 状态:0.禁用1.启用
-     */
-    private Integer status;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 是否对接(0-不对接,1-对接)
-     */
-    private Integer connect;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getSpell() {
-        return spell;
-    }
-
-    public void setSpell(String spell) {
-        this.spell = spell;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public Integer getConnect() {
-        return connect;
-    }
-
-    public void setConnect(Integer connect) {
-        this.connect = connect;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "BasHospitalInfo{" +
-                "id=" + id +
-                ", name=" + name +
-                ", code=" + code +
-                ", spell=" + spell +
-                ", address=" + address +
-                ", status=" + status +
-                ", orderNo=" + orderNo +
-                ", connect=" + connect +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 481
security-center/src/main/java/com/lantone/security/entity/BehospitalInfo.java

@@ -1,481 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 住院病历信息
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@TableName("med_behospital_info")
-@Data
-public class BehospitalInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 病人住院ID
-     */
-    @TableId(value = "behospital_code", type = IdType.INPUT)
-    private String behospitalCode;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 性别(男,女)
-     */
-    private String sex;
-
-    /**
-     * 出生日期
-     */
-    private Date birthday;
-
-    /**
-     * 档案号
-     */
-    private String fileCode;
-
-    /**
-     * 质控类型
-     */
-    private Long qcTypeId;
-
-    /**
-     * 病区编码
-     */
-    private String wardCode;
-
-    /**
-     * 病区名称
-     */
-    private String wardName;
-
-    /**
-     * 住院科室ID
-     */
-    private String behDeptId;
-
-    /**
-     * 住院科室名称
-     */
-    private String behDeptName;
-
-    /**
-     * 床位号
-     */
-    private String bedCode;
-
-    /**
-     * 床位名称
-     */
-    private String bedName;
-
-    /**
-     * 医保类别
-     */
-    private String insuranceName;
-
-    /**
-     * 职业
-     */
-    private String jobType;
-
-    /**
-     * 入院时间
-     */
-    private Date behospitalDate;
-
-    /**
-     * 出院时间
-     */
-    private Date leaveHospitalDate;
-
-    /**
-     * 疾病ICD编码
-     */
-    private String diagnoseIcd;
-
-    /**
-     * 疾病名称
-     */
-    private String diagnose;
-
-    /**
-     * 住院医生ID
-     */
-    private String behDoctorId;
-
-    /**
-     * 住院医生姓名
-     */
-    private String behDoctorName;
-
-    /**
-     * 主治医生ID
-     */
-    private String doctorId;
-
-    /**
-     * 主治医生姓名
-     */
-    private String doctorName;
-
-    /**
-     * 主任医生ID
-     */
-    private String directorDoctorId;
-
-    /**
-     * 主任医生姓名
-     */
-    private String directorDoctorName;
-
-    /**
-     * 是否归档(0:未归档,1:已归档)
-     */
-    private String isPlacefile;
-
-    /**
-     * 归档时间
-     */
-    private Date placefileDate;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-    /**
-     * 用户名
-     */
-    private String linkman;
-
-    public String getBehospitalCode() {
-        return behospitalCode;
-    }
-
-    public void setBehospitalCode(String behospitalCode) {
-        this.behospitalCode = behospitalCode;
-    }
-
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public String getFileCode() {
-        return fileCode;
-    }
-
-    public void setFileCode(String fileCode) {
-        this.fileCode = fileCode;
-    }
-
-    public Long getQcTypeId() {
-        return qcTypeId;
-    }
-
-    public void setQcTypeId(Long qcTypeId) {
-        this.qcTypeId = qcTypeId;
-    }
-
-    public String getWardCode() {
-        return wardCode;
-    }
-
-    public void setWardCode(String wardCode) {
-        this.wardCode = wardCode;
-    }
-
-    public String getWardName() {
-        return wardName;
-    }
-
-    public void setWardName(String wardName) {
-        this.wardName = wardName;
-    }
-
-    public String getBehDeptId() {
-        return behDeptId;
-    }
-
-    public void setBehDeptId(String behDeptId) {
-        this.behDeptId = behDeptId;
-    }
-
-    public String getBehDeptName() {
-        return behDeptName;
-    }
-
-    public void setBehDeptName(String behDeptName) {
-        this.behDeptName = behDeptName;
-    }
-
-    public String getBedCode() {
-        return bedCode;
-    }
-
-    public void setBedCode(String bedCode) {
-        this.bedCode = bedCode;
-    }
-
-    public String getBedName() {
-        return bedName;
-    }
-
-    public void setBedName(String bedName) {
-        this.bedName = bedName;
-    }
-
-    public String getInsuranceName() {
-        return insuranceName;
-    }
-
-    public void setInsuranceName(String insuranceName) {
-        this.insuranceName = insuranceName;
-    }
-
-    public String getJobType() {
-        return jobType;
-    }
-
-    public void setJobType(String jobType) {
-        this.jobType = jobType;
-    }
-
-    public Date getBehospitalDate() {
-        return behospitalDate;
-    }
-
-    public void setBehospitalDate(Date behospitalDate) {
-        this.behospitalDate = behospitalDate;
-    }
-
-    public Date getLeaveHospitalDate() {
-        return leaveHospitalDate;
-    }
-
-    public void setLeaveHospitalDate(Date leaveHospitalDate) {
-        this.leaveHospitalDate = leaveHospitalDate;
-    }
-
-    public String getDiagnoseIcd() {
-        return diagnoseIcd;
-    }
-
-    public void setDiagnoseIcd(String diagnoseIcd) {
-        this.diagnoseIcd = diagnoseIcd;
-    }
-
-    public String getDiagnose() {
-        return diagnose;
-    }
-
-    public void setDiagnose(String diagnose) {
-        this.diagnose = diagnose;
-    }
-
-    public String getBehDoctorId() {
-        return behDoctorId;
-    }
-
-    public void setBehDoctorId(String behDoctorId) {
-        this.behDoctorId = behDoctorId;
-    }
-
-    public String getBehDoctorName() {
-        return behDoctorName;
-    }
-
-    public void setBehDoctorName(String behDoctorName) {
-        this.behDoctorName = behDoctorName;
-    }
-
-    public String getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(String doctorId) {
-        this.doctorId = doctorId;
-    }
-
-    public String getDoctorName() {
-        return doctorName;
-    }
-
-    public void setDoctorName(String doctorName) {
-        this.doctorName = doctorName;
-    }
-
-    public String getDirectorDoctorId() {
-        return directorDoctorId;
-    }
-
-    public void setDirectorDoctorId(String directorDoctorId) {
-        this.directorDoctorId = directorDoctorId;
-    }
-
-    public String getDirectorDoctorName() {
-        return directorDoctorName;
-    }
-
-    public void setDirectorDoctorName(String directorDoctorName) {
-        this.directorDoctorName = directorDoctorName;
-    }
-
-    public String getIsPlacefile() {
-        return isPlacefile;
-    }
-
-    public void setIsPlacefile(String isPlacefile) {
-        this.isPlacefile = isPlacefile;
-    }
-
-    public Date getPlacefileDate() {
-        return placefileDate;
-    }
-
-    public void setPlacefileDate(Date placefileDate) {
-        this.placefileDate = placefileDate;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "MedBehospitalInfo{" +
-                "behospitalCode=" + behospitalCode +
-                ", hospitalId=" + hospitalId +
-                ", name=" + name +
-                ", sex=" + sex +
-                ", birthday=" + birthday +
-                ", fileCode=" + fileCode +
-                ", qcTypeId=" + qcTypeId +
-                ", wardCode=" + wardCode +
-                ", wardName=" + wardName +
-                ", behDeptId=" + behDeptId +
-                ", behDeptName=" + behDeptName +
-                ", bedCode=" + bedCode +
-                ", bedName=" + bedName +
-                ", insuranceName=" + insuranceName +
-                ", jobType=" + jobType +
-                ", behospitalDate=" + behospitalDate +
-                ", leaveHospitalDate=" + leaveHospitalDate +
-                ", diagnoseIcd=" + diagnoseIcd +
-                ", diagnose=" + diagnose +
-                ", behDoctorId=" + behDoctorId +
-                ", behDoctorName=" + behDoctorName +
-                ", doctorId=" + doctorId +
-                ", doctorName=" + doctorName +
-                ", directorDoctorId=" + directorDoctorId +
-                ", directorDoctorName=" + directorDoctorName +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                "}";
-    }
-}

+ 0 - 195
security-center/src/main/java/com/lantone/security/entity/SysDictionaryInfo.java

@@ -1,195 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统字典表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public class SysDictionaryInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 分组(值自定义)
-     */
-    private Long groupType;
-
-    /**
-     * 内容
-     */
-    private String name;
-
-    /**
-     * 值
-     */
-    private String val;
-
-    /**
-     * 返回类型(0: 都返回,1:后台维护返回 2:界面返回)
-     */
-    private Integer returnType;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getGroupType() {
-        return groupType;
-    }
-
-    public void setGroupType(Long groupType) {
-        this.groupType = groupType;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVal() {
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val;
-    }
-
-    public Integer getReturnType() {
-        return returnType;
-    }
-
-    public void setReturnType(Integer returnType) {
-        this.returnType = returnType;
-    }
-
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysDictionaryInfo{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", groupType=" + groupType +
-                ", name=" + name +
-                ", val=" + val +
-                ", returnType=" + returnType +
-                ", orderNo=" + orderNo +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 104
security-center/src/main/java/com/lantone/security/entity/SysMenu.java

@@ -1,104 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统菜单
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-@Getter
-@Setter
-public class SysMenu implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 菜单名称
-     */
-    private String name;
-
-    /**
-     * -1:表示顶级,其他值表示上级菜单的id
-     */
-    private Long parentId;
-
-    /**
-     * 编码,与前端对应
-     */
-    private String code;
-
-    /**
-     * 是否在右侧菜单显示(0:不显示,1:显示)
-     */
-    private Integer showStatus;
-
-
-    /**
-     * 是否可以维护(0:不可维护,1:可以维护)
-     */
-    private Integer maintainStatus;
-
-    /**
-     * 排序,从小到大
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 菜单类型 0:菜单 1:按钮 2:标签
-     */
-    private Integer type;
-
-    /**
-     * 图标
-     */
-    private String icon;
-    /**
-     * 页面url
-     */
-    private String url;
-}

+ 0 - 170
security-center/src/main/java/com/lantone/security/entity/SysPermission.java

@@ -1,170 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统资源表
- * </p>
- *
- * @author gaodm
- * @since 2018-08-30
- */
-@TableName("sys_permission")
-public class SysPermission implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 资源ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 资源名称
-     */
-    private String name;
-
-    /**
-     * 资源编码
-     */
-    private String code;
-
-    /**
-     * 资源Url
-     */
-    @TableField("permissionUrl")
-    private String permissionUrl;
-
-    /**
-     * 资源允许的请求方式
-     */
-    private String method;
-
-    /**
-     * 资源描述
-     */
-    private String descritpion;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPermissionUrl() {
-        return permissionUrl;
-    }
-
-    public void setPermissionUrl(String permissionUrl) {
-        this.permissionUrl = permissionUrl;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public void setMethod(String method) {
-        this.method = method;
-    }
-
-    public String getDescritpion() {
-        return descritpion;
-    }
-
-    public void setDescritpion(String descritpion) {
-        this.descritpion = descritpion;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-}

+ 0 - 184
security-center/src/main/java/com/lantone/security/entity/SysRole.java

@@ -1,184 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统角色表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public class SysRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 角色ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 角色名称
-     */
-    private String name;
-
-    /**
-     * 角色等级
-     */
-    @TableField("roleLevel")
-    private Integer roleLevel;
-
-    /**
-     * 角色描述
-     */
-    private String descritpion;
-
-    /**
-     * 菜单ID:对应角色ID(暂无用处)
-     */
-    @TableField("menuItems")
-    private String menuItems;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getRoleLevel() {
-        return roleLevel;
-    }
-
-    public void setRoleLevel(Integer roleLevel) {
-        this.roleLevel = roleLevel;
-    }
-
-    public String getDescritpion() {
-        return descritpion;
-    }
-
-    public void setDescritpion(String descritpion) {
-        this.descritpion = descritpion;
-    }
-
-    public String getMenuItems() {
-        return menuItems;
-    }
-
-    public void setMenuItems(String menuItems) {
-        this.menuItems = menuItems;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysRole{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", name=" + name +
-                ", roleLevel=" + roleLevel +
-                ", descritpion=" + descritpion +
-                ", menuItems=" + menuItems +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 153
security-center/src/main/java/com/lantone/security/entity/SysRoleMenu.java

@@ -1,153 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 角色和菜单的映射表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public class SysRoleMenu implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 角色id
-     */
-    private Long roleId;
-
-    /**
-     * 菜单id
-     */
-    private Long menuId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getMenuId() {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId) {
-        this.menuId = menuId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysRoleMenu{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", roleId=" + roleId +
-                ", menuId=" + menuId +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 153
security-center/src/main/java/com/lantone/security/entity/SysRolePermission.java

@@ -1,153 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 角色和资源的映射表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public class SysRolePermission implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 角色id
-     */
-    private Long roleId;
-
-    /**
-     * 资源id
-     */
-    private Long permissionId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public Long getPermissionId() {
-        return permissionId;
-    }
-
-    public void setPermissionId(Long permissionId) {
-        this.permissionId = permissionId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysRolePermission{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", roleId=" + roleId +
-                ", permissionId=" + permissionId +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 78
security-center/src/main/java/com/lantone/security/entity/SysTaskCron.java

@@ -1,78 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 定时任务
- * </p>
- *
- * @author gaodm
- * @since 2020-04-15
- */
-@Data
-public class SysTaskCron implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 任务编号
-     */
-    private String cronCode;
-
-    /**
-     * 任务执行周期
-     */
-    private String cron;
-
-    /**
-     * 0-未启用 1-启用
-     */
-    private Integer isUsed;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 参数
-     */
-    private String param;
-}

+ 0 - 196
security-center/src/main/java/com/lantone/security/entity/SysUser.java

@@ -1,196 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统用户表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-09
- */
-@TableName("sys_user")
-public class SysUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 联系人
-     */
-    private String linkman;
-
-    /**
-     * 1内部用户,0外部用户(默认0)
-     */
-    private Integer type;
-
-    /**
-     * 是否启用(0:停用,1:启用)
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getLinkman() {
-        return linkman;
-    }
-
-    public void setLinkman(String linkman) {
-        this.linkman = linkman;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", username=" + username +
-                ", password=" + password +
-                ", linkman=" + linkman +
-                ", type=" + type +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 167
security-center/src/main/java/com/lantone/security/entity/SysUserDept.java

@@ -1,167 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户-医院科室映射表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public class SysUserDept implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 用户主键
-     */
-    private Long userId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 科室编码(HIS导入)
-     */
-    private String deptId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUserDept{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", userId=" + userId +
-                ", hospitalId=" + hospitalId +
-                ", deptId=" + deptId +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 153
security-center/src/main/java/com/lantone/security/entity/SysUserHospital.java

@@ -1,153 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户-机构表映射表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public class SysUserHospital implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 用户主键
-     */
-    private Long userId;
-
-    /**
-     * 医院ID
-     */
-    private Long hospitalId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUserHospital{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", userId=" + userId +
-                ", hospitalId=" + hospitalId +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 0 - 197
security-center/src/main/java/com/lantone/security/entity/SysUserPageset.java

@@ -1,197 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 用户页面设定表
- * </p>
- *
- * @author gaodm
- * @since 2020-06-12
- */
-public class SysUserPageset implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 系统用户表.用户ID
-     */
-    private Long userId;
-
-    /**
-     * 页面分组(值自定义)
-     */
-    private Long pageType;
-
-    /**
-     * 列名
-     */
-    private String name;
-
-    /**
-     * 列名值
-     */
-    private String val;
-
-    /**
-     * 是否启用(0:停用,1:启用)
-     */
-    private Integer status;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-    public Long getPageType() {
-        return pageType;
-    }
-
-    public void setPageType(Long pageType) {
-        this.pageType = pageType;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getVal() {
-        return val;
-    }
-
-    public void setVal(String val) {
-        this.val = val;
-    }
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUserPageset{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", userId=" + userId +
-            ", pageType=" + pageType +
-            ", name=" + name +
-            ", val=" + val +
-            ", status=" + status +
-            ", orderNo=" + orderNo +
-            ", remark=" + remark +
-        "}";
-    }
-}

+ 0 - 153
security-center/src/main/java/com/lantone/security/entity/SysUserRole.java

@@ -1,153 +0,0 @@
-package com.lantone.security.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统用户角色关联表
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public class SysUserRole implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户和角色关联ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 系统用户表.用户ID
-     */
-    private Long userId;
-
-    /**
-     * 系统角色表.角色ID
-     */
-    private Long roleId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    @Override
-    public String toString() {
-        return "SysUserRole{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", userId=" + userId +
-                ", roleId=" + roleId +
-                ", remark=" + remark +
-                "}";
-    }
-}

+ 4 - 79
security-center/src/main/java/com/lantone/security/entity/SysUserUaa.java

@@ -3,6 +3,7 @@ package com.lantone.security.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetails;
 
 
@@ -10,6 +11,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -19,6 +21,7 @@ import java.util.List;
  * @author gaodm
  * @author gaodm
  * @since 2018-08-30
  * @since 2018-08-30
  */
  */
+@Data
 public class SysUserUaa implements UserDetails, Serializable {
 public class SysUserUaa implements UserDetails, Serializable {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -75,6 +78,7 @@ public class SysUserUaa implements UserDetails, Serializable {
     private Long hospitalId;
     private Long hospitalId;
 
 
     private List<? extends GrantedAuthority> authorities;
     private List<? extends GrantedAuthority> authorities;
+    private Map<String,List> functionAuthorities;
 
 
     @Override
     @Override
     @JsonIgnore
     @JsonIgnore
@@ -110,85 +114,6 @@ public class SysUserUaa implements UserDetails, Serializable {
     }
     }
 
 
 
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {

+ 0 - 21
security-center/src/main/java/com/lantone/security/entity/wrapper/SysMenuWrapper.java

@@ -1,21 +0,0 @@
-package com.lantone.security.entity.wrapper;
-
-import com.lantone.security.dto.SysUserPermissionDTO;
-import com.lantone.security.entity.SysMenu;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description:
- * @Author: ztg
- * @Date: 2018/9/14 14:10
- */
-@Getter
-@Setter
-public class SysMenuWrapper extends SysMenu {
-    private List<SysUserPermissionDTO> sysUserPermissionDTOList = new ArrayList<>();
-    private List<SysMenuWrapper> subMenuList = new ArrayList<>();
-}

+ 0 - 44
security-center/src/main/java/com/lantone/security/facade/BasDeptInfoFacade.java

@@ -1,44 +0,0 @@
-package com.lantone.security.facade;
-
-import com.lantone.security.dto.BasDeptInfoDTO;
-import com.lantone.security.service.impl.BasDeptInfoServiceImpl;
-import com.lantone.security.util.SysUserUtils;
-import com.lantone.security.vo.BasDeptInfoVO;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 18:58
- */
-@Component
-public class BasDeptInfoFacade extends BasDeptInfoServiceImpl {
-
-    /**
-     * 获取医院科室下拉列表信息
-     *
-     * @param basDeptInfoVO 搜索参数
-     * @return 医院科室下拉列表信息
-     */
-    public List<BasDeptInfoDTO> listForUser(BasDeptInfoVO basDeptInfoVO) {
-        basDeptInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        List<BasDeptInfoDTO> basDeptInfoDTOList = this.getList(basDeptInfoVO);
-        return basDeptInfoDTOList;
-    }
-
-
-    /**
-     * 获取医院用户下拉列表信息
-     *
-     * @param basDeptInfoVO 搜索参数
-     * @return 医院用户下拉列表信息
-     */
-    public List<BasDeptInfoDTO> getListUserFac(BasDeptInfoVO basDeptInfoVO) {
-        basDeptInfoVO.setUserId(Long.valueOf(SysUserUtils.getCurrentPrincipleID()));
-        basDeptInfoVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        List<BasDeptInfoDTO> basDeptInfoDTOList = this.getListUser(basDeptInfoVO);
-        return basDeptInfoDTOList;
-    }
-}

+ 0 - 47
security-center/src/main/java/com/lantone/security/facade/BasHospitalInfoFacade.java

@@ -1,47 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.lantone.security.entity.BasHospitalInfo;
-import com.lantone.security.service.impl.BasHospitalInfoServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/12 11:39
- */
-@Component
-public class BasHospitalInfoFacade extends BasHospitalInfoServiceImpl {
-
-    private static Map<Long, String> hospitalMap = null;
-
-    /**
-     * 初始化医院信息
-     */
-    public void init() {
-        if (hospitalMap == null) {
-            List<BasHospitalInfo> basHospitalInfoList = this.list(new QueryWrapper<BasHospitalInfo>()
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-            );
-            hospitalMap = basHospitalInfoList.stream().collect(Collectors.toMap(r -> r.getId(), r -> r.getCode()));
-        }
-    }
-
-
-    /**
-     * 获取医院编码
-     *
-     * @param hospitalId
-     * @return
-     */
-    public String getHosCode(Long hospitalId) {
-        init();
-        return hospitalMap.get(hospitalId);
-    }
-
-}

+ 0 - 64
security-center/src/main/java/com/lantone/security/facade/SysDictionaryFacade.java

@@ -1,64 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.lantone.security.dto.SysDictionaryInfoDTO;
-import com.lantone.security.entity.SysDictionaryInfo;
-import com.lantone.security.service.impl.SysDictionaryInfoServiceImpl;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhoutg
- * @time: 2018/11/23 11:37
- */
-@Component
-public class SysDictionaryFacade extends SysDictionaryInfoServiceImpl {
-
-    /**
-     * 返回字典信息
-     *
-     * @return
-     */
-    public Map<Long, List<SysDictionaryInfoDTO>> getDictionary() {
-        List<SysDictionaryInfo> list = this.list(new QueryWrapper<SysDictionaryInfo>()
-                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 2L }))
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByAsc("group_type", "order_no"));
-        List<SysDictionaryInfoDTO> listRes = BeanUtil.listCopyTo(list, SysDictionaryInfoDTO.class);
-        return EntityUtil.makeEntityListMap(listRes, "groupType");
-    }
-
-
-    /**
-     * 返回字典信息
-     *
-     * @return
-     */
-    @Cacheable(value = "cache", key = "'qcdict'")
-    public Map<String, Map<String, String>> getDictionaryWithKey() {
-        Map<String, Map<String, String>> res = new HashMap<>();
-        List<SysDictionaryInfo> list = this.list(new QueryWrapper<SysDictionaryInfo>()
-                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 2L }))
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .orderByAsc("group_type", "order_no"));
-        Map<Long, List<SysDictionaryInfo>> mapSource = EntityUtil.makeEntityListMap(list, "groupType");
-        for (Long group : mapSource.keySet()) {
-            Map<String, String> m = new HashMap<>();
-            for (SysDictionaryInfo dic : mapSource.get(group)) {
-                m.put(dic.getName(), dic.getVal());
-            }
-            res.put(String.valueOf(group), m);
-        }
-        return res;
-    }
-
-}

+ 0 - 130
security-center/src/main/java/com/lantone/security/facade/SysMenuFacade.java

@@ -1,130 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.lantone.security.entity.SysMenu;
-import com.lantone.security.enums.MenuTypeEnum;
-import com.lantone.security.service.impl.SysMenuServiceImpl;
-import com.lantone.security.vo.SysMenuVO;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 菜单
- * @Author: ztg
- * @Date: 2018/9/17 18:32
- */
-@Component
-public class SysMenuFacade extends SysMenuServiceImpl {
-    /**
-     * @Author songxl
-     * @Description 对菜单进行增删改操作
-     * @Date 2021/6/15
-     * @Param [sysMenuVO]
-     * @Return java.lang.Boolean
-     * @MethodName operateMenu
-     */
-    public Boolean operateMenu(SysMenuVO sysMenuVO) {
-        SysMenu sysMenu = new SysMenu();
-        BeanUtil.copyProperties(sysMenuVO, sysMenu);
-        switch (sysMenuVO.getUseType()) {
-            case 1:
-                //1.校验(非空+上级菜单校验【按钮不能做上级菜单】)
-                verifyForm(sysMenuVO);
-                //2.判断菜单是否存在
-                int num = this.list(new QueryWrapper<SysMenu>()
-                        .eq("name", sysMenuVO.getName())
-                        .eq("parent_id", sysMenuVO.getParentId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())).size();
-                //3.菜单插入
-                if (num == 0) {
-                    return this.saveOrUpdate(sysMenu);
-                } else {
-                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "菜单已存在!");
-                }
-            case 2:
-                //1.校验(非空+上级菜单校验【按钮不能做上级菜单】)
-                verifyForm(sysMenuVO);
-                return this.update(new UpdateWrapper<SysMenu>()
-                        .eq("id", sysMenu.getId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .set("url", sysMenu.getUrl())
-                        .set("icon", sysMenu.getIcon())
-                        .set("type", sysMenu.getType())
-                        .set("order_no", sysMenu.getOrderNo())
-                        .set("name", sysMenu.getName())
-                        .set("code", sysMenu.getCode())
-                        .set("show_status", sysMenu.getShowStatus())
-                        .set("parent_id", sysMenu.getParentId()));
-            case 3:
-                //1.判断是否有下级菜单(有则无法删除,抛出异常)
-                int sunNum = this.list(new QueryWrapper<SysMenu>()
-                        .eq("parent_id", sysMenuVO.getId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())).size();
-                if (sunNum > 0) {
-                    throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "存在子集菜单,无法删除!");
-                }
-                //2.删除
-                return this.remove(new QueryWrapper<SysMenu>()
-                        .eq("id", sysMenu.getId())
-                        .eq("is_deleted", IsDeleteEnum.N.getKey()));
-            default:
-                break;
-        }
-        return false;
-    }
-
-    /**
-     * @Author songxl
-     * @Description 验证参数是否正确
-     * @Date 2021/6/7
-     * @Param [sysMenuVO]
-     * @Return void
-     * @MethodName verifyForm
-     */
-    private void verifyForm(SysMenuVO sysMenuVO) {
-        if (StringUtils.isBlank(sysMenuVO.getName())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "菜单名称不能为空");
-        }
-
-        if (sysMenuVO.getParentId() == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "上级菜单不能为空");
-        }
-
-        //菜单
-        if (sysMenuVO.getType() == MenuTypeEnum.MENU.getKey()) {
-            if (StringUtils.isBlank(sysMenuVO.getUrl())) {
-                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "菜单URL不能为空");
-            }
-        }
-
-        //上级菜单类型
-        if (sysMenuVO.getParentId() == MenuTypeEnum.BUTTON.getKey()) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "按钮不能为上级菜单类型");
-        }
-        if (sysMenuVO.getParentId() == MenuTypeEnum.LABEL.getKey()) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "标签不能为上级菜单类型");
-        }
-    }
-
-    /**
-     * @Author songxl
-     * @Description 通过id获取菜单
-     * @Date 2021/6/7
-     * @Param [sysMenuVO]
-     * @Return com.diagbot.entity.SysMenu
-     * @MethodName geteMenuByID
-     */
-    public SysMenu getMenuByID(SysMenuVO sysMenuVO) {
-        if (sysMenuVO.getId() == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "菜单id为空");
-        }
-        return this.getOne(new QueryWrapper<SysMenu>()
-                .eq("id", sysMenuVO.getId())
-                .eq("is_deleted", IsDeleteEnum.N.getKey()));
-    }
-}

+ 0 - 206
security-center/src/main/java/com/lantone/security/facade/SysRoleFacade.java

@@ -1,206 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.lantone.security.dto.SysMenuPermissionDTO;
-import com.lantone.security.dto.SysPermissionDTO;
-import com.lantone.security.dto.SysRoleDTO;
-import com.lantone.security.dto.SysRoleMenuDTO;
-import com.lantone.security.entity.SysRole;
-import com.lantone.security.entity.SysRoleMenu;
-import com.lantone.security.entity.SysRolePermission;
-import com.lantone.security.entity.SysUserRole;
-import com.lantone.security.service.impl.SysRoleMenuServiceImpl;
-import com.lantone.security.service.impl.SysRolePermissionServiceImpl;
-import com.lantone.security.service.impl.SysRoleServiceImpl;
-import com.lantone.security.util.SysUserUtils;
-import com.lantone.security.vo.SysMenuSaveVO;
-import com.lantone.security.vo.SysPermissionSaveVO;
-import com.lantone.security.vo.SysRoleMenuQueryVO;
-import com.lantone.security.vo.SysRoleMenuSaveVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/27 10:13
- */
-@Component
-public class SysRoleFacade extends SysRoleServiceImpl {
-    @Autowired
-    @Qualifier("sysRoleMenuServiceImpl")
-    private SysRoleMenuServiceImpl sysRoleMenuService;
-
-    @Autowired
-    @Qualifier("sysRolePermissionServiceImpl")
-    private SysRolePermissionServiceImpl sysRolePermissionService;
-
-    @Autowired
-    private SysUserRoleFacade sysUserRoleFacade;
-
-    @Autowired
-    private TokenFacade tokenFacade;
-
-    /**
-     * 获取角色列表信息
-     *
-     * @return 角色列表信息
-     */
-    public List<SysRoleDTO> listFac() {
-        List<SysRole> sysRoleList = this.list(new QueryWrapper<SysRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .gt("id", -1L)
-        );
-        return BeanUtil.listCopyTo(sysRoleList, SysRoleDTO.class);
-    }
-
-    /**
-     * 获取角色下拉列表信息
-     *
-     * @return 角色下拉列表信息
-     */
-    public List<SysRoleDTO> listForUser() {
-        List<SysRole> sysRoleList = this.list(new QueryWrapper<SysRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-        );
-        return BeanUtil.listCopyTo(sysRoleList, SysRoleDTO.class);
-    }
-
-    /**
-     * 获取角色菜权限单等数据
-     *
-     * @param sysRoleMenuQueryVO 获取角色菜权限单入参
-     * @return 是否成功
-     */
-    public List<SysRoleMenuDTO> getRoleMenu(SysRoleMenuQueryVO sysRoleMenuQueryVO) {
-        List<SysMenuPermissionDTO> sysMenuPermissionDTOList = this.getMenuPermission(sysRoleMenuQueryVO);
-        List<SysRoleMenuDTO> sysRoleMenuDTOList = new ArrayList<>();
-        List<Long> menuId = new ArrayList<>();
-        for (SysMenuPermissionDTO sysMenuPermissionDTO : sysMenuPermissionDTOList) {
-            if (!menuId.contains(sysMenuPermissionDTO.getMenuId())) {
-                menuId.add(sysMenuPermissionDTO.getMenuId());
-                SysRoleMenuDTO sysRoleMenuDTO = new SysRoleMenuDTO();
-                BeanUtil.copyProperties(sysMenuPermissionDTO, sysRoleMenuDTO);
-                sysRoleMenuDTOList.add(sysRoleMenuDTO);
-            }
-        }
-        Map<Long, List<SysMenuPermissionDTO>> menuPermissionMap = EntityUtil.makeEntityListMap(sysMenuPermissionDTOList, "menuId");
-        Map<Long, List<SysRoleMenuDTO>> menuMap = EntityUtil.makeEntityListMap(sysRoleMenuDTOList, "parentId");
-        List<SysRoleMenuDTO> menuRes = menuMap.get(-1L);
-        for (SysRoleMenuDTO bean : menuRes) {
-            getSonMenu(bean, menuMap, menuPermissionMap);
-        }
-        return menuRes;
-    }
-
-    /**
-     * 递归获取菜单结构
-     *
-     * @param menu              当前菜单
-     * @param menuMap           菜单集
-     * @param menuPermissionMap 菜单权限集
-     * @return 菜单结构
-     */
-    public void getSonMenu(SysRoleMenuDTO menu,
-                           Map<Long, List<SysRoleMenuDTO>> menuMap,
-                           Map<Long, List<SysMenuPermissionDTO>> menuPermissionMap) {
-        List<SysRoleMenuDTO> list = menuMap.get(menu.getMenuId());
-        List<SysMenuPermissionDTO> listPermission = menuPermissionMap.get(menu.getMenuId());
-        if (ListUtil.isNotEmpty(listPermission)) {
-            List<SysPermissionDTO> sysPermissionDTOList = new ArrayList<>();
-            for (SysMenuPermissionDTO sysMenuPermissionDTO : listPermission) {
-                if (null != sysMenuPermissionDTO.getPermissionId()) {
-                    SysPermissionDTO sysPermissionDTO = new SysPermissionDTO();
-                    BeanUtil.copyProperties(sysMenuPermissionDTO, sysPermissionDTO);
-                    sysPermissionDTO.setParentId(menu.getMenuId());
-                    sysPermissionDTOList.add(sysPermissionDTO);
-                }
-            }
-            menu.setSysPermissionDTOList(sysPermissionDTOList);
-        }
-        if (ListUtil.isNotEmpty(list)) {
-            menu.setSonMenuDTOList(list);
-            for (SysRoleMenuDTO bean : list) {
-                getSonMenu(bean, menuMap, menuPermissionMap);
-            }
-        }
-    }
-
-    /**
-     * 修改角色菜单权限数据
-     *
-     * @param sysRoleMenuSaveVO 修改角色菜单权限数据入参
-     * @return 是否成功
-     */
-    public Boolean saveRoleMenu(SysRoleMenuSaveVO sysRoleMenuSaveVO) {
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        //查询该角色的所有用户
-        List<Long> userIds = sysUserRoleFacade.list(new QueryWrapper<SysUserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("role_id", sysRoleMenuSaveVO.getRoleId())
-        ).stream().distinct().map(SysUserRole::getUserId).collect(Collectors.toList());
-        //删除角色菜单和角色权限
-        sysRoleMenuService.update(new UpdateWrapper<SysRoleMenu>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("role_id", sysRoleMenuSaveVO.getRoleId())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-        sysRolePermissionService.update(new UpdateWrapper<SysRolePermission>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("role_id", sysRoleMenuSaveVO.getRoleId())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-        //新增角色菜单和角色权限
-        if (ListUtil.isNotEmpty(sysRoleMenuSaveVO.getSysMenuSaveVOList())) {
-            List<SysRoleMenu> sysRoleMenuList = new ArrayList<>();
-            for (SysMenuSaveVO sysMenuSaveVO : sysRoleMenuSaveVO.getSysMenuSaveVOList()) {
-                SysRoleMenu sysRoleMenu = new SysRoleMenu();
-                sysRoleMenu.setCreator(userId);
-                sysRoleMenu.setModifier(userId);
-                sysRoleMenu.setGmtCreate(now);
-                sysRoleMenu.setGmtModified(now);
-                sysRoleMenu.setRoleId(sysRoleMenuSaveVO.getRoleId());
-                sysRoleMenu.setMenuId(sysMenuSaveVO.getMenuId());
-                sysRoleMenuList.add(sysRoleMenu);
-            }
-            sysRoleMenuService.saveBatch(sysRoleMenuList);
-        }
-        if (ListUtil.isNotEmpty(sysRoleMenuSaveVO.getSysPermissionSaveVOList())) {
-            List<SysRolePermission> sysRolePermissionList = new ArrayList<>();
-            for (SysPermissionSaveVO sysPermissionSaveVO : sysRoleMenuSaveVO.getSysPermissionSaveVOList()) {
-                SysRolePermission sysRolePermission = new SysRolePermission();
-                sysRolePermission.setCreator(userId);
-                sysRolePermission.setModifier(userId);
-                sysRolePermission.setGmtCreate(now);
-                sysRolePermission.setGmtModified(now);
-                sysRolePermission.setRoleId(sysRoleMenuSaveVO.getRoleId());
-                sysRolePermission.setPermissionId(sysPermissionSaveVO.getPermissionId());
-                sysRolePermissionList.add(sysRolePermission);
-            }
-            sysRolePermissionService.saveBatch(sysRolePermissionList);
-        }
-        //清除该角色的所有用户的token缓存
-        if (ListUtil.isNotEmpty(userIds)) {
-            tokenFacade.deleteBatchToken(userIds);
-        }
-        return true;
-    }
-}

+ 0 - 13
security-center/src/main/java/com/lantone/security/facade/SysUserDeptFacade.java

@@ -1,13 +0,0 @@
-package com.lantone.security.facade;
-
-import com.lantone.security.service.impl.SysUserDeptServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 9:48
- */
-@Component
-public class SysUserDeptFacade extends SysUserDeptServiceImpl {
-}

+ 0 - 711
security-center/src/main/java/com/lantone/security/facade/SysUserFacade.java

@@ -1,711 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.EntityUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.lantone.security.client.AuthServiceClient;
-import com.lantone.security.dto.BasDeptInfoDTO;
-import com.lantone.security.dto.BasHospitalInfoDTO;
-import com.lantone.security.dto.JWT;
-import com.lantone.security.dto.JwtDTO;
-import com.lantone.security.dto.JwtStore;
-import com.lantone.security.dto.LoginDTO;
-import com.lantone.security.dto.SysRoleDTO;
-import com.lantone.security.dto.SysUserDeptDTO;
-import com.lantone.security.dto.SysUserPermissionDTO;
-import com.lantone.security.dto.SysUserQueryDTO;
-import com.lantone.security.dto.SysUserRoleDTO;
-import com.lantone.security.dto.UserLoginDTO;
-import com.lantone.security.entity.BasHospitalInfo;
-import com.lantone.security.entity.SysUser;
-import com.lantone.security.entity.SysUserDept;
-import com.lantone.security.entity.SysUserHospital;
-import com.lantone.security.entity.SysUserRole;
-import com.lantone.security.entity.wrapper.SysMenuWrapper;
-import com.lantone.security.enums.ConstantEnum;
-import com.lantone.security.enums.StatusEnum;
-import com.lantone.security.exception.ServiceErrorCode;
-import com.lantone.security.service.impl.SysUserDeptServiceImpl;
-import com.lantone.security.service.impl.SysUserRoleServiceImpl;
-import com.lantone.security.service.impl.SysUserServiceImpl;
-import com.lantone.security.util.SysUserUtils;
-import com.lantone.security.vo.BasDeptInfoVO;
-import com.lantone.security.vo.SysUserBaseVO;
-import com.lantone.security.vo.SysUserDeptVO;
-import com.lantone.security.vo.SysUserQueryVO;
-import com.lantone.security.vo.SysUserRoleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.security.crypto.factory.PasswordEncoderFactories;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 用户业务层
- * @author: gaodm
- * @time: 2018/8/6 9:00
- */
-@Component
-public class SysUserFacade extends SysUserServiceImpl {
-
-    @Autowired
-    private TokenFacade tokenFacade;
-
-    @Autowired
-    private AuthServiceClient authServiceClient;
-
-    @Autowired
-    private SysMenuFacade sysMenuFacade;
-
-    @Autowired
-    private BasHospitalInfoFacade basHospitalInfoFacade;
-
-    @Autowired
-    @Qualifier("sysUserRoleServiceImpl")
-    private SysUserRoleServiceImpl sysUserRoleService;
-
-    @Autowired
-    @Qualifier("sysUserDeptServiceImpl")
-    private SysUserDeptServiceImpl sysUserDeptService;
-
-    @Autowired
-    private BasDeptInfoFacade basDeptInfoFacade;
-
-    @Autowired
-    private SysRoleFacade sysRoleFacade;
-
-    @Autowired
-    private SysUserHospitalFacade sysUserHospitalFacade;
-    @Autowired
-    private SysUserRoleFacade sysUserRoleFacade;
-    @Autowired
-    private SysDictionaryFacade sysDictionaryFacade;
-
-    /**
-     * 获取jwt
-     *
-     * @param username 用户名
-     * @param password 密码
-     * @return jwt
-     */
-    public JwtDTO getJwt(String username, String password) {
-        JwtDTO data = new JwtDTO();
-        if (StringUtil.isBlank(username)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入用户名");
-        }
-        if (StringUtil.isBlank(password)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入密码");
-        }
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("username", username)
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
-        SysUser user = this.getOne(userQueryWrapper, false);
-        if (null == user) {
-            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
-        }
-        PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        if (!passwordEncoder.matches(password, user.getPassword())) {
-            throw new CommonException(ServiceErrorCode.USER_PASSWORD_ERROR);
-        }
-        JWT jwt = authServiceClient.getToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
-                "password", username, password);
-        if (null == jwt) {
-            throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
-        }
-        data.setAccessToken(jwt.getAccess_token());
-        data.setRefreshToken(jwt.getRefresh_token());
-        data.setType(user.getType());
-        data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
-        //获取用户角色
-        try {
-            SysUserBaseVO sysUserBaseVO = new SysUserBaseVO();
-            sysUserBaseVO.setUserId(user.getId());
-            List<SysRoleDTO> selRoles =getlocalUserRoles(sysUserBaseVO);
-            if(selRoles!=null&&!selRoles.isEmpty())
-            {
-                data.setSelRoles(selRoles);
-            }
-
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        //token存入redis
-        JwtStore jwtStore = new JwtStore();
-        jwtStore.setAccessToken(jwt.getAccess_token());
-        jwtStore.setRefreshToken(jwt.getRefresh_token());
-        tokenFacade.createToken(jwtStore);
-        /***
-         * 未加密密码复杂度判断
-         */
-        //获取用户医院id
-//        String hospitalID = SysUserUtils.getCurrentHospitalID();
-//        Long id = user.getId();
-//        QueryWrapper<SysUserHospital> UserHospitalQueryWrapper = new QueryWrapper<>();
-//        UserHospitalQueryWrapper
-//                .eq("user_id", id)
-//                .eq("is_deleted", IsDeleteEnum.N.getKey());
-//        SysUserHospital userHospital = sysUserHospitalFacade.getOne(UserHospitalQueryWrapper, false);
-//        Long hospitalId = userHospital.getHospitalId();
-//        String idStr = String.valueOf(hospitalId);
-//        Boolean passwordRegular = passwordRegular(password,idStr);
-//        if(!passwordRegular){
-//            data.setPasswordComplexity("密码复杂度过低,请及时修改密码");
-//        }
-        return data;
-    }
-
-    /**
-     * 外部获取jwt
-     *
-     * @param username 用户名
-     * @return jwt
-     */
-    public JwtDTO getJwtNoPass(String username) {
-        JwtDTO data = new JwtDTO();
-        if (StringUtil.isBlank(username)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入用户名");
-        }
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("username", username)
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("is_deleted", IsDeleteEnum.N.getKey());
-        SysUser user = this.getOne(userQueryWrapper, false);
-        if (null == user) {
-            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
-        }
-        JwtStore jwt = tokenFacade.getToken(user.getId().toString());
-        if (null == jwt) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "Token不存在,请重新登录");
-        }
-        data.setAccessToken(jwt.getAccessToken());
-        data.setRefreshToken(jwt.getRefreshToken());
-        data.setType(user.getType());
-        data.setTypeCn(ConstantEnum.getName(user.getType()));//返回中文
-        return data;
-    }
-
-    /**
-     * 刷新jwt
-     *
-     * @param refreshToken
-     * @return jwt
-     */
-    public JwtDTO refreshJwt(String refreshToken) {
-        JwtDTO data = new JwtDTO();
-        if (StringUtil.isBlank(refreshToken)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "刷新令牌不能为空");
-        }
-
-        //验证刷新令牌有效性
-        if (!tokenFacade.verifyToken(refreshToken, 2)) {
-            throw new CommonException(CommonErrorCode.TOKEN_PAST);
-        }
-
-        JWT jwt = authServiceClient.refreshToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2",
-                "refresh_token", refreshToken);
-        if (null == jwt) {
-            throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL);
-        }
-        data.setAccessToken(jwt.getAccess_token());
-        data.setRefreshToken(jwt.getRefresh_token());
-        //token存入redis
-        JwtStore jwtStore = new JwtStore();
-        jwtStore.setAccessToken(jwt.getAccess_token());
-        jwtStore.setRefreshToken(jwt.getRefresh_token());
-        tokenFacade.createToken(jwtStore);
-        return data;
-    }
-
-
-    /**
-     * 验证jwt
-     *
-     * @param token
-     * @return jwt
-     */
-    public OAuth2AccessToken checkToken(String token) {
-        if (StringUtil.isBlank(token)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "令牌不能为空");
-        }
-
-        OAuth2AccessToken jwt
-                = authServiceClient.checkToken("Basic dWFhLXNlcnZpY2U6MTIzNDU2", token);
-        if (null == jwt) {
-            throw new CommonException(ServiceErrorCode.GET_TOKEN_FAIL, "该Token不正确!");
-        }
-        return jwt;
-    }
-
-    /**
-     * 修改密码
-     *
-     * @param password       原密码
-     * @param modifyPassword 新密码
-     * @return 修改密码是否成功
-     */
-    public Boolean modifyPassword(String password, String modifyPassword) {
-        if (StringUtil.isBlank(password)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入密码");
-        }
-        if (StringUtil.isBlank(modifyPassword)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入新密码");
-        }
-        if (password.equals(modifyPassword)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "原密码和新密码不能相同");
-        }
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        SysUser user = this.getOne(new QueryWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("id", userId), false);
-        if (null == user) {
-            throw new CommonException(ServiceErrorCode.USER_NOT_FOUND);
-        }
-        PasswordEncoder passwordEncoder
-                = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        if (!passwordEncoder.matches(password, user.getPassword())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "原密码错误");
-        }
-//        String hospitalID = SysUserUtils.getCurrentHospitalID();
-//        Boolean regularBoolean = passwordRegular(modifyPassword,hospitalID);
-//        if(!regularBoolean){
-//            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确格式的新密码");
-//        }
-        String entryPassword = passwordEncoder.encode(modifyPassword);
-        user.setPassword(entryPassword);
-        user.setGmtModified(DateUtil.now());
-        user.setModifier(userId);
-        this.updateById(user);
-        return true;
-    }
-
-    /**
-     * 未加密密文正则表达式  至少8个字符,1个大写字母,1个小写字母,1个数字和1个特殊字符:
-     * @param password
-     * @return
-     */
-    public Boolean passwordRegular(String password,String hospitalId){
-        //获取字点表中存储的正则表达式   "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&])[A-Za-z\\d$@$!%*?&]{8,}"
-        boolean check=true;
-        Map<String, Map<String, String>> dictionaryWithKey = sysDictionaryFacade.getDictionaryWithKey();
-        if(dictionaryWithKey!=null){
-            Map<String, String> stringStringMap = dictionaryWithKey.get("30");
-            if(stringStringMap!=null) {
-                String regular = stringStringMap.get(hospitalId);
-                check = password.matches(regular);
-            }
-        }
-        return check;
-    }
-    /**
-     * 登录
-     *
-     * @return 登录相关信息
-     */
-    public LoginDTO getUserOrgMenu() {
-        LoginDTO data = new LoginDTO();
-        Set<String> roleSet = new HashSet<>();
-        Long userId = Long.parseLong(SysUserUtils.getCurrentPrincipleID());
-        SysUser user = this.getOne(new QueryWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("status", StatusEnum.Enable.getKey())
-                .eq("id", userId), false);
-        QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
-        sysUserRoleQueryWrapper.eq("user_id",userId);
-        sysUserRoleQueryWrapper .eq("is_deleted", IsDeleteEnum.N.getKey());
-        List<SysUserRole> sysUserRoleList = sysUserRoleFacade.list(sysUserRoleQueryWrapper);
-        if(ListUtil.isNotEmpty(sysUserRoleList)){
-            sysUserRoleList.forEach(sysUserRole ->{
-                roleSet.add(sysUserRole.getRoleId()+"");
-            } );
-        }
-        if (user == null) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                    "用户不存在【" + userId + "】");
-        }
-        //添加用户
-        UserLoginDTO userLoginDTO = new UserLoginDTO();
-        BeanUtil.copyProperties(user, userLoginDTO);
-        data.setUserLoginDTO(userLoginDTO);
-
-        //添加医院信息
-        if (user.getType().equals(ConstantEnum.OUTER_USER.getKey())) {
-            QueryWrapper<BasHospitalInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("id", SysUserUtils.getCurrentHospitalID());
-            BasHospitalInfo basHospitalInfo = basHospitalInfoFacade.getOne(queryWrapper, false);
-            BasHospitalInfoDTO basHospitalInfoDTO = new BasHospitalInfoDTO();
-            BeanUtil.copyProperties(basHospitalInfo, basHospitalInfoDTO);
-            data.setBasHospitalInfoDTO(basHospitalInfoDTO);
-        }
-
-        //添加菜单信息
-        List<SysMenuWrapper> menuList = sysMenuFacade.getByRole(user.getId(),roleSet);
-        List<SysUserPermissionDTO> sysUserPermissionDTOList = sysMenuFacade.getByRolePermission(user.getId(),roleSet);
-        Map<Long, List<SysMenuWrapper>> menuMap = EntityUtil.makeEntityListMap(menuList, "parentId");
-        Map<Long, List<SysUserPermissionDTO>> menuPermissionMap = EntityUtil.makeEntityListMap(sysUserPermissionDTOList, "menuId");
-        List<SysMenuWrapper> menuRes = menuMap.get(-1L);
-        for (SysMenuWrapper bean : menuRes) {
-            getSonMenu(bean, menuMap, menuPermissionMap);
-        }
-        data.setMenuWrappers(menuRes);
-        return data;
-    }
-
-
-    /**
-     * 递归获取菜单结构
-     *
-     * @param menu    当前菜单
-     * @param menuMap 菜单集
-     * @return 菜单结构
-     */
-    public List<SysMenuWrapper> getSonMenu(SysMenuWrapper menu,
-                                           Map<Long, List<SysMenuWrapper>> menuMap,
-                                           Map<Long, List<SysUserPermissionDTO>> menuPermissionMap) {
-        List<SysMenuWrapper> res = new ArrayList<>();
-        List<SysMenuWrapper> list = menuMap.get(menu.getId());
-        List<SysUserPermissionDTO> listPermission = menuPermissionMap.get(menu.getId());
-        if (ListUtil.isNotEmpty(listPermission)) {
-            menu.setSysUserPermissionDTOList(listPermission);
-        }
-        if (ListUtil.isNotEmpty(list)) {
-            menu.setSubMenuList(list);
-            for (SysMenuWrapper bean : list) {
-                getSonMenu(bean, menuMap, menuPermissionMap);
-            }
-        }
-        return res;
-    }
-
-    /**
-     * 递归获取菜单结构
-     *
-     * @param menuList 菜单参数
-     */
-    public void getMenuStruct(List<SysMenuWrapper> menuList) {
-        for (SysMenuWrapper m : menuList) {
-            m.setSubMenuList(recursion(m));
-        }
-    }
-
-
-    /**
-     * 递归查询菜单信息
-     *
-     * @param m 参数
-     * @return 菜单信息
-     */
-    public List<SysMenuWrapper> recursion(SysMenuWrapper m) {
-        List<SysMenuWrapper> subMenu = sysMenuFacade.getSubMenuById(m.getId());
-        for (SysMenuWrapper sub : subMenu) {
-            sub.setSubMenuList(recursion(sub));
-        }
-        return subMenu;
-    }
-
-    //-------------用户维护BEGAIN------------------------
-
-    /**
-     * 用户列表翻页信息查询
-     *
-     * @param sysUserQueryVO 用户列表翻页信息入参
-     * @return 用户列表翻页信息
-     */
-    public IPage<SysUserQueryDTO> userPageFac(SysUserQueryVO sysUserQueryVO) {
-        sysUserQueryVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-        return this.userPage(sysUserQueryVO);
-    }
-
-    /**
-     * 获取用户科室
-     *
-     * @param sysUserBaseVO 获取用户科室入参
-     * @return 用户科室信息
-     */
-    public SysUserDeptDTO getUserDepts(SysUserBaseVO sysUserBaseVO) {
-        checkUser(sysUserBaseVO.getUserId());
-        SysUserDeptDTO sysUserDeptDTO = new SysUserDeptDTO();
-        sysUserDeptDTO.setUserId(sysUserBaseVO.getUserId());
-        BasDeptInfoVO basDeptInfoVO = new BasDeptInfoVO();
-        List<BasDeptInfoDTO> basDeptInfoDTOList = basDeptInfoFacade.listForUser(basDeptInfoVO);
-        List<SysUserDept> sysUserDeptList
-                = sysUserDeptService.list(new QueryWrapper<SysUserDept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserBaseVO.getUserId())
-        );
-
-        if (ListUtil.isNotEmpty(sysUserDeptList)) {
-            List<BasDeptInfoDTO> notSelDepts = new ArrayList<>();
-            List<BasDeptInfoDTO> selDepts = new ArrayList<>();
-            Set<String> selDeptIds = sysUserDeptList.stream()
-                    .map(SysUserDept::getDeptId)
-                    .collect(Collectors.toSet());
-            for (BasDeptInfoDTO basDeptInfoDTO : basDeptInfoDTOList) {
-                if (selDeptIds.contains(basDeptInfoDTO.getDeptId())) {
-                    selDepts.add(basDeptInfoDTO);
-                } else {
-                    notSelDepts.add(basDeptInfoDTO);
-                }
-            }
-            sysUserDeptDTO.setNotSelDepts(notSelDepts);
-            sysUserDeptDTO.setSelDepts(selDepts);
-
-        } else {
-            sysUserDeptDTO.setNotSelDepts(basDeptInfoDTOList);
-        }
-
-        return sysUserDeptDTO;
-    }
-
-    /**
-     * 获取用户角色
-     *
-     * @param sysUserBaseVO 获取用户角色入参
-     * @return 用户角色信息
-     */
-    public SysUserRoleDTO getUserRoles(SysUserBaseVO sysUserBaseVO) {
-        checkUser(sysUserBaseVO.getUserId());
-        SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
-        sysUserRoleDTO.setUserId(sysUserBaseVO.getUserId());
-        List<SysRoleDTO> sysRoleDTOList = sysRoleFacade.listFac();
-        List<SysUserRole> sysUserRoleList
-                = sysUserRoleService.list(new QueryWrapper<SysUserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserBaseVO.getUserId())
-        );
-
-        if (ListUtil.isNotEmpty(sysUserRoleList)) {
-            List<SysRoleDTO> notSelRoles = new ArrayList<>();
-            List<SysRoleDTO> selRoles = new ArrayList<>();
-            Set<Long> selRoleIds = sysUserRoleList.stream()
-                    .map(SysUserRole::getRoleId)
-                    .collect(Collectors.toSet());
-            for (SysRoleDTO sysRoleDTO : sysRoleDTOList) {
-                if (selRoleIds.contains(sysRoleDTO.getId())) {
-                    selRoles.add(sysRoleDTO);
-                } else {
-                    notSelRoles.add(sysRoleDTO);
-                }
-            }
-            sysUserRoleDTO.setNotSelRoles(notSelRoles);
-            sysUserRoleDTO.setSelRoles(selRoles);
-
-        } else {
-            sysUserRoleDTO.setNotSelRoles(sysRoleDTOList);
-        }
-
-        return sysUserRoleDTO;
-    }
-    /**
-     * 获取用户角色
-     *
-     * @param sysUserBaseVO 获取用户角色入参
-     * @return 用户角色信息
-     */
-    private List<SysRoleDTO> getlocalUserRoles(SysUserBaseVO sysUserBaseVO) {
-        SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
-        sysUserRoleDTO.setUserId(sysUserBaseVO.getUserId());
-        List<SysRoleDTO> sysRoleDTOList = sysRoleFacade.listFac();
-        List<SysUserRole> sysUserRoleList
-                = sysUserRoleService.list(new QueryWrapper<SysUserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserBaseVO.getUserId())
-        );
-        List<SysRoleDTO> selRoles = new ArrayList<>();
-        if (ListUtil.isNotEmpty(sysUserRoleList)) {
-            Set<Long> selRoleIds = sysUserRoleList.stream()
-                    .map(SysUserRole::getRoleId)
-                    .collect(Collectors.toSet());
-            for (SysRoleDTO sysRoleDTO : sysRoleDTOList) {
-                if (selRoleIds.contains(sysRoleDTO.getId())) {
-                    selRoles.add(sysRoleDTO);
-                }
-            }
-            sysUserRoleDTO.setSelRoles(selRoles);
-        }
-
-        return selRoles;
-    }
-
-    /**
-     * 用户启用
-     *
-     * @param sysUserBaseVO 用户启用入参
-     * @return 是否成功
-     */
-    public Boolean enable(SysUserBaseVO sysUserBaseVO) {
-        checkUser(sysUserBaseVO.getUserId());
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        return this.update(new UpdateWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", sysUserBaseVO.getUserId())
-                .eq("status", StatusEnum.Disable.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-                .set("status", StatusEnum.Enable.getKey())
-        );
-    }
-
-    /**
-     * 用户停用
-     *
-     * @param sysUserBaseVO 用户停用入参
-     * @return 是否成功
-     */
-    public Boolean disable(SysUserBaseVO sysUserBaseVO) {
-        checkUser(sysUserBaseVO.getUserId());
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        Boolean res = this.update(new UpdateWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", sysUserBaseVO.getUserId())
-                .eq("status", StatusEnum.Enable.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-                .set("status", StatusEnum.Disable.getKey())
-        );
-        //删除Token
-        if (res) {
-            tokenFacade.deleteToken(sysUserBaseVO.getUserId().toString());
-        }
-
-        return res;
-    }
-
-    /**
-     * 编辑用户科室
-     *
-     * @param sysUserDeptVO 编辑用户科室入参
-     * @return 是否成功
-     */
-    public Boolean editUserDepts(SysUserDeptVO sysUserDeptVO) {
-        checkUser(sysUserDeptVO.getUserId());
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        //删除原科室
-        sysUserDeptService.update(new UpdateWrapper<SysUserDept>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserDeptVO.getUserId())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-        //新增新科室
-        if (ListUtil.isNotEmpty(sysUserDeptVO.getDeptIds())) {
-            List<SysUserDept> sysUserDeptList = new ArrayList<>();
-            for (String deptId : sysUserDeptVO.getDeptIds()) {
-                SysUserDept sysUserDept = new SysUserDept();
-                sysUserDept.setUserId(sysUserDeptVO.getUserId());
-                sysUserDept.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
-                sysUserDept.setDeptId(deptId);
-                sysUserDept.setCreator(userId);
-                sysUserDept.setModifier(userId);
-                sysUserDept.setGmtCreate(now);
-                sysUserDept.setGmtModified(now);
-                sysUserDeptList.add(sysUserDept);
-            }
-            sysUserDeptService.saveBatch(sysUserDeptList);
-        }
-        //更新用户表
-        return this.update(new UpdateWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", sysUserDeptVO.getUserId())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-    }
-
-    /**
-     * 编辑用户角色
-     *
-     * @param sysUserRoleVO 编辑用户角色入参
-     * @return 是否成功
-     */
-    public Boolean editUserRoles(SysUserRoleVO sysUserRoleVO) {
-        checkUser(sysUserRoleVO.getUserId());
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        //删除原角色
-        sysUserRoleService.update(new UpdateWrapper<SysUserRole>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", sysUserRoleVO.getUserId())
-                .set("is_deleted", IsDeleteEnum.Y.getKey())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-        //新增角色
-        if (ListUtil.isNotEmpty(sysUserRoleVO.getRoleIds())) {
-            List<SysUserRole> sysUserRoleList = new ArrayList<>();
-            for (Long roleId : sysUserRoleVO.getRoleIds()) {
-                SysUserRole sysUserRole = new SysUserRole();
-                sysUserRole.setUserId(sysUserRoleVO.getUserId());
-                sysUserRole.setRoleId(roleId);
-                sysUserRole.setCreator(userId);
-                sysUserRole.setModifier(userId);
-                sysUserRole.setGmtCreate(now);
-                sysUserRole.setGmtModified(now);
-                sysUserRoleList.add(sysUserRole);
-            }
-            sysUserRoleService.saveBatch(sysUserRoleList);
-        }
-        //更新用户表
-        this.update(new UpdateWrapper<SysUser>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", sysUserRoleVO.getUserId())
-                .set("modifier", userId)
-                .set("gmt_modified", now)
-        );
-        //删除Token
-        tokenFacade.deleteToken(sysUserRoleVO.getUserId().toString());
-        return true;
-    }
-
-    /**
-     * 确认用户是否是管理员下的用户
-     *
-     * @param userId 用户Id
-     */
-    private void checkUser(Long userId) {
-        //确认用户是否是管理员统一医院下的用户
-        Integer cnt = sysUserHospitalFacade.count(new QueryWrapper<SysUserHospital>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("user_id", userId)
-                .eq("hospital_id", SysUserUtils.getCurrentHospitalID())
-        );
-        if (cnt < 1) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "该医院下无该用户");
-        }
-    }
-    //-------------用户维护END---------------------------
-
-}

+ 0 - 13
security-center/src/main/java/com/lantone/security/facade/SysUserHospitalFacade.java

@@ -1,13 +0,0 @@
-package com.lantone.security.facade;
-
-import com.lantone.security.service.impl.SysUserHospitalServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 15:03
- */
-@Component
-public class SysUserHospitalFacade extends SysUserHospitalServiceImpl {
-}

+ 0 - 117
security-center/src/main/java/com/lantone/security/facade/SysUserPagesetFacade.java

@@ -1,117 +0,0 @@
-package com.lantone.security.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.lantone.security.dto.SysUserPagesetDTO;
-import com.lantone.security.entity.SysUserPageset;
-import com.lantone.security.service.impl.SysUserPagesetServiceImpl;
-import com.lantone.security.util.SysUserUtils;
-import com.lantone.security.vo.SysUserPagesetQueryVO;
-import com.lantone.security.vo.SysUserPagesetSaveVO;
-import com.lantone.security.vo.SysUserPagesetVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/6/12 10:25
- */
-@Component
-public class SysUserPagesetFacade extends SysUserPagesetServiceImpl {
-    @Autowired
-    @Qualifier("sysUserPagesetServiceImpl")
-    private SysUserPagesetServiceImpl sysUserPagesetService;
-
-    /**
-     * 获取用户对应页面设置
-     *
-     * @param sysUserPagesetQueryVO 获取用户对应页面设置参数
-     * @return 对应页面设置列表
-     */
-    public List<SysUserPagesetDTO> getPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
-        List<SysUserPageset> sysUserPagesetList = sysUserPagesetService.list(
-                new QueryWrapper<SysUserPageset>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("user_id", SysUserUtils.getCurrentPrincipleID())
-                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                        .orderByAsc("order_no")
-        );
-
-        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
-        if (ListUtil.isEmpty(sysUserPagesetList)) {
-            List<SysUserPageset> sysUserPagesetListDefault = sysUserPagesetService.list(
-                    new QueryWrapper<SysUserPageset>()
-                            .eq("is_deleted", IsDeleteEnum.N.getKey())
-                            .eq("user_id", -1)
-                            .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                            .orderByAsc("order_no")
-            );
-            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
-        } else {
-            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetList, SysUserPagesetDTO.class);
-        }
-        return sysUserPagesetDTOList;
-    }
-
-    /**
-     * 保存用户对应页面设置
-     *
-     * @param sysUserPagesetSaveVO 保存用户对应页面设置参数
-     * @return 是否成功
-     */
-    public Boolean savePageSet(SysUserPagesetSaveVO sysUserPagesetSaveVO) {
-        if (ListUtil.isEmpty(sysUserPagesetSaveVO.getSysUserPagesetVOList())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "列名输入列表不能为空");
-        }
-        sysUserPagesetService.remove(
-                new QueryWrapper<SysUserPageset>()
-                        .eq("user_id", SysUserUtils.getCurrentPrincipleID())
-                        .eq("page_type", sysUserPagesetSaveVO.getPageType())
-        );
-        List<SysUserPageset> saveList = new ArrayList<>();
-        Date now = DateUtil.now();
-        String userId = SysUserUtils.getCurrentPrincipleID();
-        for (SysUserPagesetVO sysUserPagesetVO : sysUserPagesetSaveVO.getSysUserPagesetVOList()) {
-            SysUserPageset sysUserPageset = new SysUserPageset();
-            BeanUtil.copyProperties(sysUserPagesetVO, sysUserPageset);
-            sysUserPageset.setPageType(sysUserPagesetSaveVO.getPageType());
-            sysUserPageset.setUserId(Long.valueOf(userId));
-            sysUserPageset.setCreator(userId);
-            sysUserPageset.setModifier(userId);
-            sysUserPageset.setGmtCreate(now);
-            sysUserPageset.setGmtModified(now);
-            saveList.add(sysUserPageset);
-        }
-        return sysUserPagesetService.saveBatch(saveList);
-    }
-
-    /**
-     * 获取默认列设置
-     *
-     * @param sysUserPagesetQueryVO
-     * @return
-     */
-    public List<SysUserPagesetDTO> getDefaultPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
-        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
-        List<SysUserPageset> sysUserPagesetListDefault = sysUserPagesetService.list(
-                new QueryWrapper<SysUserPageset>()
-                        .eq("is_deleted", IsDeleteEnum.N.getKey())
-                        .eq("user_id", -1)
-                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
-                        .orderByAsc("order_no")
-        );
-        sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
-        return sysUserPagesetDTOList;
-    }
-}

+ 0 - 13
security-center/src/main/java/com/lantone/security/facade/SysUserRoleFacade.java

@@ -1,13 +0,0 @@
-package com.lantone.security.facade;
-
-import com.lantone.security.service.impl.SysUserRoleServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2020/4/28 9:48
- */
-@Component
-public class SysUserRoleFacade extends SysUserRoleServiceImpl {
-}

+ 0 - 33
security-center/src/main/java/com/lantone/security/mapper/BasDeptInfoMapper.java

@@ -1,33 +0,0 @@
-package com.lantone.security.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.dto.BasDeptInfoDTO;
-import com.lantone.security.dto.DeptBaseDTO;
-import com.lantone.security.entity.BasDeptInfo;
-import com.lantone.security.vo.BasDeptInfoVO;
-import com.lantone.security.vo.FilterVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 医院科室信息 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface BasDeptInfoMapper extends BaseMapper<BasDeptInfo> {
-    List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO);
-
-    List<BasDeptInfoDTO> getListUser(BasDeptInfoVO basDeptInfoVO);
-
-    /**
-     * 查询用户关联科室
-     *
-     * @param filterVO
-     * @return
-     */
-    List<DeptBaseDTO> getDeptByUser(FilterVO filterVO);
-
-    void updateBatchByKey(List<BasDeptInfo> list);
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/mapper/BasDoctorInfoMapper.java

@@ -1,20 +0,0 @@
-package com.lantone.security.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.BasDoctorInfo;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-17
- */
-public interface BasDoctorInfoMapper extends BaseMapper<BasDoctorInfo> {
-
-    public void updateBatchByKey(List<BasDoctorInfo> list);
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/BasHospitalInfoMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.BasHospitalInfo;
-
-/**
- * <p>
- * 医院信息表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface BasHospitalInfoMapper extends BaseMapper<BasHospitalInfo> {
-
-}

+ 0 - 16
security-center/src/main/java/com/lantone/security/mapper/BehospitalInfoMapper.java

@@ -1,16 +0,0 @@
-package com.lantone.security.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.BehospitalInfo;
-
-/**
- * <p>
- * 住院病历信息 Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-public interface BehospitalInfoMapper extends BaseMapper<BehospitalInfo> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysDictionaryInfoMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysDictionaryInfo;
-
-/**
- * <p>
- * 系统字典表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface SysDictionaryInfoMapper extends BaseMapper<SysDictionaryInfo> {
-
-}

+ 0 - 38
security-center/src/main/java/com/lantone/security/mapper/SysMenuMapper.java

@@ -1,38 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.dto.SysUserPermissionDTO;
-import com.lantone.security.entity.SysMenu;
-import com.lantone.security.entity.wrapper.SysMenuWrapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 系统菜单 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface SysMenuMapper extends BaseMapper<SysMenu> {
-    /**
-     * @Description: 根据用户id获取菜单
-     * @Author: ztg
-     * @Date: 2018/9/14 13:57
-     */
-    public List<SysMenuWrapper> getByRole(@Param("userId") Long userId, @Param("roleSet") Set<String> roleSet);
-
-
-    /**
-     * @Description: 根据id获取子级菜单
-     * @Author: ztg
-     * @Date: 2018/9/14 13:59
-     */
-    public List<SysMenuWrapper> getSubMenuById(Long id);
-
-    public List<SysUserPermissionDTO> getByRolePermission(@Param("userId") Long userId, @Param("roleSet") Set<String> roleSet);
-}

+ 0 - 19
security-center/src/main/java/com/lantone/security/mapper/SysPermissionMapper.java

@@ -1,19 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysPermission;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-22
- */
-public interface SysPermissionMapper extends BaseMapper<SysPermission> {
-    List<SysPermission> getByUserId(Long userId);
-}

+ 0 - 21
security-center/src/main/java/com/lantone/security/mapper/SysRoleMapper.java

@@ -1,21 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.dto.SysMenuPermissionDTO;
-import com.lantone.security.entity.SysRole;
-import com.lantone.security.vo.SysRoleMenuQueryVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 系统角色表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRoleMapper extends BaseMapper<SysRole> {
-    List<SysMenuPermissionDTO> getMenuPermission(SysRoleMenuQueryVO sysRoleMenuQueryVO);
-}

+ 0 - 16
security-center/src/main/java/com/lantone/security/mapper/SysRoleMenuMapper.java

@@ -1,16 +0,0 @@
-package com.lantone.security.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysRoleMenu;
-
-/**
- * <p>
- * 角色和菜单的映射表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysRolePermissionMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysRolePermission;
-
-/**
- * <p>
- * 角色和资源的映射表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysUserDeptMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysUserDept;
-
-/**
- * <p>
- * 用户-医院科室映射表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysUserHospitalMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysUserHospital;
-
-/**
- * <p>
- * 用户-机构表映射表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserHospitalMapper extends BaseMapper<SysUserHospital> {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/mapper/SysUserMapper.java

@@ -1,20 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.lantone.security.dto.SysUserQueryDTO;
-import com.lantone.security.entity.SysUser;
-import com.lantone.security.vo.SysUserQueryVO;
-
-/**
- * <p>
- * 系统用户表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-09
- */
-public interface SysUserMapper extends BaseMapper<SysUser> {
-    IPage<SysUserQueryDTO> userPage(SysUserQueryVO sysUserQueryVO);
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysUserPagesetMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysUserPageset;
-
-/**
- * <p>
- * 用户页面设定表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-06-12
- */
-public interface SysUserPagesetMapper extends BaseMapper<SysUserPageset> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/mapper/SysUserRoleMapper.java

@@ -1,17 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lantone.security.entity.SysUserRole;
-
-/**
- * <p>
- * 系统用户角色关联表 Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
-
-}

+ 0 - 18
security-center/src/main/java/com/lantone/security/mapper/SysUserUaaMapper.java

@@ -1,18 +0,0 @@
-package com.lantone.security.mapper;
-
-
-import com.lantone.security.entity.SysUserUaa;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysUserUaaMapper {
-    SysUserUaa getByUserName(String username);
-
-    SysUserUaa getHospByUserName(String username);
-}

+ 0 - 34
security-center/src/main/java/com/lantone/security/service/BasDeptInfoService.java

@@ -1,34 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.dto.BasDeptInfoDTO;
-import com.lantone.security.dto.DeptBaseDTO;
-import com.lantone.security.entity.BasDeptInfo;
-import com.lantone.security.vo.BasDeptInfoVO;
-import com.lantone.security.vo.FilterVO;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 医院科室信息 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface BasDeptInfoService extends IService<BasDeptInfo> {
-    List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO);
-
-    List<BasDeptInfoDTO> getListUser(BasDeptInfoVO basDeptInfoVO);
-
-    /**
-     * 查询用户关联科室
-     *
-     * @param filterVO
-     * @return
-     */
-    List<DeptBaseDTO> getDeptByUser(FilterVO filterVO);
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/BasDoctorInfoService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.BasDoctorInfo;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-17
- */
-public interface BasDoctorInfoService extends IService<BasDoctorInfo> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/BasHospitalInfoService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.BasHospitalInfo;
-
-/**
- * <p>
- * 医院信息表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface BasHospitalInfoService extends IService<BasHospitalInfo> {
-
-}

+ 0 - 18
security-center/src/main/java/com/lantone/security/service/BehospitalInfoService.java

@@ -1,18 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.BehospitalInfo;
-
-/**
- * <p>
- * 住院病历信息 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-public interface BehospitalInfoService extends IService<BehospitalInfo> {
-
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysDictionaryInfoService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysDictionaryInfo;
-
-/**
- * <p>
- * 系统字典表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface SysDictionaryInfoService extends IService<SysDictionaryInfo> {
-
-}

+ 0 - 37
security-center/src/main/java/com/lantone/security/service/SysMenuService.java

@@ -1,37 +0,0 @@
-package com.lantone.security.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.dto.SysUserPermissionDTO;
-import com.lantone.security.entity.SysMenu;
-import com.lantone.security.entity.wrapper.SysMenuWrapper;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 系统菜单 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-public interface SysMenuService extends IService<SysMenu> {
-
-    /**
-     * @Description: 获取菜单信息
-     * @Author: ztg
-     * @Date: 2018/9/17 15:43
-     */
-    public List<SysMenuWrapper> getByRole(Long userId, Set<String> roleSet);
-
-
-    /**
-     * @Description: 获取子级菜单
-     * @Author: ztg
-     * @Date: 2018/9/17 15:44
-     */
-    public List<SysMenuWrapper> getSubMenuById(Long id);
-
-    public List<SysUserPermissionDTO> getByRolePermission(Long userId, Set<String> roleSet);
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysRoleMenuService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysRoleMenu;
-
-/**
- * <p>
- * 角色和菜单的映射表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRoleMenuService extends IService<SysRoleMenu> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysRolePermissionService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysRolePermission;
-
-/**
- * <p>
- * 角色和资源的映射表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRolePermissionService extends IService<SysRolePermission> {
-
-}

+ 0 - 21
security-center/src/main/java/com/lantone/security/service/SysRoleService.java

@@ -1,21 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.dto.SysMenuPermissionDTO;
-import com.lantone.security.entity.SysRole;
-import com.lantone.security.vo.SysRoleMenuQueryVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 系统角色表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-public interface SysRoleService extends IService<SysRole> {
-    List<SysMenuPermissionDTO> getMenuPermission(SysRoleMenuQueryVO sysRoleMenuQueryVO);
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysTaskCronService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysTaskCron;
-
-/**
- * <p>
- * 定时任务 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-15
- */
-public interface SysTaskCronService extends IService<SysTaskCron> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysUserDeptService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysUserDept;
-
-/**
- * <p>
- * 用户-医院科室映射表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserDeptService extends IService<SysUserDept> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysUserHospitalService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysUserHospital;
-
-/**
- * <p>
- * 用户-机构表映射表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserHospitalService extends IService<SysUserHospital> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysUserPagesetService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysUserPageset;
-
-/**
- * <p>
- * 用户页面设定表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-06-12
- */
-public interface SysUserPagesetService extends IService<SysUserPageset> {
-
-}

+ 0 - 17
security-center/src/main/java/com/lantone/security/service/SysUserRoleService.java

@@ -1,17 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.entity.SysUserRole;
-
-/**
- * <p>
- * 系统用户角色关联表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-public interface SysUserRoleService extends IService<SysUserRole> {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/SysUserService.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lantone.security.dto.SysUserQueryDTO;
-import com.lantone.security.entity.SysUser;
-import com.lantone.security.vo.SysUserQueryVO;
-
-/**
- * <p>
- * 系统用户表 服务类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-09
- */
-public interface SysUserService extends IService<SysUser> {
-    IPage<SysUserQueryDTO> userPage(SysUserQueryVO sysUserQueryVO);
-}

+ 28 - 23
security-center/src/main/java/com/lantone/security/service/UrlUserService.java

@@ -1,10 +1,7 @@
 package com.lantone.security.service;
 package com.lantone.security.service;
 
 
-import com.lantone.security.entity.SysPermission;
 import com.lantone.security.entity.SysUserUaa;
 import com.lantone.security.entity.SysUserUaa;
 import com.lantone.security.enums.ConstantEnum;
 import com.lantone.security.enums.ConstantEnum;
-import com.lantone.security.mapper.SysPermissionMapper;
-import com.lantone.security.mapper.SysUserUaaMapper;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.GrantedAuthority;
@@ -23,36 +20,44 @@ import java.util.List;
  */
  */
 @Service
 @Service
 public class UrlUserService implements UserDetailsService {
 public class UrlUserService implements UserDetailsService {
-    @Autowired
-    SysUserUaaMapper userUaaMapper;
-    @Autowired
-    SysPermissionMapper permissionMapper;
 
 
     @Override
     @Override
     public UserDetails loadUserByUsername(String userName) { //重写loadUserByUsername 方法获得 userdetails 类型用户
     public UserDetails loadUserByUsername(String userName) { //重写loadUserByUsername 方法获得 userdetails 类型用户
-
-        SysUserUaa user = userUaaMapper.getByUserName(userName);
+        //1.获取用户信息
+//        SysUserUaa user = userUaaMapper.getByUserName(userName);
+        SysUserUaa user = null;
         if (user != null) {
         if (user != null) {
-            List<SysPermission> permissions = permissionMapper.getByUserId(user.getId());
+            //2.获取用户功能权限
+//            List<SysPermission> permissions = permissionMapper.getByUserId(user.getId());
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
-            for (SysPermission permission : permissions) {
-                if (null != permission && StringUtils.isNotBlank(permission.getPermissionUrl())) {
-                    GrantedAuthority grantedAuthority
-                            = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
-                    grantedAuthorities.add(grantedAuthority);
-                }
-            }
+//            for (SysPermission permission : permissions) {
+//                if (null != permission && StringUtils.isNotBlank(permission.getPermissionUrl())) {
+//                    GrantedAuthority grantedAuthority
+//                            = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
+//                    grantedAuthorities.add(grantedAuthority);
+//                }
+//            }
+            //2.1将库中的功能权限赋给用户
             user.setGrantedAuthorities(grantedAuthorities);
             user.setGrantedAuthorities(grantedAuthorities);
             if (user.getType().equals(ConstantEnum.OUTER_USER.getKey())) {
             if (user.getType().equals(ConstantEnum.OUTER_USER.getKey())) {
-                SysUserUaa userHosp = userUaaMapper.getHospByUserName(userName);
-                if (null == userHosp) {
-                    throw new UsernameNotFoundException("医院管理人员: " + userName + " 未绑定医院");
-                } else {
-                    user.setHospitalId(userHosp.getHospitalId());
-                }
+                //2.2获取用户医院信息
+//                SysUserUaa userHosp = userUaaMapper.getHospByUserName(userName);
+//                if (null == userHosp) {
+//                    throw new UsernameNotFoundException("医院管理人员: " + userName + " 未绑定医院");
+//                } else {
+//                    user.setHospitalId(userHosp.getHospitalId());
+//                }
             } else {
             } else {
                 user.setHospitalId(-1L);
                 user.setHospitalId(-1L);
             }
             }
+
+
+            //3.获取当前登录用户的功能权限
+
+            //3.1获取用户可查看的doctor、dept
+
+            //3.2将功能权限赋予用户
+            user.setFunctionAuthorities(null);
             return user;
             return user;
         } else {
         } else {
             throw new UsernameNotFoundException("admin: " + userName + " do not exist");
             throw new UsernameNotFoundException("admin: " + userName + " do not exist");

+ 0 - 55
security-center/src/main/java/com/lantone/security/service/impl/BasDeptInfoServiceImpl.java

@@ -1,55 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.dto.BasDeptInfoDTO;
-import com.lantone.security.dto.DeptBaseDTO;
-import com.lantone.security.entity.BasDeptInfo;
-import com.lantone.security.mapper.BasDeptInfoMapper;
-import com.lantone.security.service.BasDeptInfoService;
-import com.lantone.security.vo.BasDeptInfoVO;
-import com.lantone.security.vo.FilterVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 医院科室信息 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-@Service
-public class BasDeptInfoServiceImpl extends ServiceImpl<BasDeptInfoMapper, BasDeptInfo> implements BasDeptInfoService {
-
-    @Override
-    public List<BasDeptInfoDTO> getList(BasDeptInfoVO basDeptInfoVO) {
-        return baseMapper.getList(basDeptInfoVO);
-    }
-
-    @Override
-    public List<BasDeptInfoDTO> getListUser(BasDeptInfoVO basDeptInfoVO) {
-        return baseMapper.getListUser(basDeptInfoVO);
-    }
-
-    /**
-     * 查询用户关联科室
-     *
-     * @param filterVO
-     * @return
-     */
-    @Override
-    public List<DeptBaseDTO> getDeptByUser(FilterVO filterVO) {
-        return baseMapper.getDeptByUser(filterVO);
-    }
-
-
-    /**
-     * 根据科室编码,医院编码,批量修改
-     * @param list
-     */
-    public void updateBatchByKey(List<BasDeptInfo> list){
-        this.baseMapper.updateBatchByKey(list);
-    }
-}

+ 0 - 29
security-center/src/main/java/com/lantone/security/service/impl/BasDoctorInfoServiceImpl.java

@@ -1,29 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.BasDoctorInfo;
-import com.lantone.security.mapper.BasDoctorInfoMapper;
-import com.lantone.security.service.BasDoctorInfoService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-17
- */
-@Service
-public class BasDoctorInfoServiceImpl extends ServiceImpl<BasDoctorInfoMapper, BasDoctorInfo> implements BasDoctorInfoService {
-    /**
-     * 根据医生编码和医院编码,批量更新
-     * @param list
-     */
-    public void updateBatchByKey(List<BasDoctorInfo> list){
-        this.baseMapper.updateBatchByKey(list);
-    }
-
-}

+ 0 - 21
security-center/src/main/java/com/lantone/security/service/impl/BasHospitalInfoServiceImpl.java

@@ -1,21 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.BasHospitalInfo;
-import com.lantone.security.mapper.BasHospitalInfoMapper;
-import com.lantone.security.service.BasHospitalInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 医院信息表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-@Service
-public class BasHospitalInfoServiceImpl extends ServiceImpl<BasHospitalInfoMapper, BasHospitalInfo> implements BasHospitalInfoService {
-
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/BehospitalInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.BehospitalInfo;
-import com.lantone.security.mapper.BehospitalInfoMapper;
-import com.lantone.security.service.BehospitalInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 住院病历信息 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2020-04-13
- */
-@Service
-public class BehospitalInfoServiceImpl extends ServiceImpl<BehospitalInfoMapper, BehospitalInfo> implements BehospitalInfoService {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysDictionaryInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysDictionaryInfo;
-import com.lantone.security.mapper.SysDictionaryInfoMapper;
-import com.lantone.security.service.SysDictionaryInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统字典表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-@Service
-public class SysDictionaryInfoServiceImpl extends ServiceImpl<SysDictionaryInfoMapper, SysDictionaryInfo> implements SysDictionaryInfoService {
-
-}

+ 0 - 52
security-center/src/main/java/com/lantone/security/service/impl/SysMenuServiceImpl.java

@@ -1,52 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.dto.SysUserPermissionDTO;
-import com.lantone.security.entity.SysMenu;
-import com.lantone.security.entity.wrapper.SysMenuWrapper;
-import com.lantone.security.mapper.SysMenuMapper;
-import com.lantone.security.service.SysMenuService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * <p>
- * 系统菜单 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-12
- */
-@Service
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements SysMenuService {
-
-    /**
-     * 根据用户id获取菜单信息
-     *
-     * @param userId 用户id
-     * @return 菜单信息
-     */
-    @Override
-    public List<SysMenuWrapper> getByRole(Long userId, Set<String> roleSet) {
-        return baseMapper.getByRole(userId,roleSet);
-    }
-
-
-    /**
-     * 获取下级菜单
-     *
-     * @param id 菜单id
-     * @return 子菜单信息
-     */
-    @Override
-    public List<SysMenuWrapper> getSubMenuById(Long id) {
-        return baseMapper.getSubMenuById(id);
-    }
-
-    @Override
-    public List<SysUserPermissionDTO> getByRolePermission(Long userId, Set<String> roleSet){
-        return baseMapper.getByRolePermission(userId,roleSet);
-    }
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysRoleMenuServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysRoleMenu;
-import com.lantone.security.mapper.SysRoleMenuMapper;
-import com.lantone.security.service.SysRoleMenuService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色和菜单的映射表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-@Service
-public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements SysRoleMenuService {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysRolePermissionServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysRolePermission;
-import com.lantone.security.mapper.SysRolePermissionMapper;
-import com.lantone.security.service.SysRolePermissionService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 角色和资源的映射表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-@Service
-public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionMapper, SysRolePermission> implements SysRolePermissionService {
-
-}

+ 0 - 28
security-center/src/main/java/com/lantone/security/service/impl/SysRoleServiceImpl.java

@@ -1,28 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.dto.SysMenuPermissionDTO;
-import com.lantone.security.entity.SysRole;
-import com.lantone.security.mapper.SysRoleMapper;
-import com.lantone.security.service.SysRoleService;
-import com.lantone.security.vo.SysRoleMenuQueryVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-/**
- * <p>
- * 系统角色表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-27
- */
-@Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
-    @Override
-    public List<SysMenuPermissionDTO> getMenuPermission(SysRoleMenuQueryVO sysRoleMenuQueryVO) {
-        return baseMapper.getMenuPermission(sysRoleMenuQueryVO);
-    }
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysUserDeptServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysUserDept;
-import com.lantone.security.mapper.SysUserDeptMapper;
-import com.lantone.security.service.SysUserDeptService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户-医院科室映射表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-@Service
-public class SysUserDeptServiceImpl extends ServiceImpl<SysUserDeptMapper, SysUserDept> implements SysUserDeptService {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysUserHospitalServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysUserHospital;
-import com.lantone.security.mapper.SysUserHospitalMapper;
-import com.lantone.security.service.SysUserHospitalService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户-机构表映射表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-@Service
-public class SysUserHospitalServiceImpl extends ServiceImpl<SysUserHospitalMapper, SysUserHospital> implements SysUserHospitalService {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysUserPagesetServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysUserPageset;
-import com.lantone.security.mapper.SysUserPagesetMapper;
-import com.lantone.security.service.SysUserPagesetService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户页面设定表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-06-12
- */
-@Service
-public class SysUserPagesetServiceImpl extends ServiceImpl<SysUserPagesetMapper, SysUserPageset> implements SysUserPagesetService {
-
-}

+ 0 - 20
security-center/src/main/java/com/lantone/security/service/impl/SysUserRoleServiceImpl.java

@@ -1,20 +0,0 @@
-package com.lantone.security.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lantone.security.entity.SysUserRole;
-import com.lantone.security.mapper.SysUserRoleMapper;
-import com.lantone.security.service.SysUserRoleService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统用户角色关联表 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2020-04-28
- */
-@Service
-public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements SysUserRoleService {
-
-}

+ 0 - 0
security-center/src/main/java/com/lantone/security/service/impl/SysUserServiceImpl.java


Some files were not shown because too many files changed in this diff