字典查询子节点接口

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -438,4 +438,23 @@ public class SysDictionaryController extends CoreBaseController{
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+
+    /**
+     * 根据父级id查询字典
+     * @param parentId 父级id
+     * @return 查询数据
+     */
+    @GetMapping("/find-child/{parentId}")
+    @ApiOperation(value = "根据父级id查询字典",notes = "根据父级id查询字典")
+    public ResultBean<SysDictionary> findSysDictionaryByParentId(@PathVariable("parentId") String parentId){
+        try {
+            List<SysDictionary> dictionaryList = sysDictionaryService.findSysDictionaryByParentId(Long.parseLong(parentId));
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictionaryList);
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java

@@ -126,11 +126,13 @@ public class MessageWebSocket {
         try {
             MessageWebSocket websocket = webSocketMap.get(userLoginSid);
             if (websocket != null && websocket.session.isOpen()) {
-                if (message.equals("heartBit")) {
+                synchronized (websocket.session) {
-                    websocket.session.getBasicRemote().sendText(message + "=" + sendCount);
+                    if (message.equals("heartBit")) {
-                    sendCount++;
+                        websocket.session.getBasicRemote().sendText(message + "=" + sendCount);
-                } else {
+                        sendCount++;
-                    websocket.session.getBasicRemote().sendText(message);
+                    } else {
+                        websocket.session.getBasicRemote().sendText(message);
+                    }
                 }
             }
         } catch (IOException e) {