Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into test

common/src/main/java/com/lantone/common/config/BaseSundriesConfig.java

@@ -0,0 +1,26 @@
+package com.lantone.common.config;
+
+import com.lantone.common.service.DictSetsService;
+import com.lantone.common.service.SpringContextService;
+import com.lantone.common.service.impl.DictSetsServiceImpl;
+import com.lantone.common.service.impl.SpringContextServiceImpl;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:34
+ */
+public class BaseSundriesConfig {
+
+    @Bean
+    public SpringContextService springContextService() {
+        return new SpringContextServiceImpl();
+    }
+
+    @Bean
+    public DictSetsService dictSetsService() {
+        return new DictSetsServiceImpl();
+    }
+
+}

common/src/main/java/com/lantone/common/service/DictSetsService.java

@@ -0,0 +1,40 @@
+package com.lantone.common.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 字典及医院个性化配置信息获取工具类
+ * @author: rengb
+ * @time: 2022/4/11 11:47
+ */
+public interface DictSetsService {
+
+    /**
+     * 根据返回类型及多个分组获取多组字典集
+     *
+     * @param returnType 返回类型
+     * @param groupTypes 分组集合
+     * @return
+     */
+    Map<String, Map<String, String>> getDicMap(String returnType, List<String> groupTypes);
+
+    /**
+     * 根据返回类型及单个分组获取一组字典集
+     *
+     * @param returnType 返回类型
+     * @param groupType  分组集合
+     * @return
+     */
+    Map<String, String> getOneDicMap(String returnType, String groupType);
+
+    /**
+     * 获取某医院code的内容
+     *
+     * @param hospitalId 医院id
+     * @param code       分组集合
+     * @return
+     */
+    Map<String, String> getHospitalCodeMap(String hospitalId, String code);
+
+}

common/src/main/java/com/lantone/common/service/SpringContextService.java

@@ -0,0 +1,12 @@
+package com.lantone.common.service;
+
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * @Description: 获取Spring容器中的Bean
+ * @author: rengb
+ * @time: 2022/4/12 18:20
+ */
+public interface SpringContextService extends ApplicationContextAware {
+    
+}

common/src/main/java/com/lantone/common/service/impl/DictSetsServiceImpl.java

@@ -0,0 +1,58 @@
+package com.lantone.common.service.impl;
+
+import com.lantone.common.constant.AuthConstant;
+import com.lantone.common.service.DictSetsService;
+import com.lantone.common.service.RedisService;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
+import org.apache.commons.collections.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 字典及医院个性化配置信息获取工具类
+ * @author: rengb
+ * @time: 2022/4/11 13:36
+ */
+public class DictSetsServiceImpl implements DictSetsService {
+
+    @Autowired
+    private RedisService redisService;
+
+    @Override
+    public Map<String, Map<String, String>> getDicMap(String returnType, List<String> groupTypes) {
+        Map<String, Map<String, String>> outDicMap = new HashMap<>();
+        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
+        Map<String, Map<String, String>> returnDicMap = dicMap.get(returnType);
+        if (MapUtils.isNotEmpty(returnDicMap) && ListUtil.isNotEmpty(groupTypes)) {
+            groupTypes.stream().forEach(groupType -> {
+                outDicMap.put(groupType, returnDicMap.get(groupType));
+            });
+        }
+        return outDicMap;
+    }
+
+    @Override
+    public Map<String, String> getOneDicMap(String returnType, String groupType) {
+        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
+        Map<String, Map<String, String>> returnDicMap = dicMap.get(returnType);
+        if (MapUtils.isNotEmpty(returnDicMap) && StringUtil.isNotBlank(groupType)) {
+            return returnDicMap.get(groupType);
+        }
+        return null;
+    }
+
+    @Override
+    public Map<String, String> getHospitalCodeMap(String hospitalId, String code) {
+        Map<String, Map<String, Map<String, String>>> hospitalSetMap = redisService.get(AuthConstant.HOSPITAL_SET_MAP_KEY);
+        Map<String, Map<String, String>> codeMap = hospitalSetMap.get(hospitalId);
+        if (org.apache.commons.collections4.MapUtils.isNotEmpty(codeMap) && StringUtil.isNotBlank(code)) {
+            return codeMap.get(code);
+        }
+        return null;
+    }
+
+}

common/src/main/java/com/lantone/common/service/impl/SpringContextServiceImpl.java

