修复忘掉的内容

src/main/java/thyyxxk/webserver/controller/ShutDownController.java

@@ -5,10 +5,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.service.PublicServer;
+import thyyxxk.webserver.service.hutoolcache.CacheEnums;
 import thyyxxk.webserver.service.hutoolcache.ExtraCache;
 import thyyxxk.webserver.utils.ResultVoUtil;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
@@ -17,8 +17,6 @@ public class ShutDownController {
 
     private final PublicServer publicServer;
     private final ExtraCache extraCache;
-    public final static String SCROLLING_MESSAGES = "scrollingMessages";
-    public final static String SYSTEM_UPDATES_MESSAGE = "systemUpdatesMessage";
 
     public ShutDownController(PublicServer publicServer, ExtraCache extraCache) {
         this.publicServer = publicServer;
@@ -28,24 +26,21 @@ public class ShutDownController {
 
     @GetMapping("sendSystemUpdatesMessage")
     public ResultVo<String> sendSystemUpdatesMessage(String message) {
-        extraCache.put(SYSTEM_UPDATES_MESSAGE, message);
+        extraCache.put(CacheEnums.SYSTEM_UPDATES_MESSAGE.getName(), message);
         publicServer.sendSystemAnnouncement();
         return ResultVoUtil.success();
     }
 
     @GetMapping("sendScrollingMessages")
     public ResultVo<String> sendScrollingMessages(String message) {
-        extraCache.put(SCROLLING_MESSAGES, message);
+        extraCache.put(CacheEnums.SCROLLING_MESSAGES.getName(), message);
         publicServer.sendSystemAnnouncement();
         return ResultVoUtil.success();
     }
 
     @GetMapping("/getSystemAnnouncement")
     public ResultVo<Map<String, String>> getSystemAnnouncement() {
-        Map<String, String> map = new HashMap<>();
-        map.put(SYSTEM_UPDATES_MESSAGE, (String) extraCache.get(SYSTEM_UPDATES_MESSAGE));
-        map.put(SCROLLING_MESSAGES, (String) extraCache.get(SCROLLING_MESSAGES));
-        return ResultVoUtil.success(map);
+        return ResultVoUtil.success(extraCache.getMessage());
     }
 
 

src/main/java/thyyxxk/webserver/service/LoginService.java

@@ -77,11 +77,11 @@ public class LoginService {
         if (!deptList.isEmpty()) {
             Map<String, String> tempMap = new HashMap<>(deptList.size());
             deptList.forEach(item -> {
-                tempMap.put(item, getDeptName(item));
+                tempMap.put(item, deptCache.getDeptName(item));
             });
             userInfo.setPartTimeDeptMap(tempMap);
         }
-        userInfo.setHzDay(loginDao.getDeptHzDayByCode(userInfo.getDeptCode()));
+        userInfo.setHzDay(dao.getDeptHzDayByCode(userInfo.getDeptCode()));
 
 
 
@@ -151,7 +151,7 @@ public class LoginService {
     }
 
     public UserInfo getUserInfoByCode() {
-        return redisLikeService.getUserInfoByToken();
+        return userCache.getUserInfoByToken();
     }
 
 }

src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -44,6 +44,7 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.XinZhenYiZhu;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.YaoPinXiangMu;
 import thyyxxk.webserver.service.externalhttp.WebSocketService;
 import thyyxxk.webserver.service.hutoolcache.ExtraCache;
+import thyyxxk.webserver.service.hutoolcache.UserCache;
 import thyyxxk.webserver.utils.*;
 
 import java.lang.reflect.InvocationTargetException;
@@ -68,15 +69,17 @@ public class PublicServer {
     private final WebSocketService socketService;
     private final SqlSessionFactory sqlSessionFactory;
     private final ExtraCache extraCache;
+    private final UserCache userCache;
 
 
-    public PublicServer(PublicDao dao, TransferInOfExpensesDao transferInOfExpensesDao, WebSocketService socketService, SettingsDao settingsDao, SqlSessionFactory sqlSessionFactory, ExtraCache extraCache) {
+    public PublicServer(PublicDao dao, TransferInOfExpensesDao transferInOfExpensesDao, WebSocketService socketService, SettingsDao settingsDao, SqlSessionFactory sqlSessionFactory, ExtraCache extraCache, UserCache userCache) {
         this.dao = dao;
         this.transferInOfExpensesDao = transferInOfExpensesDao;
         this.settingsDao = settingsDao;
         this.extraCache = extraCache;
         this.socketService = socketService;
         this.sqlSessionFactory = sqlSessionFactory;
+        this.userCache = userCache;
     }
 
     /**
@@ -106,7 +109,7 @@ public class PublicServer {
      * @return 返回角色
      */
     public ResultVo<List<Integer>> getRoleCode() {
-        return ResultVoUtil.success(redisLikeService.getUserInfoByToken().getRoles());
+        return ResultVoUtil.success(userCache.getUserInfoByToken().getRoles());
     }
 
     /**
@@ -389,7 +392,7 @@ public class PublicServer {
     }
 
     public Set<String> getChildDeptByUserCode(boolean needPartTimeDept, String userCode) {
-        UserInfo userInfo = redisLikeService.getUserInfoByCode(userCode);
+        UserInfo userInfo = userCache.get(userCode);
         return getDept(needPartTimeDept, userInfo);
     }
 
@@ -399,13 +402,24 @@ public class PublicServer {
      * @return 返回科室
      */
     public Set<String> getChildDeptByUserCode(boolean needPartTimeDept) {
-        UserInfo userInfo = redisLikeService.getUserInfoByToken();
+        UserInfo userInfo = userCache.getUserInfoByToken();
         return getDept(needPartTimeDept, userInfo);
     }
 
     @NotNull
     public Set<String> getDept(boolean needPartTimeDept, UserInfo userInfo) {
-        return redisLikeService.getDept(needPartTimeDept, userInfo);
+        Set<String> list = new HashSet<>();
+        if (needPartTimeDept && ListUtil.notBlank(userInfo.getPartTimeDept())) {
+            list.addAll(userInfo.getPartTimeDept());
+        }
+        list.add(userInfo.getDeptCode());
+        QueryWrapper<?> qw = new QueryWrapper<>();
+        qw.in("parent_code", list);
+        List<String> temp = dao.selectChildDeptByCodeList(qw);
+        if (ListUtil.notBlank(temp)) {
+            list.addAll(temp);
+        }
+        return list;
     }
 
 
@@ -720,7 +734,7 @@ public class PublicServer {
         }
 
         JSONObject json = new JSONObject();
-        UserInfo userInfo = redisLikeService.getUserInfoByCode(sender);
+        UserInfo userInfo = userCache.get(sender);
         json.put("avatar", userInfo.getAvatar());
         json.put("deptName", userInfo.getDeptName());
         json.put("name", userInfo.getName());
@@ -856,7 +870,7 @@ public class PublicServer {
 
 
     public void sendSystemAnnouncement() {
-        Map<String, String> map = redisLikeService.getMessage();
+        Map<String, String> map = extraCache.getMessage();
         JSONObject obj = new JSONObject();
         obj.put("data", map);
         String msgContent = SocketMsg.socketVo(Message.SYSTEM_ANNOUNCEMENT, obj);
@@ -887,7 +901,7 @@ public class PublicServer {
     }
 
     public ResultVo<UserInfo> getUserInfoByCode(String code) {
-        return ResultVoUtil.success(redisLikeService.getUserInfoByCode(code));
+        return ResultVoUtil.success(userCache.get(code));
     }
 
 
@@ -911,7 +925,7 @@ public class PublicServer {
     }
 
     public ResultVo<String> refreshUserInfo(String code) {
-        redisLikeService.updateUserInfo(code);
+        userCache.refreshCache(code);
         return ResultVoUtil.success();
     }
 
@@ -921,7 +935,7 @@ public class PublicServer {
 
     public Set<String> getUserDeptList(String code) {
         Set<String> deptList;
-        UserInfo userInfo = redisLikeService.getUserInfoByCode(code);
+        UserInfo userInfo = userCache.get(code);
         if (userInfo.getDeptCode().startsWith("8")) {
             deptList = dao.chaXunZhiZXinKeShi(userInfo.getDeptCode());
             deptList.add(userInfo.getDeptCode());

src/main/java/thyyxxk/webserver/service/hutoolcache/CacheEnums.java

@@ -9,12 +9,15 @@ public enum CacheEnums {
 
     YI_ZHU_SPECIAL_MEDICAL_ADVICE("特殊医嘱编码"),
 
-    ROLE_MENU("用户角色");
+    ROLE_MENU("用户角色"),
+
+    SCROLLING_MESSAGES("scrollingMessages"),
+
+    SYSTEM_UPDATES_MESSAGE("systemUpdatesMessage");
 
     private final String name;
 
     CacheEnums(String name) {
         this.name = name;
     }
-
 }

src/main/java/thyyxxk/webserver/service/hutoolcache/ExtraCache.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import thyyxxk.webserver.dao.his.hutoolcache.HutoolCacheDao;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.YzZdOrderItemConfirm;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -53,7 +54,6 @@ public class ExtraCache implements HutoolCacheInterface<Object> {
         cache.remove(key);
     }
 
-
     public void del(CacheEnums key) {
         cache.remove(key.getName());
     }
@@ -76,4 +76,13 @@ public class ExtraCache implements HutoolCacheInterface<Object> {
         return getValue(CacheEnums.YI_ZHU_SPECIAL_MEDICAL_ADVICE, dao::getYzZdOrderItemConfirm);
     }
 
+    public Map<String, String> getMessage() {
+        Map<String, String> map = new HashMap<>();
+        map.put(CacheEnums.SYSTEM_UPDATES_MESSAGE.getName(),
+                (String) get(CacheEnums.SYSTEM_UPDATES_MESSAGE.getName()));
+        map.put(CacheEnums.SCROLLING_MESSAGES.getName(),
+                (String) get(CacheEnums.SCROLLING_MESSAGES.getName()));
+        return map;
+    }
+
 }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrServer.java

@@ -790,7 +790,7 @@ public class EmrServer {
 
 
     public ResultVo<String> addEmrTips(MedicalHistoryPrompts param) {
-        UserInfo userInfo = redisLikeService.getUserInfoByToken();
+        UserInfo userInfo = userCache.getUserInfoByToken();
         param.setDept(userInfo.getDeptCode());
         param.setCreatorId(userInfo.getCode());
         dao.insertEmrTips(param);
@@ -818,7 +818,7 @@ public class EmrServer {
      */
     public ResultVo<List<MedicalHistoryPrompts>> getEmrTipsData(String name, int typeCode) {
         QueryWrapper<?> qw = new QueryWrapper<>();
-        UserInfo us = redisLikeService.getUserInfoByToken();
+        UserInfo us = userCache.getUserInfoByToken();
         if (typeCode == 1) {
             qw.eq("creator_id", us.getCode());
         } else if (typeCode == 2) {