From 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 17:06:42 +0800
Subject: [PATCH] IP音柱任务列表
---
dao/src/main/resources/mapper/IPBroadcastMapper.xml | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java | 16 +++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java | 16 ++++++-
dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 29 ++++----------
5 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
index 167cc44..8c9026b 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/IPBroadcastMapper.java
+++ b/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);
}
diff --git a/dao/src/main/resources/mapper/IPBroadcastMapper.xml b/dao/src/main/resources/mapper/IPBroadcastMapper.xml
index bc867e2..7af9aa5 100644
--- a/dao/src/main/resources/mapper/IPBroadcastMapper.xml
+++ b/dao/src/main/resources/mapper/IPBroadcastMapper.xml
@@ -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}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
index 251bf38..9755113 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeMissionController.java
+++ b/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));
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index c5eb375..af2b08a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -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()) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
index 1554e7b..a4d1aed 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
+++ b/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
--
Gitblit v1.9.3