@@ -0,0 +1,43 @@
+package com.lantone.common.service.impl;
+
+import com.lantone.common.service.SpringContextService;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * @Description: 获取Spring容器中的Bean
+ * @author: rengb
+ * @time: 2022/4/12 18:24
+ */
+public class SpringContextServiceImpl implements SpringContextService {
+
+    private static ApplicationContext applicationContext = null;
+
+    //获取applicationContext
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+    //通过name获取 Bean
+    public static <T> T getBean(String name) {
+        return (T) applicationContext.getBean(name);
+    }
+
+    //通过class获取Bean
+    public static <T> T getBean(Class<T> clazz) {
+        return applicationContext.getBean(clazz);
+    }
+
+    //通过name,以及Clazz返回指定的Bean
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return applicationContext.getBean(name, clazz);
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        if (this.applicationContext == null) {
+            this.applicationContext = applicationContext;
+        }
+    }
+
+}

daqe-center/src/main/java/com/lantone/daqe/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java

@@ -401,13 +401,8 @@ public class ColumnResultManagementFacade {
         }
         //先判断是否存在规则有修改
         if (ListUtil.isNotEmpty(nonnullInfoList) || ListUtil.isNotEmpty(standardvalueList) || ListUtil.isNotEmpty(regularList)) {
-            String start="2021-01-01 03:08:38";
-            String end="2021-01-30 03:08:38";
-            Date dateStart = DateUtil.parseDateTime(start);
-            Date dateEnd = DateUtil.parseDateTime(end);
             //获取30天内所有病历
-           // List<BehospitalInfo> behospitalInfos = getBehospitalInfos(DateUtil.addDate(DateUtil.now(), -30), DateUtil.now(), hospitalId);
-            List<BehospitalInfo> behospitalInfos = getBehospitalInfos(dateStart, dateEnd, hospitalId);
+            List<BehospitalInfo> behospitalInfos = getBehospitalInfos(DateUtil.addDate(DateUtil.now(), -30), DateUtil.now(), hospitalId);
             if (ListUtil.isNotEmpty(behospitalInfos)) {
                 for (BehospitalInfo behospitalInfo : behospitalInfos) {
                     behospitalCodeList.add(behospitalInfo.getBehospitalCode());

daqe-center/src/main/java/com/lantone/daqe/task/ColumnResultDataCompareTask.java

@@ -40,14 +40,8 @@ public class ColumnResultDataCompareTask implements SchedulingConfigurer {
             public void run() {
                 if(Boolean.parseBoolean(isUsed)){
                     DataCheckVO dataCheckVO = new DataCheckVO();
-                    String start="2021-01-01 03:08:38";
-                    String end="2021-01-30 03:08:38";
-                    Date dateStart = DateUtil.parseDateTime(start);
-                    Date dateEnd = DateUtil.parseDateTime(end);
-                    /*dataCheckVO.setDateStart(DateUtil.addDate(DateUtil.now(),-1));
-                    dataCheckVO.setDateEnd(DateUtil.now());*/
-                    dataCheckVO.setDateStart(dateStart);
-                    dataCheckVO.setDateEnd(dateEnd);
+                    dataCheckVO.setDateStart(DateUtil.addDate(DateUtil.now(),-1));
+                    dataCheckVO.setDateEnd(DateUtil.now());
                     dataCheckVO.setHospitalId(Long.valueOf(hospitalId));
                     columnResultManagementFacade.dataCheck(dataCheckVO);
                 }

daqe-center/src/main/resources/bootstrap.yml

@@ -71,6 +71,6 @@ columnResult:
 #修改规则数据校验定时器
 upColumnResult:
   compare:
-    cron: 0 0 12 * * ?
+    cron: 0 0 2 * * ?
     use: true
     hospitalId: 4

gateway-service/src/main/java/com/lantone/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

mdsp-service/src/main/java/com/lantone/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

mdsp-service/src/main/java/com/lantone/util/SysUserUtils.java

@@ -1,12 +1,9 @@
 package com.lantone.util;
 
-import com.lantone.common.constant.AuthConstant;
-import com.lantone.common.service.RedisService;
+import com.lantone.common.service.DictSetsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
-
 /**
  * @Description: 用户工具类
  * @author: gaodm
@@ -16,7 +13,7 @@ import java.util.Map;
 public class SysUserUtils {
 
     @Autowired
-    private RedisService redisService;
+    private DictSetsService dictSetsService;
 
     /**
      * 获取当前请求的用户ID
@@ -33,8 +30,7 @@ public class SysUserUtils {
      * @return
      */
     public String getCurrentHospitalID() {
-        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
-        return dicMap.get("0").get("53").get(com.lantone.common.util.SysUserUtils.getCurrentHospitalIdStr());
+        return dictSetsService.getOneDicMap("0", "53").get(com.lantone.common.util.SysUserUtils.getCurrentHospitalIdStr());
     }
 
 }

message-service/src/main/java/com/lantone/message/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.message.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

report-service/src/main/java/com/lantone/report/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.report.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

security-center/src/main/java/com/lantone/security/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.security.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}

security-center/src/main/java/com/lantone/security/facade/HospitalManagementFacade.java

@@ -5,27 +5,21 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.common.collect.Lists;
-import com.lantone.security.dto.DownBoxRegionDTO;
-import com.lantone.security.dto.GetDictionaryInfoByTypeDTO;
-import com.lantone.security.dto.GetHospitalByIdDTO;
-import com.lantone.security.dto.GetHospitalListInfoDTO;
-import com.lantone.security.dto.GetHospitalTreeDTO;
-import com.lantone.security.dto.GetHospitalUserDTO;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.exception.Asserts;
+import com.lantone.common.service.DictSetsService;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.vo.AddHospitalTreeVO;
-import com.lantone.security.vo.AddHospitalVO;
-import com.lantone.security.vo.AddRoleVO;
-import com.lantone.security.vo.AddUserVO;
-import com.lantone.security.vo.GetHospitalListInfoVO;
-import com.lantone.security.vo.UpdateHospitalVO;
-import com.lantone.security.vo.UpdateUserVO;
+import com.lantone.security.dto.DownBoxRegionDTO;
+import com.lantone.security.dto.GetDictionaryInfoByTypeDTO;
+import com.lantone.security.dto.GetHospitalByIdDTO;
+import com.lantone.security.dto.GetHospitalListInfoDTO;
+import com.lantone.security.dto.GetHospitalTreeDTO;
+import com.lantone.security.dto.GetHospitalUserDTO;
 import com.lantone.security.entity.Dept;
 import com.lantone.security.entity.Hospital;
 import com.lantone.security.entity.HospitalUser;
@@ -33,6 +27,9 @@ import com.lantone.security.entity.Region;
 import com.lantone.security.entity.RegionDept;
 import com.lantone.security.entity.Role;
 import com.lantone.security.entity.User;
+import com.lantone.security.enums.DictionaryEnum;
+import com.lantone.security.enums.HospitalTypeEnum;
+import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.facade.base.DeptFacade;
 import com.lantone.security.facade.base.DictionaryInfoFacade;
 import com.lantone.security.facade.base.HospitalFacade;
@@ -42,9 +39,13 @@ import com.lantone.security.facade.base.RegionFacade;
 import com.lantone.security.facade.base.RoleFacade;
 import com.lantone.security.facade.base.UserFacade;
 import com.lantone.security.facade.base.UserRoleFacade;
-import com.lantone.security.enums.DictionaryEnum;
-import com.lantone.security.enums.HospitalTypeEnum;
-import com.lantone.security.enums.ReturnTypeEnum;
+import com.lantone.security.vo.AddHospitalTreeVO;
+import com.lantone.security.vo.AddHospitalVO;
+import com.lantone.security.vo.AddRoleVO;
+import com.lantone.security.vo.AddUserVO;
+import com.lantone.security.vo.GetHospitalListInfoVO;
+import com.lantone.security.vo.UpdateHospitalVO;
+import com.lantone.security.vo.UpdateUserVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -83,6 +84,8 @@ public class HospitalManagementFacade {
     private RegionDeptFacade regionDeptFacade;
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
+    @Autowired
+    private DictSetsService dictSetsService;
 
     /**
      * @param addHospitalVO
@@ -514,7 +517,7 @@ public class HospitalManagementFacade {
      */
     public Map<String, Object> getManagerBoxInfo() {
         Map<String, Object> outMap = new HashMap<>();
-        String boxId = dictionaryInfoFacade.getOneDicMap(ReturnTypeEnum.INTERFACE.getKey(), DictionaryEnum.MANAGE_HIDE_MENU.getKey() + "").get("box");
+        String boxId = dictSetsService.getOneDicMap(ReturnTypeEnum.INTERFACE.getKey(), DictionaryEnum.MANAGE_HIDE_MENU.getKey() + "").get("box");
         Map<String, List<GetDictionaryInfoByTypeDTO>> dicMapObj = dictionaryInfoFacade.getDicMapObj(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(boxId.split(",")));
         outMap.putAll(dicMapObj);
@@ -654,7 +657,7 @@ public class HospitalManagementFacade {
      */
     public boolean resetPassword(Long hospitalId) {
         User user = new User();
-        String password = dictionaryInfoFacade.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        String password = dictSetsService.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.PASSWORD.getKey() + ""))
                 .get(DictionaryEnum.PASSWORD.getKey() + "").get("password");
         if (StringUtil.isEmpty(password)) {

security-center/src/main/java/com/lantone/security/facade/NoticeManagementFacade.java

@@ -3,42 +3,42 @@ 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.lantone.security.dto.GetHospitalTreeDTO;
-import com.lantone.security.dto.GetHospitalUserPageDTO;
-import com.lantone.security.dto.GetMyNoticeListDTO;
-import com.lantone.security.dto.GetNoticeInfoByIdDTO;
-import com.lantone.security.dto.ListManagePageDTO;
 import com.lantone.common.dto.SendToTopicDTO;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.exception.Asserts;
+import com.lantone.common.service.DictSetsService;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.vo.AddNoticeVO;
-import com.lantone.security.vo.GetHospitalUserVO;
-import com.lantone.security.vo.GetMyNoticeListVO;
-import com.lantone.security.vo.ListManagePageVO;
+import com.lantone.security.client.MessageService;
+import com.lantone.security.dto.GetHospitalTreeDTO;
+import com.lantone.security.dto.GetHospitalUserPageDTO;
+import com.lantone.security.dto.GetMyNoticeListDTO;
+import com.lantone.security.dto.GetNoticeInfoByIdDTO;
+import com.lantone.security.dto.ListManagePageDTO;
 import com.lantone.security.entity.Dept;
 import com.lantone.security.entity.HospitalUser;
 import com.lantone.security.entity.Notice;
 import com.lantone.security.entity.NoticeUser;
 import com.lantone.security.entity.User;
+import com.lantone.security.enums.DictionaryEnum;
+import com.lantone.security.enums.ReadTypeEnum;
+import com.lantone.security.enums.ReceiveTypeEnum;
+import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.facade.base.DeptFacade;
 import com.lantone.security.facade.base.DeptUserFacade;
-import com.lantone.security.facade.base.DictionaryInfoFacade;
 import com.lantone.security.facade.base.HospitalFacade;
 import com.lantone.security.facade.base.HospitalUserFacade;
 import com.lantone.security.facade.base.NoticeFacade;
 import com.lantone.security.facade.base.NoticeUserFacade;
 import com.lantone.security.facade.base.UserFacade;
 import com.lantone.security.service.impl.NoticeUserServiceImpl;
-import com.lantone.security.enums.DictionaryEnum;
-import com.lantone.security.enums.ReadTypeEnum;
-import com.lantone.security.enums.ReceiveTypeEnum;
-import com.lantone.security.enums.ReturnTypeEnum;
-import com.lantone.security.client.MessageService;
+import com.lantone.security.vo.AddNoticeVO;
+import com.lantone.security.vo.GetHospitalUserVO;
+import com.lantone.security.vo.GetMyNoticeListVO;
+import com.lantone.security.vo.ListManagePageVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -73,7 +73,7 @@ public class NoticeManagementFacade {
     @Autowired
     private DeptFacade deptFacade;
     @Autowired
-    private DictionaryInfoFacade dictionaryInfoFacade;
+    private DictSetsService dictSetsService;
     @Autowired
     private MessageService messageService;
 
@@ -203,7 +203,7 @@ public class NoticeManagementFacade {
         Set<HospitalUser> tempUsers = hospitalUserFacade.list(new QueryWrapper<HospitalUser>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("hospital_id", hospitals)).stream().collect(Collectors.toSet());
-        if (tempUsers != null && tempUsers.size()>0) {
+        if (tempUsers != null && tempUsers.size() > 0) {
             hospitalUsers.addAll(tempUsers);
         }
         //获取医院的科室
@@ -239,7 +239,7 @@ public class NoticeManagementFacade {
 
         GetNoticeInfoByIdDTO getNoticeInfoByIdDTO = new GetNoticeInfoByIdDTO();
         //获取字典类型
-        Map<String, String> noticeType = dictionaryInfoFacade.getOneDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        Map<String, String> noticeType = dictSetsService.getOneDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 DictionaryEnum.NOTICE_TYPE.getKey() + "");
         Notice notice = noticeFacade.getById(id);
         if (notice == null) {

security-center/src/main/java/com/lantone/security/facade/RoleManagementFacade.java

@@ -5,6 +5,15 @@ 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.google.common.collect.Lists;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.enums.StatusEnum;
+import com.lantone.common.exception.Asserts;
+import com.lantone.common.service.DictSetsService;
+import com.lantone.common.util.DateUtil;
+import com.lantone.common.util.EntityUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.common.util.SysUserUtils;
 import com.lantone.security.dto.GetCreateRoleDTO;
 import com.lantone.security.dto.GetDictionaryInfoByTypeDTO;
 import com.lantone.security.dto.GetRoleDTO;
@@ -13,17 +22,6 @@ import com.lantone.security.dto.GetUserShowTreeDTO;
 import com.lantone.security.dto.SoftwareDTO;
 import com.lantone.security.dto.UserMenuResourceTreeDTO;
 import com.lantone.security.dto.UserRoleDTO;
-import com.lantone.common.enums.StatusEnum;
-import com.lantone.common.exception.Asserts;
-import com.lantone.common.util.DateUtil;
-import com.lantone.common.util.EntityUtil;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.StringUtil;
-import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.vo.AddRoleSoftwareVO;
-import com.lantone.security.vo.AddRoleVO;
-import com.lantone.security.vo.GetRolePageVO;
-import com.lantone.security.vo.UpdateRoleVO;
 import com.lantone.security.entity.Hospital;
 import com.lantone.security.entity.Menu;
 import com.lantone.security.entity.Resource;
@@ -33,6 +31,9 @@ import com.lantone.security.entity.RoleSoftwareResource;
 import com.lantone.security.entity.SoftwareMenu;
 import com.lantone.security.entity.SoftwareResource;
 import com.lantone.security.entity.UserRole;
+import com.lantone.security.enums.DictionaryEnum;
+import com.lantone.security.enums.RelationEnum;
+import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.facade.base.DictionaryInfoFacade;
 import com.lantone.security.facade.base.HospitalFacade;
 import com.lantone.security.facade.base.MenuFacade;
@@ -47,10 +48,10 @@ import com.lantone.security.facade.base.UserFacade;
 import com.lantone.security.facade.base.UserRoleFacade;
 import com.lantone.security.service.impl.RoleSoftwareMenuServiceImpl;
 import com.lantone.security.service.impl.RoleSoftwareResourceServiceImpl;
-import com.lantone.common.enums.IsDeleteEnum;
-import com.lantone.security.enums.DictionaryEnum;
-import com.lantone.security.enums.RelationEnum;
-import com.lantone.security.enums.ReturnTypeEnum;
+import com.lantone.security.vo.AddRoleSoftwareVO;
+import com.lantone.security.vo.AddRoleVO;
+import com.lantone.security.vo.GetRolePageVO;
+import com.lantone.security.vo.UpdateRoleVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -89,6 +90,8 @@ public class RoleManagementFacade {
     @Autowired
     private DictionaryInfoFacade dictionaryInfoFacade;
     @Autowired
+    private DictSetsService dictSetsService;
+    @Autowired
     private ResourceFacade resourceFacade;
     @Autowired
     private MenuFacade menuFacade;
@@ -96,9 +99,6 @@ public class RoleManagementFacade {
     private SoftwareMenuFacade softwareMenuFacade;
     @Autowired
     private SoftwareResourceFacade softwareResourceFacade;
-    @Autowired
-    private DataAuthManagementFacade dataAuthManagementFacade;
-
 
     /**
      * @param roleId
@@ -147,6 +147,7 @@ public class RoleManagementFacade {
         }
         return false;
     }
+
     /**
      * @param roleId
      * @param status
@@ -265,7 +266,7 @@ public class RoleManagementFacade {
         //插入sys_role_software_menu,sys_role_software_resource
         AtomicReference<Boolean> out = new AtomicReference<>(false);
         //获取角色必备的权限添加给用户
-        String hasMenuResourceStr = dictionaryInfoFacade.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        String hasMenuResourceStr = dictSetsService.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + ""))
                 .get(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + "").get("hasMenuResource");
 
@@ -492,13 +493,13 @@ public class RoleManagementFacade {
     private List<UserMenuResourceTreeDTO> getUserMenuResourceTreeByRoles(List<Long> roles, String type) {
         List hideMenus = null;
         //获取type下要隐藏的菜单
-        String dictionaryInfoStr  = dictionaryInfoFacade.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        String dictionaryInfoStr = dictSetsService.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + ""))
                 .get(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + "").get("manageHideMenu");
         if (StringUtil.isNotEmpty(dictionaryInfoStr)) {
             try {
                 hideMenus = JSONObject.parseObject(dictionaryInfoStr).getJSONArray(type).toJavaList(Long.class);
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
@@ -515,13 +516,13 @@ public class RoleManagementFacade {
     private List<UserMenuResourceTreeDTO> getUserMenuResourceTreeByRoles(List<Long> loginRoles, List<Long> selectRoles, String type) {
         List hideMenus = null;
         //获取type下要隐藏的菜单
-        String dictionaryInfoStr  = dictionaryInfoFacade.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        String dictionaryInfoStr = dictSetsService.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + ""))
                 .get(DictionaryEnum.MANAGE_HIDE_MENU.getKey() + "").get("manageHideMenu");
         if (StringUtil.isNotEmpty(dictionaryInfoStr)) {
             try {
                 hideMenus = JSONObject.parseObject(dictionaryInfoStr).getJSONArray(type).toJavaList(Long.class);
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -10,24 +10,14 @@ import com.google.common.collect.Lists;
 import com.lantone.common.api.CommonResult;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.domain.UserDto;
-import com.lantone.security.dto.GetDeptTreeDTO;
-import com.lantone.security.dto.GetHospitalTreeDTO;
-import com.lantone.security.dto.GetUserDTO;
-import com.lantone.security.dto.GetUserHospitalDeptDTO;
-import com.lantone.security.dto.GetUserHospitalsDTO;
-import com.lantone.security.dto.GetUserPageDTO;
 import com.lantone.common.dto.JwtStore;
 import com.lantone.common.dto.LoginLogDTO;
 import com.lantone.common.dto.SendToTopicDTO;
-import com.lantone.security.dto.SoftwareDTO;
-import com.lantone.security.dto.UserInfoDTO;
-import com.lantone.security.dto.UserRoleDTO;
-import com.lantone.security.dto.UserSoftwareHospitalDTO;
 import com.lantone.common.enums.DataAuthDataTypeEnum;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.enums.StatusEnum;
 import com.lantone.common.exception.Asserts;
-import com.lantone.common.service.RedisService;
+import com.lantone.common.service.DictSetsService;
 import com.lantone.common.service.SysTokenService;
 import com.lantone.common.util.DateUtil;
 import com.lantone.common.util.EntityUtil;
@@ -35,11 +25,18 @@ import com.lantone.common.util.HttpUtils;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
-import com.lantone.security.vo.AddHospitalTreeVO;
-import com.lantone.security.vo.AddUserVO;
-import com.lantone.security.vo.GetUserPageVO;
-import com.lantone.security.vo.LoginVO;
-import com.lantone.security.vo.UpdateUserVO;
+import com.lantone.security.client.AuthService;
+import com.lantone.security.client.MessageService;
+import com.lantone.security.dto.GetDeptTreeDTO;
+import com.lantone.security.dto.GetHospitalTreeDTO;
+import com.lantone.security.dto.GetUserDTO;
+import com.lantone.security.dto.GetUserHospitalDeptDTO;
+import com.lantone.security.dto.GetUserHospitalsDTO;
+import com.lantone.security.dto.GetUserPageDTO;
+import com.lantone.security.dto.SoftwareDTO;
+import com.lantone.security.dto.UserInfoDTO;
+import com.lantone.security.dto.UserRoleDTO;
+import com.lantone.security.dto.UserSoftwareHospitalDTO;
 import com.lantone.security.entity.Dept;
 import com.lantone.security.entity.DeptUser;
 import com.lantone.security.entity.Doctor;
@@ -49,9 +46,12 @@ import com.lantone.security.entity.MedoupDoctor;
 import com.lantone.security.entity.Role;
 import com.lantone.security.entity.User;
 import com.lantone.security.entity.UserRole;
+import com.lantone.security.enums.DictionaryEnum;
+import com.lantone.security.enums.HospitalTypeEnum;
+import com.lantone.security.enums.RelationEnum;
+import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.facade.base.DeptFacade;
 import com.lantone.security.facade.base.DeptUserFacade;
-import com.lantone.security.facade.base.DictionaryInfoFacade;
 import com.lantone.security.facade.base.DoctorFacade;
 import com.lantone.security.facade.base.HospitalFacade;
 import com.lantone.security.facade.base.HospitalUserFacade;
@@ -59,12 +59,11 @@ import com.lantone.security.facade.base.MedoupDoctorFacade;
 import com.lantone.security.facade.base.RoleFacade;
 import com.lantone.security.facade.base.UserFacade;
 import com.lantone.security.facade.base.UserRoleFacade;
-import com.lantone.security.enums.DictionaryEnum;
-import com.lantone.security.enums.HospitalTypeEnum;
-import com.lantone.security.enums.RelationEnum;
-import com.lantone.security.enums.ReturnTypeEnum;
-import com.lantone.security.client.AuthService;
-import com.lantone.security.client.MessageService;
+import com.lantone.security.vo.AddHospitalTreeVO;
+import com.lantone.security.vo.AddUserVO;
+import com.lantone.security.vo.GetUserPageVO;
+import com.lantone.security.vo.LoginVO;
+import com.lantone.security.vo.UpdateUserVO;
 import eu.bitwalker.useragentutils.UserAgent;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,8 +94,6 @@ public class UserManagementFacade {
     @Autowired
     private HospitalUserFacade hospitalUserFacade;
     @Autowired
-    private DeptUserFacade deptUserFacade;
-    @Autowired
     private DeptFacade deptFacade;
     @Autowired
     private UserFacade userFacade;
@@ -111,12 +108,10 @@ public class UserManagementFacade {
     @Autowired
     private DoctorFacade doctorfacade;
     @Autowired
-    private DictionaryInfoFacade dictionaryInfoFacade;
+    private DictSetsService dictSetsService;
     @Autowired
     private MessageService messageService;
     @Autowired
-    private RedisService redisService;
-    @Autowired
     private SysTokenService sysTokenService;
 
     public CommonResult login(LoginVO loginVO) {
@@ -368,8 +363,7 @@ public class UserManagementFacade {
         user.setModifier(userId);
         return userFacade.updateById(user);
     }
-
-
+    
     /**
      * 未加密密文正则表达式  至少8个字符，1个大写字母，1个小写字母，1个数字和1个特殊字符：
      *
@@ -378,7 +372,7 @@ public class UserManagementFacade {
      */
     public Boolean passwordRegular(String password, String hospitalId) {
         boolean check = true;
-        Map<String, Map<String, String>> dictionaryWithKey = dictionaryInfoFacade.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
+        Map<String, Map<String, String>> dictionaryWithKey = dictSetsService.getDicMap(ReturnTypeEnum.INTERFACE.getKey(),
                 Lists.newArrayList(DictionaryEnum.PASSWORD.getKey() + ""));
         if (dictionaryWithKey != null) {
             Map<String, String> stringStringMap = dictionaryWithKey.get(DictionaryEnum.PASSWORD.getKey() + "");
@@ -862,9 +856,8 @@ public class UserManagementFacade {
     }
 
     /**
-     *@Description用户登出
-     *
      * @param userId
+     * @Description用户登出
      * @Return com.lantone.common.api.CommonResult<java.lang.Boolean>
      */
     public CommonResult<Boolean> close(String userId) {

security-center/src/main/java/com/lantone/security/facade/base/DictionaryInfoFacade.java

@@ -2,15 +2,13 @@ package com.lantone.security.facade.base;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.common.constant.AuthConstant;
-import com.lantone.security.dto.GetDictionaryInfoByTypeDTO;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.enums.StatusEnum;
+import com.lantone.common.service.DictSetsService;
 import com.lantone.common.service.RedisService;
-import com.lantone.common.util.ListUtil;
-import com.lantone.common.util.StringUtil;
+import com.lantone.security.dto.GetDictionaryInfoByTypeDTO;
 import com.lantone.security.entity.DictionaryInfo;
 import com.lantone.security.service.impl.DictionaryInfoServiceImpl;
-import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -30,6 +28,8 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
 
     @Autowired
     private RedisService redisService;
+    @Autowired
+    private DictSetsService dictSetsService;
 
     public Map<String, Map<String, Map<String, String>>> initDicMap() {
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<DictionaryInfo>()
@@ -55,40 +55,6 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
         return dicMap;
     }
 
-    /**
-     * @param returnType 返回类型
-     * @param groupTypes 分组集合
-     * @Description获取指定groupTyeps的字典集
-     * @Return java.util.Map<java.lang.String, java.util.Map < java.lang.String, java.lang.String>>
-     */
-    public Map<String, Map<String, String>> getDicMap(String returnType, List<String> groupTypes) {
-        Map<String, Map<String, String>> outDicMap = new HashMap<>();
-        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
-        Map<String, Map<String, String>> returnDicMap = dicMap.get(returnType);
-        if (MapUtils.isNotEmpty(returnDicMap) && ListUtil.isNotEmpty(groupTypes)) {
-            groupTypes.stream().forEach(groupType -> {
-                outDicMap.put(groupType, returnDicMap.get(groupType));
-            });
-        }
-        return outDicMap;
-    }
-
-    /**
-     * @param returnType 返回类型
-     * @param groupType  分组集合
-     * @Description获取指定groupTyeps的字典集
-     * @Return java.util.Map<java.lang.String, java.util.Map < java.lang.String, java.lang.String>>
-     */
-    public Map<String, String> getOneDicMap(String returnType, String groupType) {
-        Map<String, Map<String, Map<String, String>>> dicMap = redisService.get(AuthConstant.DIC_MAP_KEY);
-        Map<String, Map<String, String>> returnDicMap = dicMap.get(returnType);
-        if (MapUtils.isNotEmpty(returnDicMap) && StringUtil.isNotBlank(groupType)) {
-            return returnDicMap.get(groupType);
-        }
-        return null;
-    }
-
-
     /**
      * @param returnType 返回类型
      * @param groupTypes 分组集合
@@ -97,7 +63,7 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
      */
     public Map<String, List<GetDictionaryInfoByTypeDTO>> getDicMapObj(String returnType, List<String> groupTypes) {
         Map<String, List<GetDictionaryInfoByTypeDTO>> outDicMap = new HashMap<>();
-        Map<String, Map<String, String>> dicMap = getDicMap(returnType, groupTypes);
+        Map<String, Map<String, String>> dicMap = dictSetsService.getDicMap(returnType, groupTypes);
         dicMap.keySet().stream().forEach(groupType -> {
             List<GetDictionaryInfoByTypeDTO> tempObjs = new ArrayList<>();
             dicMap.get(groupType).keySet().stream().forEach(name -> {
@@ -110,4 +76,5 @@ public class DictionaryInfoFacade extends DictionaryInfoServiceImpl {
         });
         return outDicMap;
     }
+
 }

security-center/src/main/java/com/lantone/security/facade/base/HospitalSetFacade.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.common.constant.AuthConstant;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.service.RedisService;
-import com.lantone.common.util.StringUtil;
 import com.lantone.security.entity.HospitalSet;
 import com.lantone.security.service.impl.HospitalSetServiceImpl;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -48,18 +46,5 @@ public class HospitalSetFacade extends HospitalSetServiceImpl {
         redisService.set(AuthConstant.HOSPITAL_SET_MAP_KEY, hospitalSetMap);
         return hospitalSetMap;
     }
-    /**
-     * @param hospitalId 医院id
-     * @param code  分组集合
-     * @Description获取某医院code的内容
-     * @Return java.util.Map<java.lang.String, java.util.Map < java.lang.String, java.lang.String>>
-     */
-    public Map<String, String> getHospitalCodeMap(String hospitalId, String code) {
-        Map<String, Map<String, Map<String, String>>> hospitalSetMap = redisService.get(AuthConstant.HOSPITAL_SET_MAP_KEY);
-        Map<String, Map<String, String>> codeMap = hospitalSetMap.get(hospitalId);
-        if (MapUtils.isNotEmpty(codeMap) && StringUtil.isNotBlank(code)) {
-            return codeMap.get(code);
-        }
-        return null;
-    }
+
 }

structure-center/src/main/java/com/lantone/structure/config/SundriesConfig.java

@@ -0,0 +1,14 @@
+package com.lantone.structure.config;
+
+import com.lantone.common.config.BaseSundriesConfig;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 其他配置
+ * @author: rengb
+ * @time: 2022/4/12 18:38
+ */
+@Configuration
+public class SundriesConfig extends BaseSundriesConfig {
+
+}