处理问题

This commit is contained in:
wanggeng 2022-05-06 15:00:34 +08:00
parent 4feabd2ead
commit 742fd293a5
11 changed files with 42 additions and 32 deletions

View File

@ -1,24 +1,24 @@
package ink.wgink.gatewaymanage.service.broker.impl;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResult;
import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.util.map.HashMapUtil;
import ink.wgink.util.UUIDUtil;
import ink.wgink.gatewaymanage.dao.broker.IBrokerDao;
import ink.wgink.gatewaymanage.pojo.dtos.broker.BrokerDTO;
import ink.wgink.gatewaymanage.pojo.vos.broker.BrokerVO;
import ink.wgink.gatewaymanage.pojo.bos.broker.BrokerBO;
import ink.wgink.gatewaymanage.pojo.pos.broker.BrokerPO;
import ink.wgink.gatewaymanage.service.broker.IBrokerService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.gatewaymanage.dao.broker.IBrokerDao;
import ink.wgink.gatewaymanage.pojo.bos.broker.BrokerBO;
import ink.wgink.gatewaymanage.pojo.dtos.broker.BrokerDTO;
import ink.wgink.gatewaymanage.pojo.pos.broker.BrokerPO;
import ink.wgink.gatewaymanage.pojo.vos.broker.BrokerVO;
import ink.wgink.gatewaymanage.service.broker.IBrokerService;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.SuccessResultList;
import ink.wgink.util.UUIDUtil;
import ink.wgink.util.map.HashMapUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.List;
import java.util.Map;
/**
* @ClassName: BrokerServiceImpl
@ -71,12 +71,7 @@ public class BrokerServiceImpl extends DefaultBaseService implements IBrokerServ
public void remove(String token, List<String> ids) {
Map<String, Object> params = getHashMap(2);
params.put("brokerIds", ids);
if (StringUtils.isBlank(token)) {
setUpdateInfo(params);
} else {
setAppUpdateInfo(token, params);
}
brokerDao.remove(params);
brokerDao.delete(params);
}
@Override

View File

@ -70,12 +70,7 @@ public class MessageServiceImpl extends DefaultBaseService implements IMessageSe
public void remove(String token, List<String> ids) {
Map<String, Object> params = getHashMap(2);
params.put("messageIds", ids);
if (StringUtils.isBlank(token)) {
setUpdateInfo(params);
} else {
setAppUpdateInfo(token, params);
}
messageDao.remove(params);
messageDao.delete(params);
}
@Override

View File

@ -400,6 +400,8 @@
<if test="keywords != null and keywords != ''">
AND (
t1.title LIKE CONCAT('%', #{keywords}, '%')
OR
t1.summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -168,7 +168,7 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.broker_name LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -201,7 +201,11 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.client_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.client_summary LIKE CONCAT('%', #{keywords}, '%')
OR
t1.client_ip LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -207,7 +207,11 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.message_group LIKE CONCAT('%', #{keywords}, '%')
OR
t1.message_topic LIKE CONCAT('%', #{keywords}, '%')
OR
t1.message_body LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -214,7 +214,9 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.params_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.params_summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="requestParamsIds != null and requestParamsIds.size > 0">

View File

@ -201,7 +201,9 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.params_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.params_summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="responseParamsIds != null and responseParamsIds.size > 0">

View File

@ -266,7 +266,9 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.source_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.source_summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -307,6 +307,8 @@
<if test="keywords != null and keywords != ''">
AND (
t1.name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">

View File

@ -302,7 +302,9 @@
<if test="keywords != null and keywords != ''">
AND (
<!-- 这里添加其他条件 -->
t1.id LIKE CONCAT('%', #{keywords}, '%')
t1.task_name LIKE CONCAT('%', #{keywords}, '%')
OR
t1.task_summary LIKE CONCAT('%', #{keywords}, '%')
)
</if>
<if test="startTime != null and startTime != ''">