From 742fd293a5dd1e686907470d43c2342b90ce64d3 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 6 May 2022 15:00:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broker/impl/BrokerServiceImpl.java | 33 ++++++++----------- .../message/impl/MessageServiceImpl.java | 7 +--- .../mybatis/mapper/api/api-mapper.xml | 2 ++ .../mybatis/mapper/broker/broker-mapper.xml | 2 +- .../mybatis/mapper/client/client-mapper.xml | 6 +++- .../mybatis/mapper/message/message-mapper.xml | 6 +++- .../requestparams/request-params-mapper.xml | 4 ++- .../responseparams/response-params-mapper.xml | 4 ++- .../mybatis/mapper/source/source-mapper.xml | 4 ++- .../mybatis/mapper/system/system-mapper.xml | 2 ++ .../mybatis/mapper/task/task-mapper.xml | 4 ++- 11 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java index 1138e85..8a58a02 100644 --- a/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java +++ b/src/main/java/ink/wgink/gatewaymanage/service/broker/impl/BrokerServiceImpl.java @@ -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 ids) { Map params = getHashMap(2); params.put("brokerIds", ids); - if (StringUtils.isBlank(token)) { - setUpdateInfo(params); - } else { - setAppUpdateInfo(token, params); - } - brokerDao.remove(params); + brokerDao.delete(params); } @Override diff --git a/src/main/java/ink/wgink/gatewaymanage/service/message/impl/MessageServiceImpl.java b/src/main/java/ink/wgink/gatewaymanage/service/message/impl/MessageServiceImpl.java index 2bd766f..ec3a097 100644 --- a/src/main/java/ink/wgink/gatewaymanage/service/message/impl/MessageServiceImpl.java +++ b/src/main/java/ink/wgink/gatewaymanage/service/message/impl/MessageServiceImpl.java @@ -70,12 +70,7 @@ public class MessageServiceImpl extends DefaultBaseService implements IMessageSe public void remove(String token, List ids) { Map params = getHashMap(2); params.put("messageIds", ids); - if (StringUtils.isBlank(token)) { - setUpdateInfo(params); - } else { - setAppUpdateInfo(token, params); - } - messageDao.remove(params); + messageDao.delete(params); } @Override diff --git a/src/main/resources/mybatis/mapper/api/api-mapper.xml b/src/main/resources/mybatis/mapper/api/api-mapper.xml index 87df98f..7f079ff 100644 --- a/src/main/resources/mybatis/mapper/api/api-mapper.xml +++ b/src/main/resources/mybatis/mapper/api/api-mapper.xml @@ -400,6 +400,8 @@ AND ( t1.title LIKE CONCAT('%', #{keywords}, '%') + OR + t1.summary LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/broker/broker-mapper.xml b/src/main/resources/mybatis/mapper/broker/broker-mapper.xml index f982766..61383b8 100644 --- a/src/main/resources/mybatis/mapper/broker/broker-mapper.xml +++ b/src/main/resources/mybatis/mapper/broker/broker-mapper.xml @@ -168,7 +168,7 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.broker_name LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/client/client-mapper.xml b/src/main/resources/mybatis/mapper/client/client-mapper.xml index a9b8a67..96084db 100644 --- a/src/main/resources/mybatis/mapper/client/client-mapper.xml +++ b/src/main/resources/mybatis/mapper/client/client-mapper.xml @@ -201,7 +201,11 @@ 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}, '%') ) diff --git a/src/main/resources/mybatis/mapper/message/message-mapper.xml b/src/main/resources/mybatis/mapper/message/message-mapper.xml index 261998a..a251133 100644 --- a/src/main/resources/mybatis/mapper/message/message-mapper.xml +++ b/src/main/resources/mybatis/mapper/message/message-mapper.xml @@ -207,7 +207,11 @@ 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}, '%') ) diff --git a/src/main/resources/mybatis/mapper/requestparams/request-params-mapper.xml b/src/main/resources/mybatis/mapper/requestparams/request-params-mapper.xml index b3e024a..4143083 100644 --- a/src/main/resources/mybatis/mapper/requestparams/request-params-mapper.xml +++ b/src/main/resources/mybatis/mapper/requestparams/request-params-mapper.xml @@ -214,7 +214,9 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.params_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.params_summary LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml b/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml index 5d5b0f6..0b4e218 100644 --- a/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml +++ b/src/main/resources/mybatis/mapper/responseparams/response-params-mapper.xml @@ -201,7 +201,9 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.params_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.params_summary LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/source/source-mapper.xml b/src/main/resources/mybatis/mapper/source/source-mapper.xml index 171aaff..8820d39 100644 --- a/src/main/resources/mybatis/mapper/source/source-mapper.xml +++ b/src/main/resources/mybatis/mapper/source/source-mapper.xml @@ -266,7 +266,9 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.source_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.source_summary LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/system/system-mapper.xml b/src/main/resources/mybatis/mapper/system/system-mapper.xml index ed3620b..7f3d07a 100644 --- a/src/main/resources/mybatis/mapper/system/system-mapper.xml +++ b/src/main/resources/mybatis/mapper/system/system-mapper.xml @@ -307,6 +307,8 @@ AND ( t1.name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.summary LIKE CONCAT('%', #{keywords}, '%') ) diff --git a/src/main/resources/mybatis/mapper/task/task-mapper.xml b/src/main/resources/mybatis/mapper/task/task-mapper.xml index f6ad4a7..1251aff 100644 --- a/src/main/resources/mybatis/mapper/task/task-mapper.xml +++ b/src/main/resources/mybatis/mapper/task/task-mapper.xml @@ -302,7 +302,9 @@ AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') + t1.task_name LIKE CONCAT('%', #{keywords}, '%') + OR + t1.task_summary LIKE CONCAT('%', #{keywords}, '%') )