From 983fbf268e1e972a1de8b53ec8bcdb0bd08d85eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 1 Jul 2019 15:01:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysDictionaryController.java | 19 +++++++++++++++++++ .../core/apiservice/websocket/MessageWebSocket.java | 12 +++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) 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) { From a02ad7a5510eadb07942d8b85c36493838ef18b8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 13:11:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/SysRoleService.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index d2fa1c0..4b1aad3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -92,18 +92,8 @@ public class SysRoleService implements ISysRoleService { @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息") public void deleteSysRoleByIds(Long[] ids) { LOGGER.info("系统角色 SYS_ROLE ids :{}", ids); - long positionCount = roleRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("parentId",ids)); - if (positionCount >= 1) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("存在相关系统功能信息无法删除！") - .setErrorSolution("请先删除子集信息在操作") - .build(); - }else { - refRoleMenuRDao.deleteByPropertyIn("roleId",ids); - roleRDao.deleteByIds(ids); - } + refRoleMenuRDao.deleteByPropertyIn("roleId",ids); + roleRDao.deleteByIds(ids); } @Override From 4919263f81da6fb2b3b7e5d4c3b18b7b324ac6de Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 2 Jul 2019 19:47:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/SysUserController.java | 2 +- .../core/apiservice/controller/busi/SysUserInfoController.java | 1 - .../i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java | 3 ++- .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 27b8e33..e56f60e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -297,7 +297,7 @@ public class SysUserController extends CoreBaseController{ @ApiOperation(value="查询系统用户",notes="组合查询用户，外带分页查询(isValid = 1)") public ResultBean querySysUserByPager(SysUser user, Pager pager){ try{ - user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); +// user.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); ListPager listPager = sysUserService.querySysUserByPager(user, pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 4fbe4d9..aeac706 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -189,7 +189,6 @@ public class SysUserInfoController extends CoreBaseController{ @ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页") public ResultBean querySysUserInfo(SysUserInfo userInfo, Pager pager){ try{ - userInfo.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); ListPager listPager = sysUserInfoService.querySysUserInfo(userInfo, pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 70f865b..26353a1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @Description : 用户信息 服务 @@ -291,7 +292,7 @@ public class SysUserInfoService implements ISysUserInfoService { departmentIdList.addAll(coreTreeService.findSysDepartmentChildIds(department)); } - userInfo.setDepartmentIdList(StringTool.getListString(departmentIdList)); + userInfo.setDepartmentIdList(StringTool.getListString(departmentIdList.stream().distinct().collect(Collectors.toList()))); String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo); pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack)); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 8dd7c05..3113893 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; - +import java.util.stream.Collectors; /** @@ -333,7 +333,7 @@ public class SysUserService implements ISysUserService { @ApiOperation(value = "查询用户ID 集合",notes = "根据部门Id 查询用户ID集合") public List findSysUserIdListByDepartmentId(List idList) { List result = new ArrayList<>(); - if(idList != null){ + if(idList != null && idList.size() > 0){ StringBuffer hqlWhere = new StringBuffer(); HqlPack.getInPack(StringUtils.join(idList, ","), "departmentId", hqlWhere); List list = refUserDepartmentRDao.findByHqlWhere(hqlWhere.toString()); @@ -380,7 +380,7 @@ public class SysUserService implements ISysUserService { } List idList = findSysUserIdListByDepartmentId(departmentIdList); - user.setDepartmentIdList(StringTool.getListString(idList)); + user.setDepartmentIdList(StringTool.getListString(idList.stream().distinct().collect(Collectors.toList()))); //生成hql查询语句 String hqlPack = CoreHqlPack.packHqlSysUser(user);