diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 995c3c2..679bc5a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/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 findSysDictionaryByParentId(@PathVariable("parentId") String parentId){ + try { + List 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); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java index 2db25de..2615406 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java +++ b/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")) { - websocket.session.getBasicRemote().sendText(message + "=" + sendCount); - sendCount++; - } else { - websocket.session.getBasicRemote().sendText(message); + synchronized (websocket.session) { + if (message.equals("heartBit")) { + websocket.session.getBasicRemote().sendText(message + "=" + sendCount); + sendCount++; + } else { + websocket.session.getBasicRemote().sendText(message); + } } } } catch (IOException e) {