dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
@@ -19,7 +19,7 @@ // @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})") // int insert(BroadcastTerminalV2Entity b); List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(String keyword, Long clientId, int bindingState); List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(String keyword, Long userid, int bindingState); }
@@ -45,8 +45,8 @@ AND t3.pole_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR t1.terminal_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') </if> <if test="clientId != null"> AND t3.client_id = #{clientId} <if test="userid != null"> AND (t3.user_id = #{userid} OR t3.client_id = #{userid}) </if> <if test="bindingState != 2"> AND t1.bind_states = #{bindingState} ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
@@ -95,12 +95,16 @@ if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) { return ResponseUtil.fail("缺少对应用户权限"); } PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo // return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword)); if (SecurityUtils.getClientId() == null) { LambdaQueryWrapper<IpVolumeMission> like = Wrappers.lambdaQuery(IpVolumeMission.class).like(IpVolumeMission::getMissionName, keyword); return ResponseUtil.successPage(ipVolumeMissionService.list(like)); } // PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());// todo //// return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO,keyword)); // if (SecurityUtils.getClientId() == null) { // LambdaQueryWrapper<IpVolumeMission> like = Wrappers.lambdaQuery(IpVolumeMission.class).like(IpVolumeMission::getMissionName, keyword); // return ResponseUtil.successPage(ipVolumeMissionService.list(like)); // } return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword)); }
@@ -333,25 +333,22 @@ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) { // PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize()); boolean r = clientService.findClientId(); //ture代表有上级客户 查询通过userID PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>(); LambdaQueryWrapper<IpVolumeMission> eq = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class); PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize()); if (r) { eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()); } else { eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()); //不是超管 if (SecurityUtils.getClientId() != null) { eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> { w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()); }); } if (!keyword.isEmpty()) { eq.like(IpVolumeMission::getMissionName, keyword); } List<IpVolumeMission> list = list(eq); // ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId(); for (IpVolumeMission mission : list) { List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId()); @@ -359,16 +356,9 @@ BeanUtils.copyProperties(mission, bo); bo.setFileNames(fileName); ipVolumeMissionBos.add(bo); } // for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) { // missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId())); // // } return ipVolumeMissionBos; //return new ArrayList<>(); } public TaskVO getByTaskId(Integer taskId) { @@ -383,12 +373,12 @@ } if (SecurityUtils.getClientId() != null) { if (clientService.findClientId()) { if (byId.getUserId() != SecurityUtils.getUserId()) { if (byId.getUserId().equals(SecurityUtils.getUserId())) { throw new BusinessException("任务归属错误"); } } else { if (byId.getClientId() != SecurityUtils.getUserId()) { if (byId.getClientId().equals(SecurityUtils.getUserId())) { throw new BusinessException("任务归属错误"); } } @@ -402,7 +392,6 @@ .eq(BroadcastV2TaskFile::getTaskId, taskId)); List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class) .eq(BroadcastV2TaskTerminal::getTaskId, taskId)); if (!taskFiles.isEmpty()) { ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -65,7 +65,6 @@ if (broadcastTerminalV2Param == null) { broadcastTerminalV2Param = new BroadcastTerminalV2Param(); } Long clientId = SecurityUtils.getClientId(); //在线状态全部的话需要分页 if (2 == broadcastTerminalV2Param.getWorkState()) { @@ -78,9 +77,19 @@ if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) { //全部 int bindingState = 2; broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState); if (SecurityUtils.getClientId() == null) { broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState); } else { broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState); } } else { broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState()); if (SecurityUtils.getClientId() == null) { broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword() , null, broadcastTerminalV2Param.getBindingState()); } else { broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword() , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState()); } } List<TerminalVO> list = TerminalAPIUtils.getTerminalList(); @@ -185,6 +194,7 @@ /** * 根据终端id获取终端信息 * * @param name * @param id * @return
